save user password

app/src/main/java/com/sheep/gamegroup/greendao/DDProviderHelper.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.greendao;
 
+import android.text.TextUtils;
+
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.DaoMaster;
@@ -134,6 +136,7 @@ public class DDProviderHelper {
             return false;
         }
     }
+
     /**
      * 删除指定任务；
      *
@@ -225,6 +228,7 @@ public class DDProviderHelper {
         }
         return downloadTask;
     }
+
     /**
      * 更新任务状态
      *
@@ -505,10 +509,15 @@ public class DDProviderHelper {
         if (acc == null) {
             getDaossion().getAccountDao().insert(account);
         } else {
-            acc.setLoginname(account.getLoginname());
-            acc.setNickname(account.getNickname());
-            acc.setAvatar(account.getAvatar());
-            acc.setGender(account.getGender());
+            if (!TextUtils.isEmpty(account.getLoginname())) {
+                acc.setLoginname(account.getLoginname());
+            }
+            if (!TextUtils.isEmpty(account.getNickname())) {
+                acc.setNickname(account.getNickname());
+            }
+            if (!TextUtils.isEmpty(account.getAvatar())) {
+                acc.setAvatar(account.getAvatar());
+            }
             getDaossion().getAccountDao().update(acc);
         }
     }
@@ -539,7 +548,8 @@ public class DDProviderHelper {
         SdkLoginUserDao infoDao = getDaossion().getSdkLoginUserDao();
         SdkLoginUser lastInfo = infoDao
                 .queryBuilder()
-                .where(SdkLoginUserDao.Properties.ServiceName.eq(newInfo.getServiceName()), SdkLoginUserDao.Properties.Token.eq(newInfo.getToken()))
+                .where(SdkLoginUserDao.Properties.ServiceName.eq(newInfo.getServiceName()),
+                        SdkLoginUserDao.Properties.Invitation_code.eq(newInfo.getInvitation_code()))
                 .build()
                 .unique();
         try {
@@ -589,9 +599,9 @@ public class DDProviderHelper {
     }
 
     /**
-     *
      * 添加或更新搜索记录
      * 添加或更新成功返回true
+     *
      * @param newInfo
      * @param action1 参数 lastInfo为空时为添加数据，不为空时为更新数据
      * @return

app/src/main/java/com/sheep/gamegroup/module/login/ChangePasswordAct.java

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -101,6 +102,7 @@ public class ChangePasswordAct extends BaseActivity implements ChangePasswordCon
                         @Override
                         public void onNext(BaseMessage baseMessage) {
                             hideProgress();
+                            SpUtils.saveUp(ChangePasswordAct.this, user.getId(), newPwd);
                             G.shortToast("密码修改成功");
                             finish();
                         }
@@ -120,7 +122,7 @@ public class ChangePasswordAct extends BaseActivity implements ChangePasswordCon
             SheepApp.getInstance().getNetComponent().getApiService().resetPass4New(json)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()){
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
                         @Override
                         public void onNext(BaseMessage baseMessage) {

app/src/main/java/com/sheep/gamegroup/module/login/ReLoginNameAct.java

@@ -8,6 +8,8 @@ import android.widget.EditText;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.greendao.DDProviderHelper;
+import com.sheep.gamegroup.greendao.download.Account;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.DataUtil;
@@ -66,6 +68,9 @@ public class ReLoginNameAct extends BaseActivity {
                     public void onNext(BaseMessage baseMessage) {
                         hideProgress();
                         DataUtil.getInstance().setUserLoginName(loginNameBox.getText().toString().trim());
+                        Account account = DDProviderHelper.getInstance().getAccount(DataUtil.getInstance().getUserEntity().getId());
+                        account.setLoginname(loginNameBox.getText().toString().trim());
+                        DDProviderHelper.getInstance().saveAccount(account);
                         finish();
                     }
 

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -181,6 +181,7 @@ public class SignInFgt extends AbsLoginFgt {
                         if (loginEty != null) {
                             SpUtils.saveToken(getActivity(), loginEty.getToken());
                             DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            SpUtils.saveUp(getContext(), loginEty.getUser().getId(), passwordBox.getText().toString().trim());
                             mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
                         }
                     }
@@ -291,6 +292,9 @@ public class SignInFgt extends AbsLoginFgt {
     @OnClick(R.id.account_menu_btn)
     public void doSelectAccount(View v) {
         final List<Account> listData = DDProviderHelper.getInstance().getAccountList();
+        if (listData == null || listData.size() == 0) {
+            return;
+        }
         View flagView = findViewById(R.id.login_btn);
         RecyclerView listView = new RecyclerView(getContext());
         listView.setBackgroundResource(R.drawable.screenshot_panel);
@@ -329,6 +333,7 @@ public class SignInFgt extends AbsLoginFgt {
                         phoneNumberBox.setText(account.getLoginname());
                     } else {
                         userNameBox.setText(account.getLoginname());
+                        passwordBox.setText(SpUtils.getUp(getContext(), account.getAid()));
                     }
                     popupWindow.dismiss();
                 });

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -261,6 +261,7 @@ public class SignUpFgt extends BaseFragment {
                         if (loginEty != null) {
                             SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
                             DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            SpUtils.saveUp(getContext(),loginEty.getUser().getId(), passwordBox.getText().toString().trim());
                             mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
                         }
                     }

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -48,6 +48,7 @@ import android.widget.CheckBox;
 import android.widget.Checkable;
 import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -1624,6 +1625,14 @@ public class ViewUtil {
                 if (TextUtils.isEmpty(advertising.getDesc())) {//没有标题时 去掉下面的边距 并给图片左下理右下添加图角
                     builder.apply(new RequestOptions().transform(new RoundedCornersTransformation(activity.getResources().getDimensionPixelSize(R.dimen.content_padding_36), 0, RoundedCornersTransformation.CornerType.BOTTOM)));
                     dialog_center_ll.setPadding(0, activity.getResources().getDimensionPixelSize(R.dimen.content_padding_54), 0, 0);
+                    ViewGroup parent = (ViewGroup)dialog_center_ll.getParent();
+                    ((FrameLayout.LayoutParams)parent.getLayoutParams()).setMargins(0, 0, 0, 0);
+                    Window win = dialog.getWindow();
+                    win.getDecorView().setPadding(0, 0, 0, 0);
+                    WindowManager.LayoutParams lp = win.getAttributes();
+                    lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+                    lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                    win.setAttributes(lp);
                 }
                 builder.into(ad_iv);
                 ad_video_view.setVisibility(View.GONE);

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/SpUtils.java

@@ -2,9 +2,12 @@ package com.sheep.jiuyan.samllsheep.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.text.TextUtils;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
+import go.kfzssafe.Kfzssafe;
+
 /**
  * Created by kemllor on 2017/12/21.
  */
