diff --git a/app/build.gradle b/app/build.gradle index 4cfa6e9..1ab69cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { minSdkVersion 23 targetSdkVersion 29 - versionCode 19 - versionName "1.1.8" + versionCode 20 + versionName "1.1.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java b/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java index 70a6f88..a258b36 100644 --- a/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java +++ b/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java @@ -18,6 +18,7 @@ import com.xwad.os.R; import com.xwad.os.activity.ExitActivity; import com.xwad.os.activity.user.UserActivity; import com.xwad.os.base.mvvm.fragment.BaseMvvmFragment; +import com.xwad.os.bean.SnInfo; import com.xwad.os.bean.UserAvatarInfo; import com.xwad.os.config.CommonConfig; import com.xwad.os.databinding.FragmentMineBinding; @@ -193,13 +194,36 @@ public class MineFragment extends BaseMvvmFragment() { + @Override + public void onChanged(SnInfo snInfo) { + if (snInfo != null) { + if (!TextUtils.isEmpty(snInfo.getSn_name())) { + mViewDataBinding.tvName.setText(snInfo.getSn_name()); + } else { + mViewDataBinding.tvName.setText(getString(R.string.default_nickname)); + } + if (!TextUtils.isEmpty(snInfo.getGrade())) { + mViewDataBinding.tvGrade.setText(snInfo.getGrade()); + } else { + mViewDataBinding.tvGrade.setText(getString(R.string.default_grade)); + } + if (!TextUtils.isEmpty(snInfo.getClass_name())) { + mViewDataBinding.tvWlz.setText(snInfo.getClass_name()); + } else { + mViewDataBinding.tvWlz.setText(getString(R.string.default_class)); + } + } + + + } + }); mViewModel.getSnInfo(); } @Override public void fetchData() { Log.e(TAG, "fetchData: "); - setName(); } @Override @@ -212,6 +236,7 @@ public class MineFragment extends BaseMvvmFragment { + + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); + @Override public FragmentMineBinding getVDBinding() { return binding; @@ -75,6 +79,14 @@ public class MineViewModel extends BaseViewModel { + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); @Override public FragmentInfoBinding getVDBinding() { @@ -48,6 +50,14 @@ public class InfoViewModel extends BaseViewModel diff --git a/app/src/main/res/layout/fragment_read.xml b/app/src/main/res/layout/fragment_read.xml index 232ddc4..df1c9c9 100644 --- a/app/src/main/res/layout/fragment_read.xml +++ b/app/src/main/res/layout/fragment_read.xml @@ -148,6 +148,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" + android:visibility="gone" android:orientation="horizontal"> + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e2c19d6..997915f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,6 +9,7 @@ 设备未经授权 小学王 一年级 + 1班 家长设置了屏幕锁定,你可以联系家长解锁屏幕,或通过密码解锁 可用时间\n