version:2.0.0

bugfixes: update:增加MTKT1102
2024-11-11 14:33:57 +08:00
parent 7fc0b52b60
commit 5a2552c3b4
20 changed files with 236 additions and 89 deletions
--- a/app/src/main/java/com/uiui/zyos/activity/edit/EditActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/edit/EditActivity.java
@@ -24,6 +24,7 @@ public class EditActivity extends BaseMvvmActivity<EditViewModel, ActivityEditBi
    private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);

    private String mTypeName;
+    private String mKey = "";

    @Override
    protected int getLayoutId() {
@@ -60,16 +61,20 @@ public class EditActivity extends BaseMvvmActivity<EditViewModel, ActivityEditBi
        mViewDataBinding.editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxEms)});

        switch (mTypeName) {
-            case "name":
+            case CommonConfig.UIUI_USER_NAME_KEY:
+                mKey = "name";
                mViewDataBinding.tvTitle.setText("请输入昵称");
                break;
-            case "school":
+            case CommonConfig.UIUI_USER_SCHOOL_KEY:
+                mKey = "school";
                mViewDataBinding.tvTitle.setText("请输入学校");
                break;
-            case "sn_grade":
+            case CommonConfig.UIUI_USER_GRADE_KEY:
+                mKey = "grade";
                mViewDataBinding.tvTitle.setText("请输入年级");
                break;
-            case "class_name":
+            case CommonConfig.UIUI_USER_CLASS_KEY:
+                mKey = "class";
                mViewDataBinding.tvTitle.setText("请输入班级");
                break;
            default:
@@ -101,7 +106,7 @@ public class EditActivity extends BaseMvvmActivity<EditViewModel, ActivityEditBi
                params.put(mTypeName, mViewDataBinding.editText.getText().toString());
                mViewModel.updateInfo(params);
            } else {
-                mMMKV.encode("local_" + mTypeName, mViewDataBinding.editText.getText().toString());
+                mMMKV.encode(mTypeName, mViewDataBinding.editText.getText().toString());
                finish();
            }
        }
--- a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
@@ -1,6 +1,5 @@
 package com.uiui.zyos.activity.main;

-import android.app.ActionBar;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -8,7 +7,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -231,7 +229,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
    public void initData() {
        registmNewAppReceiver();
        registmUpdateAddressReceiver();
-//        mViewModel.getAppUpdateInfoData().observe(this, new Observer<AppUpdateInfo>() {
+//        mViewModel.mAppUpdateInfoData.observe(this, new Observer<AppUpdateInfo>() {
 //            @Override
 //            public void onChanged(AppUpdateInfo appUpdateInfo) {
 //                mAppUpdateInfo = appUpdateInfo;
@@ -250,6 +248,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
 //            }
 //        });
 //        mViewModel.checkUpdate();
+        mViewModel.getSnInfo();
    }

    private void hideSystemUI() {
@@ -685,7 +684,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
    }