@@ -49,6 +52,7 @@ public class SpUtils {
         SharedPreferences user = SheepApp.getInstance().getSharedPreferences("user", Context.MODE_PRIVATE);
         return user.getBoolean(key, false);
     }
+
     /**
      * 存入一些小型的用户数据
      *
@@ -118,6 +122,24 @@ public class SpUtils {
         return user.getString("device_id", "");
     }
 
+    public static void saveUp(Context context, String u, String p) {
+        SharedPreferences user = context.getSharedPreferences("up", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putString("u_" + u, Kfzssafe.xEncodeS2S(p));
+        editor.apply();
+    }
+
+
+    public static String getUp(Context context, String u) {
+        SharedPreferences user = context.getSharedPreferences("up", Context.MODE_PRIVATE);
+        String p = user.getString("u_" + u, "");
+        if (TextUtils.isEmpty(p)) {
+            return "";
+        } else {
+            return Kfzssafe.xDecodeS2S(p);
+        }
+    }
+
 
     /**
      * 保存要忽略的版本的md5值，只能忽略一个
@@ -136,7 +158,7 @@ public class SpUtils {
         return user.getString("ignore_md5", "");
     }
 
-    public static void saveVoucherFirst(){
+    public static void saveVoucherFirst() {
         SharedPreferences sp = SheepApp.getInstance().getSharedPreferences("first", Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
         editor.putBoolean("first.personcenter.voucher", false);
@@ -147,7 +169,8 @@ public class SpUtils {
         SharedPreferences sp = SheepApp.getInstance().getSharedPreferences("first", Context.MODE_PRIVATE);
         return sp.getBoolean("first.personcenter.voucher", true);
     }
-    public static void putAsBoolean(String key, boolean value){
+
+    public static void putAsBoolean(String key, boolean value) {
         SharedPreferences sp = SheepApp.getInstance().getSharedPreferences("app", Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
         editor.putBoolean(key, value);