1.添加获取设备编码

baselib/src/main/java/com/yingyangfly/baselib/bean/UserInfoBean.kt

@@ -39,6 +39,7 @@ data class UserInfoBean(
     val username: String,
     val gender: String,
     val age: String,
+    val padNo: String,
     val firstLogin: String//是否第一次登陆 0需要弹框引导提示的
 ) {
     fun getUserNameInfo(): String {

baselib/src/main/java/com/yingyangfly/baselib/net/BaseObserver.kt

@@ -44,6 +44,7 @@ abstract class BaseObserver<T> : Observer<XBaseEntity<T>> {
             User.saveAvatar("")
             User.saveName("")
             User.saveUserId("")
+            User.savePadNo("")
             User.saveOrgCode("")
             JumpUtil.jumpActivity(RouterUrlCommon.login)
         } else {

baselib/src/main/java/com/yingyangfly/baselib/net/BaseResp.kt

@@ -37,6 +37,7 @@ open class BaseResp<T>(
                 User.saveName("")
                 User.saveUserId("")
                 User.saveOrgCode("")
+                User.savePadNo("")
                 JumpUtil.jumpActivity(RouterUrlCommon.login)
             }
             else -> {

baselib/src/main/java/com/yingyangfly/baselib/utils/CommonParam.kt

@@ -15,6 +15,5 @@ object CommonParam {
     val MOBILE = "mobile"
     val IDCARD = "idCard"
     val DOCTORAVATAR = "doctor_avatar"
-    val SHOWWELCOMEMESSAGE = "showWelcomeMessage"//是否展示欢迎语
-    val GAMEDATABEAN = "gameDataBean"//游戏信息
+    val PADNO = "padNo"
 }

baselib/src/main/java/com/yingyangfly/baselib/utils/User.kt

@@ -210,43 +210,17 @@ object User {
     }
 
     /**
-     * 保存sncode
+     * 保存平板编号
      */
-    fun saveSnCode(snCode: String) {
-        Preferences.put(CommonParam.SNCODE, snCode)
+    fun savePadNo(padNo: String) {
+        Preferences.put(CommonParam.PADNO, padNo)
     }
 
-    fun getSnCode(): String {
-        return if (TextUtils.isEmpty(Preferences.getString(CommonParam.SNCODE))) {
+    fun getPadNo(): String {
+        return if (TextUtils.isEmpty(Preferences.getString(CommonParam.PADNO))) {
             ""
         } else {
-            Preferences.getString(CommonParam.SNCODE)!!
-        }
-    }
-
-    /**
-     * 是否显示欢迎语弹窗
-     */
-    fun saveShowWelcomeMessage(isShow: Boolean) {
-        Preferences.put(CommonParam.SHOWWELCOMEMESSAGE, isShow)
-    }
-
-    fun getShowWelcomeMessage(): Boolean {
-        return Preferences.getBool(CommonParam.SHOWWELCOMEMESSAGE, false)
-    }
-
-    /**
-     * 保存选中的游戏信息
-     */
-    fun saveGameBean(gameBean: String) {
-        Preferences.put(CommonParam.GAMEDATABEAN, gameBean)
-    }
-
-    fun getGameBean(): String {
-        return if (TextUtils.isEmpty(Preferences.getString(CommonParam.GAMEDATABEAN))) {
-            ""
-        } else {
-            Preferences.getString(CommonParam.GAMEDATABEAN)!!
+            Preferences.getString(CommonParam.PADNO)!!
         }
     }
 

config.gradle

@@ -14,7 +14,7 @@ ext {
             minSdkVersion    : 19,
             targetSdkVersion : 30,
             versionCode      : 4,
-            versionName      : "1.0.0.9",
+            versionName      : "1.0.0.10",
     ]
     //androidx配置
     androidx = [

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -155,7 +155,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                 Glide.with(this@HomeActivity).asGif().load(R.drawable.fish).into(fishImage)
             }
             LiveEventBusUtil.send(RxBusCodes.FINISHGAME, "")
-            User.saveGameBean("")
         }
     }
 

login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -133,9 +133,11 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
                     if (TextUtils.isEmpty(it.id).not()) {
                         User.saveUserId(it.id)
                     }
+                    if (TextUtils.isEmpty(it.padNo).not()) {
+                        User.savePadNo(it.padNo)
+                    }
                     //保存是否第一次登陆（0第一次登陆）
                     if (TextUtils.isEmpty(it.firstLogin).not()) {
-                        User.saveShowWelcomeMessage(TextUtils.equals("1", it.firstLogin))
                         User.saveFirstLogin(it.firstLogin)
                     }
                     startInitService()

personalcenter/src/main/java/com/yingyang/personalcenter/personalcenter/PersonalCenterActivity.kt

@@ -92,6 +92,9 @@ class PersonalCenterActivity :
                 if (TextUtils.isEmpty(it.id).not()) {
                     User.saveUserId(it.id)
                 }
+                if (TextUtils.isEmpty(it.padNo).not()) {
+                    User.savePadNo(it.padNo)
+                }
                 if (it.diagnoseResult.isNullOrEmpty().not()) {
                     diagnosisList.addAll(it.diagnoseResult)
                 }
@@ -110,6 +113,7 @@ class PersonalCenterActivity :
                     v.startAnimation(getScaleAnimation())
                 }
             }
+
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 when (v.id) {
@@ -118,27 +122,33 @@ class PersonalCenterActivity :
                         JumpUtil.jumpActivity(RouterUrlCommon.home, mContext)
                         finish()
                     }
+
                     R.id.tvServiceAgreement -> {
                         //用户服务协议
                         JumpUtil.jumpActivity(RouterUrlCommon.userAgreement)
                     }
+
                     R.id.tvPrivacyPolicy -> {
                         //隐私保护政策
                         JumpUtil.jumpActivity(RouterUrlCommon.privacyAgreement)
                     }
+
                     R.id.tvEquipmentServices -> {
                         //设备租赁及服务
                         JumpUtil.jumpActivity(RouterUrlCommon.leaseAgreement, mContext)
                     }
+
                     R.id.settingLayout -> {
                         //设置
                         JumpUtil.jumpActivity(RouterUrlCommon.setting, mContext)
                     }
+
                     R.id.btnLoginOut -> {
                         loginOut()
                     }
                 }
             }
+
             MotionEvent.ACTION_CANCEL -> {
                 if (v.id == R.id.layoutHome || v.id == R.id.tvServiceAgreement || v.id == R.id.tvPrivacyPolicy ||
                     v.id == R.id.tvEquipmentServices || v.id == R.id.settingLayout || v.id == R.id.btnLoginOut
@@ -166,6 +176,7 @@ class PersonalCenterActivity :
             User.saveMobile("")
             User.saveIdCard("")
             User.saveOrgCode("")
+            User.savePadNo("")
             V2TIMManager.getInstance().logout(object : V2TIMCallback {
                 override fun onSuccess() {
                 }