-
    public class BtnClick {
        public void openRobot(View view) {
            OpenApkUtils.getInstance().openAppWithoutArgs(JxwPackageConfig.JXW_VOICE_PACKAGE_NAME, JxwPackageConfig.JXW_VOICE_CLASS_NAME);
--- a/app/src/main/java/com/uiui/zyos/activity/main/MainViewModel.java
+++ b/app/src/main/java/com/uiui/zyos/activity/main/MainViewModel.java
@@ -7,18 +7,23 @@ import androidx.lifecycle.MutableLiveData;

 import com.google.gson.JsonObject;
 import com.hjq.toast.Toaster;
+import com.tencent.mmkv.MMKV;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.uiui.zyos.BuildConfig;
+import com.uiui.zyos.R;
 import com.uiui.zyos.base.mvvm.BaseViewModel;
 import com.uiui.zyos.bean.AppUpdateInfo;
 import com.uiui.zyos.bean.BaseResponse;
+import com.uiui.zyos.bean.SnInfo;
+import com.uiui.zyos.config.CommonConfig;
 import com.uiui.zyos.databinding.ActivityMainBinding;
 import com.uiui.zyos.manager.RemoteManager;
 import com.uiui.zyos.network.NetInterfaceManager;
 import com.uiui.zyos.utils.ActivationUtil;
 import com.uiui.zyos.utils.ApkUtils;
 import com.uiui.zyos.utils.AppUsedTimeUtils;
+import com.uiui.zyos.utils.Utils;

 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.annotations.NonNull;
@@ -27,9 +32,11 @@ import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;

 public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEvent> {
-
    private static final String TAG = "MainViewModel";

+    private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
+
+
    @Override
    public ActivityMainBinding getVDBinding() {
        return binding;
@@ -40,12 +47,50 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv

    }

-    private MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
+    public MutableLiveData<String> mGradleData = new MutableLiveData<>();
+
+    public void getSnInfo() {
+        NetInterfaceManager.getInstance().getsnInfoControl()
+                .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
+                .subscribe(new Observer<BaseResponse<SnInfo>>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+                        Log.e("getSnInfo", "onSubscribe: ");
+                    }
+
+                    @Override
+                    public void onNext(@NonNull BaseResponse<SnInfo> snInfoBaseResponse) {
+                        Log.e("getSnInfo", "onNext: ");
+                        if (snInfoBaseResponse.code == 200) {
+                            SnInfo snInfo = snInfoBaseResponse.data;
+                            String old = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, getCtx().getString(R.string.default_grade));
+                            if (!old.equals(snInfo.getGrade())) {
+                                mMMKV.encode(CommonConfig.UIUI_USER_GRADE_KEY, snInfo.getGrade());
+                                Toaster.showLong("桌面调整，正在重启");
+                                Utils.triggerRebirth(getCtx());
+                            } else {
+                                Log.e("getSnInfo", "onNext: not changed");
+                            }
+                            mGradleData.setValue(snInfo.getGrade());
+                        }
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                        Log.e("getSnInfo", "onError: " + e.getMessage());
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        Log.e("getSnInfo", "onComplete: ");
+                    }
+                });
+

-    public MutableLiveData<AppUpdateInfo> getAppUpdateInfoData() {
-        return mAppUpdateInfoData;
    }

+    public MutableLiveData<AppUpdateInfo> mAppUpdateInfoData = new MutableLiveData<>();
+
    public void checkUpdate() {
        NetInterfaceManager.getInstance().getCheckUpdateObservable(BuildConfig.APPLICATION_ID)
                .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
@@ -150,7 +195,7 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
        AppUsedTimeUtils.getInstance().sendRunningApp(new AppUsedTimeUtils.RunningAppCallback() {
            @Override
            public void onComplete() {
-                Log.e("sendRunningInfo", "onComplete: " );
+                Log.e("sendRunningInfo", "onComplete: ");
            }
        });
    }
--- a/app/src/main/java/com/uiui/zyos/activity/selectegrade/SelecteGradeActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/selectegrade/SelecteGradeActivity.java
@@ -2,10 +2,12 @@ package com.uiui.zyos.activity.selectegrade;

 import android.util.Log;
 import android.view.View;
+import android.widget.RadioButton;
 import android.widget.TextView;

 import androidx.lifecycle.Observer;

+import com.hjq.toast.Toaster;
 import com.tencent.mmkv.MMKV;
 import com.uiui.zyos.R;
 import com.uiui.zyos.base.mvvm.BaseMvvmActivity;
@@ -13,6 +15,7 @@ import com.uiui.zyos.config.CommonConfig;
 import com.uiui.zyos.databinding.ActivitySelecteGradeBinding;
 import com.uiui.zyos.manager.RemoteManager;
 import com.uiui.zyos.utils.ActivationUtil;
+import com.uiui.zyos.utils.Utils;

 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +25,7 @@ public class SelecteGradeActivity extends BaseMvvmActivity<SelecteGradeViewModel

    private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);

-    private String grade = "一年级";
+    private String grade = "七年级";


    private void showGroup1() {
@@ -65,6 +68,15 @@ public class SelecteGradeActivity extends BaseMvvmActivity<SelecteGradeViewModel

    @Override
    public void initView() {
+        grade = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, "七年级");
+
+        for (int i = 1; i < 13; i++) {
+            int viewId = getResources().getIdentifier("radioButton" + i, "id", getPackageName());
+            RadioButton radioButton = findViewById(viewId);
+            if (grade.equals(radioButton.getText().toString())){
+                radioButton.setChecked(true);
+            }
+        }
        mViewDataBinding.radioButton1.setOnCheckedChangeListener((compoundButton, b) -> {
            if (b) setPrimary(compoundButton);
        });
@@ -111,6 +123,8 @@ public class SelecteGradeActivity extends BaseMvvmActivity<SelecteGradeViewModel
            @Override
            public void onChanged(Boolean aBoolean) {
                if (aBoolean) {
+                    Toaster.showLong("桌面调整，正在重启");
+                    Utils.triggerRebirth(SelecteGradeActivity.this);
                    finish();
                }
            }
@@ -151,15 +165,13 @@ public class SelecteGradeActivity extends BaseMvvmActivity<SelecteGradeViewModel
        }

        public void submit(View view) {
+            mMMKV.encode(CommonConfig.UIUI_USER_GRADE_KEY, grade);
            if (ActivationUtil.isActivation()) {
                Map<String, String> params = new HashMap<>();
                params.put("sn", RemoteManager.getInstance().getSerial());
                params.put("sn_grade", grade);
                mViewModel.updateInfo(params);
-            } else {
-                mMMKV.encode("local_" + "sn_grade", grade);
            }
-            finish();
        }
    }

--- a/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java
@@ -156,9 +156,9 @@ public class UserActivity extends BaseMvvmActivity<UserViewModel, ActivityUserBi
    }

    private void setLocalData() {
-        String avatarFilePath = mMMKV.decodeString("local_" + "avatar");
+        String avatarFilePath = mMMKV.decodeString(CommonConfig.UIUI_USER_AVATAR_KEY);
        GlideLoadUtils.getInstance().glideLoad(UserActivity.this, avatarFilePath, mViewDataBinding.nvAvatar, R.drawable.default_avatar);
-        String nickName = mMMKV.decodeString("local_" + "name", "");
+        String nickName = mMMKV.decodeString(CommonConfig.UIUI_USER_NAME_KEY, "");
        if (TextUtils.isEmpty(nickName)) {
            mViewDataBinding.tvNickName.setText(getString(R.string.default_nickname));
        } else {
@@ -243,7 +243,7 @@ public class UserActivity extends BaseMvvmActivity<UserViewModel, ActivityUserBi
                            params.put("sn", RemoteManager.getInstance().getSerial());
                            mViewModel.updateInfo(params, body);
                        } else {
-                            mMMKV.encode("local_" + "avatar", avatarFilePath);
+                            mMMKV.encode(CommonConfig.UIUI_USER_AVATAR_KEY, avatarFilePath);
                        }
                    }

@@ -265,7 +265,7 @@ public class UserActivity extends BaseMvvmActivity<UserViewModel, ActivityUserBi

        public void edit(View view) {
            Intent intent = new Intent(UserActivity.this, EditActivity.class);
-            intent.putExtra("type", "name");
+            intent.putExtra("type", CommonConfig.UIUI_USER_NAME_KEY);
            intent.putExtra("data", mViewDataBinding.tvNickName.getText());
            intent.putExtra("maxLength", 8);
            startActivity(intent);
--- a/app/src/main/java/com/uiui/zyos/config/CommonConfig.java
+++ b/app/src/main/java/com/uiui/zyos/config/CommonConfig.java
@@ -11,6 +11,23 @@ public class CommonConfig {
    public static final String LOCK_SCREEN_PASSWORD ="Iflytek_lockScreenPasswordKey";
    public static final String DEFAULT_PASSWORD = "666666";

+    /*保存个人基本信息*/
+    /*性别*/
+    public static final String UIUI_USER_GENDER_KEY = "USER_INFO_GENDER";
+    /*姓名*/
+    public static final String UIUI_USER_NAME_KEY = "USER_INFO_NAME";
+    /*学校*/
+    public static final String UIUI_USER_SCHOOL_KEY = "USER_INFO_SCHOOL";
+    /*年级*/
+    public static final String UIUI_USER_GRADE_KEY = "USER_INFO_GRADE";
+    /*班级*/
+    public static final String UIUI_USER_CLASS_KEY = "USER_INFO_CLASS";
+    /*头像*/
+    public static final String UIUI_USER_AVATAR_KEY = "USER_INFO_AVATAR";
+    /*手机*/
+    public static final String UIUI_USER_MOBILE_KEY = "USER_INFO_MOBILE";
+
+
    /*是否激活接口请求缓存*/
    public static final String ACTIVATIONBEAN_KEY = "IFLYTEK_UIUI_ACTIVATIONBEAN_KEY";
    /*是否激活*/
--- a/app/src/main/java/com/uiui/zyos/fragment/subject/SubjectFragment.java
+++ b/app/src/main/java/com/uiui/zyos/fragment/subject/SubjectFragment.java
@@ -8,8 +8,10 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.viewpager.widget.ViewPager;

+import com.tencent.mmkv.MMKV;
 import com.uiui.zyos.R;
 import com.uiui.zyos.base.BaseDataBindingFragment;
+import com.uiui.zyos.config.CommonConfig;
 import com.uiui.zyos.databinding.FragmentSubjectBinding;
 import com.uiui.zyos.fragment.app.AppFragment;
 import com.uiui.zyos.fragment.biology.BiologyFragment;
@@ -33,10 +35,14 @@ import java.util.List;
 public class SubjectFragment extends BaseDataBindingFragment<FragmentSubjectBinding> {
    private static final String TAG = "SubjectFragment";

-    private String[] title = new String[]{
+    private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
+
+    private String[] mAllTitle = new String[]{
 //            "AR自主学",
            "精准学", "语文", "数学", "英语", "物理", "化学", "生物", "综合", "应用"};

+    private String[] mTitleWithoutScience = new String[]{"精准学", "语文", "数学", "英语", "应用"};
+
    private FragmentActivity mContext;

    //    private ARStudyFragment mARStudyFragment;
@@ -44,10 +50,12 @@ public class SubjectFragment extends BaseDataBindingFragment<FragmentSubjectBind
    private ChineseFragment mChineseFragment;
    private MathFragment mMathFragment;
    private EnglishFragment mEnglishFragment;
+
    private PhysicsFragment mPhysicsFragment;
    private ChemicalFragment mChemicalFragment;
    private BiologyFragment mBiologyFragment;
    private ComplexFragment mComplexFragment;
+
    private AppFragment mAppFragment;

    private List<Fragment> mFragments;
@@ -104,20 +112,25 @@ public class SubjectFragment extends BaseDataBindingFragment<FragmentSubjectBind
        mChineseFragment = new ChineseFragment();
        mMathFragment = new MathFragment();
        mEnglishFragment = new EnglishFragment();
-        mPhysicsFragment = new PhysicsFragment();
-        mChemicalFragment = new ChemicalFragment();
-        mBiologyFragment = new BiologyFragment();
-        mComplexFragment = new ComplexFragment();
+        if (!isLower()) {
+            mPhysicsFragment = new PhysicsFragment();
+            mChemicalFragment = new ChemicalFragment();
+            mBiologyFragment = new BiologyFragment();
+            mComplexFragment = new ComplexFragment();
+        }
        mAppFragment = new AppFragment();
+
 //        mFragments.add(mARStudyFragment);
        mFragments.add(mPrecisionFragment);
        mFragments.add(mChineseFragment);
        mFragments.add(mMathFragment);
        mFragments.add(mEnglishFragment);
-        mFragments.add(mPhysicsFragment);
-        mFragments.add(mChemicalFragment);
-        mFragments.add(mBiologyFragment);
-        mFragments.add(mComplexFragment);
+        if (!isLower()) {
+            mFragments.add(mPhysicsFragment);
+            mFragments.add(mChemicalFragment);
+            mFragments.add(mBiologyFragment);
+            mFragments.add(mComplexFragment);
+        }
        mFragments.add(mAppFragment);
        Log.e(TAG, "SubjectFragment: end = " + (System.currentTimeMillis() - time));
    }
@@ -169,9 +182,12 @@ public class SubjectFragment extends BaseDataBindingFragment<FragmentSubjectBind
        mBaseFragmentPagerAdapter = new BaseFragmentPagerAdapter(mFragmentManager, mFragments);
        mViewDataBinding.viewPager.setAdapter(mBaseFragmentPagerAdapter);
        mViewDataBinding.viewPager.setOnPageChangeListener(mListener);
-        mViewDataBinding.mainSlidingTabLayout.setViewPager(mViewDataBinding.viewPager, title);
+        if (!isLower()) {
+            mViewDataBinding.mainSlidingTabLayout.setViewPager(mViewDataBinding.viewPager, mAllTitle);
+        } else {
+            mViewDataBinding.mainSlidingTabLayout.setViewPager(mViewDataBinding.viewPager, mTitleWithoutScience);
+        }
        Log.e(TAG, "initView: end = " + (System.currentTimeMillis() - time));
-
    }

    @Override
@@ -206,6 +222,22 @@ public class SubjectFragment extends BaseDataBindingFragment<FragmentSubjectBind
        super.onResume();
    }

+    private boolean isLower() {
+        String grade = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, "七年级");
+        Log.e(TAG, "isLower: " + grade);
+        switch (grade) {
+            case "一年级":
+            case "二年级":
+            case "三年级":
+            case "四年级":
+            case "五年级":
+            case "六年级":
+                return true;
+            default:
+                return false;
+        }
+    }
+
    public int getFragmentSize() {
        Log.e(TAG, "getFragmentSize: ");
        return mFragments == null ? 0 : mFragments.size();
--- a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
+++ b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
@@ -145,29 +145,28 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
        Log.e(TAG, "initView: ");
        mViewDataBinding.tvNotification.requestFocus();
        registerOwnReceiver();
-        String name = mMMKV.decodeString("USERINFO_NAME", "");
+        String name = mMMKV.decodeString(CommonConfig.UIUI_USER_NAME_KEY, "");
        if (TextUtils.isEmpty(name)) {
            mViewDataBinding.tvName.setText(getString(R.string.default_nickname));
        } else {
            mViewDataBinding.tvName.setText(name);
        }
-        String grade = mMMKV.decodeString("USERINFO_GRADE", "");
+        String grade = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, "");
        if (TextUtils.isEmpty(grade)) {
            mViewDataBinding.tvGrade.setText(getString(R.string.default_grade));
        } else {
            mViewDataBinding.tvGrade.setText(grade);
        }
+        String avatar = mMMKV.decodeString(CommonConfig.UIUI_USER_AVATAR_KEY, "");
+        Glide.with(mViewDataBinding.ivAvatar).load(avatar).error(R.drawable.default_avatar).into(mViewDataBinding.ivAvatar);
+
        int logined = mMMKV.decodeInt(CommonConfig.isLogined, 0);
        if (logined == 1) {
            mViewDataBinding.ivActivation.setVisibility(View.GONE);
            mViewDataBinding.clStudyTime.setVisibility(View.VISIBLE);
        }
        setButtonVisibility();
-        String avatar = mMMKV.decodeString("USERINFO_AVATAR", "");

-        initWifiState();
-
-        Glide.with(mViewDataBinding.ivAvatar).load(avatar).error(R.drawable.default_avatar).into(mViewDataBinding.ivAvatar);
        mViewDataBinding.tvTime.setText(TimeUtils.getNowTimeInMinute());
        mViewDataBinding.tvDate1.setText(TimeUtils.getDateAndWeek(System.currentTimeMillis()));
        mViewDataBinding.tvDate2.setText(TimeUtils.getDateAndWeek(System.currentTimeMillis()));
@@ -193,6 +192,9 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
        mViewDataBinding.rvHomework.addItemDecoration(new VerticalDecorationWithoutFirst(0, 16, mContext));
        mViewDataBinding.rvHomework.setLayoutManager(linearLayoutManager);
        mViewDataBinding.rvHomework.setAdapter(mHomeworkAdapter);
+
+        initWifiState();
+
    }

    @Override
@@ -327,9 +329,9 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
 //            tvExit.setVisibility(View.VISIBLE);
            mViewDataBinding.ivActivation.setVisibility(View.VISIBLE);
            mViewDataBinding.clStudyTime.setVisibility(View.GONE);
-            Glide.with(mViewDataBinding.ivAvatar).load(mMMKV.decodeString("local_" + "avatar")).error(R.drawable.default_avatar).into(mViewDataBinding.ivAvatar);
-            mViewDataBinding.tvName.setText(mMMKV.decodeString("local_" + "name", getString(R.string.default_nickname)));
-            mViewDataBinding.tvGrade.setText(mMMKV.decodeString("local_" + "sn_grade", getString(R.string.default_grade)));
+            Glide.with(mViewDataBinding.ivAvatar).load(mMMKV.decodeString(CommonConfig.UIUI_USER_AVATAR_KEY)).error(R.drawable.default_avatar).into(mViewDataBinding.ivAvatar);
+            mViewDataBinding.tvName.setText(mMMKV.decodeString(CommonConfig.UIUI_USER_NAME_KEY, getString(R.string.default_nickname)));
+            mViewDataBinding.tvGrade.setText(mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, getString(R.string.default_grade)));
        } else {
            int isReturnAndroid = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_RETURN_ANDROID_KEY, 1);
            if (isReturnAndroid == 0) {
--- a/app/src/main/java/com/uiui/zyos/fragment/user/UserViewModel.java
+++ b/app/src/main/java/com/uiui/zyos/fragment/user/UserViewModel.java
@@ -65,7 +65,7 @@ public class UserViewModel extends BaseViewModel<FragmentUserBinding, FragmentEv
        if (!activation) {
            return;
        }
-        NetInterfaceManager.getInstance().getSnInfo(getLifecycle(), new NetInterfaceManager.ObserverCallback() {
+        NetInterfaceManager.getInstance().getSnInfoFragment(getLifecycle(), new NetInterfaceManager.ObserverCallback() {
            @Override
            public void onSubscribe(Disposable d) {
                Log.e("getSnInfo", "onSubscribe: ");
--- a/app/src/main/java/com/uiui/zyos/fragment/usercenter/info/InfoFragment.java
+++ b/app/src/main/java/com/uiui/zyos/fragment/usercenter/info/InfoFragment.java
@@ -66,7 +66,7 @@ public class InfoFragment extends BaseMvvmFragment<InfoViewModel, FragmentInfoBi
                        params.put("sex", "1");
                        mViewModel.updateInfo(params);
                    } else {
-                        mMMKV.encode("local_" + "sex", 1);
+                        mMMKV.encode(CommonConfig.UIUI_USER_GENDER_KEY, 1);
                    }
                }
            }
@@ -81,7 +81,7 @@ public class InfoFragment extends BaseMvvmFragment<InfoViewModel, FragmentInfoBi
                        params.put("sex", "2");
                        mViewModel.updateInfo(params);
                    } else {
-                        mMMKV.encode("local_" + "sex", 2);
+                        mMMKV.encode(CommonConfig.UIUI_USER_GENDER_KEY, 2);
                    }
                }
            }
@@ -131,28 +131,28 @@ public class InfoFragment extends BaseMvvmFragment<InfoViewModel, FragmentInfoBi
    }

    private void getLocalData() {
-        int gender = mMMKV.decodeInt("local_" + "sex", 1);
+        int gender = mMMKV.decodeInt(CommonConfig.UIUI_USER_GENDER_KEY, 1);
        if (gender == 1) {
            mViewDataBinding.rbMale.setChecked(true);
-        } else {
+        } else if (gender == 2) {
            mViewDataBinding.rbFemale.setChecked(true);
        }
        setRadioButton();

-        String class_name = mMMKV.decodeString("local_" + "class_name", "");
+        String class_name = mMMKV.decodeString(CommonConfig.UIUI_USER_CLASS_KEY, "");
        if (TextUtils.isEmpty(class_name)) {
            mViewDataBinding.tvClass.setText(getString(R.string.notset));
        } else {
            mViewDataBinding.tvClass.setText(class_name);
        }
-        String sn_grade = mMMKV.decodeString("local_" + "sn_grade", "");
+        String sn_grade = mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, "");
        if (TextUtils.isEmpty(sn_grade)) {
            mViewDataBinding.tvGrade.setText(getString(R.string.default_grade));
        } else {
            mViewDataBinding.tvGrade.setText(sn_grade);
        }
-        String school = mMMKV.decodeString("local_" + "school", "");
-        if (TextUtils.isEmpty(class_name)) {
+        String school = mMMKV.decodeString(CommonConfig.UIUI_USER_SCHOOL_KEY, "");
+        if (TextUtils.isEmpty(school)) {
            mViewDataBinding.tvSchool.setText(getString(R.string.notset));
        } else {
            mViewDataBinding.tvSchool.setText(school);
@@ -170,7 +170,7 @@ public class InfoFragment extends BaseMvvmFragment<InfoViewModel, FragmentInfoBi
    public class BtnClick {
        public void editClass(View view) {
            String text = mViewDataBinding.tvClass.getText().toString();
-            edit("class_name", text, 8);
+            edit(CommonConfig.UIUI_USER_CLASS_KEY, text, 8);
        }

        public void editGrade(View view) {
@@ -181,7 +181,7 @@ public class InfoFragment extends BaseMvvmFragment<InfoViewModel, FragmentInfoBi

        public void editSchool(View view) {
            String text = mViewDataBinding.tvSchool.getText().toString();
-            edit("school", text, 16);
+            edit(CommonConfig.UIUI_USER_SCHOOL_KEY, text, 16);
        }

    }
--- a/app/src/main/java/com/uiui/zyos/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/uiui/zyos/network/NetInterfaceManager.java
@@ -3,7 +3,6 @@ package com.uiui.zyos.network;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Environment;
-import android.text.TextUtils;
 import android.util.Log;

 import com.google.gson.Gson;
@@ -408,7 +407,13 @@ public class NetInterfaceManager {
 //        }
 //    }

-    public void getSnInfo(BehaviorSubject<FragmentEvent> lifecycle, ObserverCallback callback) {
+    public void getSnInfo(BehaviorSubject<ActivityEvent> lifecycle, ObserverCallback callback) {
+        getsnInfoControl()
+                .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
+                .subscribe(getSnInfoObserver(callback));
+    }
+
+    public void getSnInfoFragment(BehaviorSubject<FragmentEvent> lifecycle, ObserverCallback callback) {
        getsnInfoControl()
                .compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY))
                .subscribe(getSnInfoObserver(callback));
@@ -445,18 +450,14 @@ public class NetInterfaceManager {
                if (userInfoBaseResponse.code == 200) {
                    mMMKV.encode(CommonConfig.isLogined, 1);
                    SnInfo snInfo = userInfoBaseResponse.data;
-                    if (!TextUtils.isEmpty(snInfo.getSn_name())) {
-                        mMMKV.encode("USERINFO_NAME", snInfo.getSn_name());
-                    }
-                    if (!TextUtils.isEmpty(snInfo.getSchool())) {
-                        mMMKV.encode("USERINFO_SCHOOL", snInfo.getSchool());
-                    }
-                    if (!TextUtils.isEmpty(snInfo.getGrade())) {
-                        mMMKV.encode("USERINFO_GRADE", snInfo.getGrade());
-                    }
-                    if (!TextUtils.isEmpty(snInfo.getAvatar())) {
-                        mMMKV.encode("USERINFO_AVATAR", snInfo.getGrade());
-                    }
+                    mMMKV.encode(CommonConfig.UIUI_USER_GENDER_KEY, snInfo.getSex());
+                    mMMKV.encode(CommonConfig.UIUI_USER_NAME_KEY, snInfo.getSn_name());
+                    mMMKV.encode(CommonConfig.UIUI_USER_SCHOOL_KEY, snInfo.getSchool());
+                    mMMKV.encode(CommonConfig.UIUI_USER_GRADE_KEY, snInfo.getGrade());
+                    mMMKV.encode(CommonConfig.UIUI_USER_CLASS_KEY, snInfo.getClass_name());
+                    mMMKV.encode(CommonConfig.UIUI_USER_AVATAR_KEY, snInfo.getGrade());
+                    mMMKV.encode(CommonConfig.UIUI_USER_MOBILE_KEY, snInfo.getMobile());
+
                } else if (code == 300) {
                    mMMKV.encode(UrlAddress.SNINFO, "");
                    mMMKV.encode(CommonConfig.isLogined, 0);
--- a/app/src/main/java/com/uiui/zyos/utils/Utils.java
+++ b/app/src/main/java/com/uiui/zyos/utils/Utils.java
@@ -1,10 +1,12 @@
 package com.uiui.zyos.utils;

 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -271,6 +273,15 @@ public class Utils {
        System.exit(0);
    }

+    public static void triggerRebirth(Context context) {
+        PackageManager packageManager = context.getPackageManager();
+        Intent intent = packageManager.getLaunchIntentForPackage(context.getPackageName()); //
+        ComponentName componentName = intent.getComponent();
+        Intent mainIntent = Intent.makeRestartActivityTask(componentName); //
+        context.startActivity(mainIntent);
+        Runtime.getRuntime().exit(0); //
+    }
+
    /**
     * 获取系统配置信息
     *
--- a/app/src/main/res/drawable-hdpi/wechat_service.png
+++ b/app/src/main/res/drawable-hdpi/wechat_service.png
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
    <string name="notset">未设置</string>
    <string name="device_unauthorized">设备未经授权</string>
    <string name="default_nickname">小酷</string>
-    <string name="default_grade">一年级</string>
+    <string name="default_grade">七年级</string>

    <!-- TODO: Remove or change this placeholder text -->
    <string name="hello_blank_fragment">Hello blank fragment</string>