代码优化

app/proguard-rules.pro

@@ -309,10 +309,6 @@
         }
 
 
-
-
-
-
         -keep class com.uc.crashsdk.** { *; }
         -keep interface com.uc.crashsdk.** { *; }
 

app/src/main/java/com/mints/street/bean/UserBean.kt

@@ -5,31 +5,20 @@ import java.io.Serializable
 /**
  * 描述：用户信息
  * 作者：孟崔广
- * 时间：2019/10/29 18:42
- * 邮箱：mengcga@163.com
+ * 时间：2021/7/29 18:42
  */
 class UserBean : Serializable {
-    val token: String? = null
-    val toKeepAnAccount: String? = null
+    val token: String = ""
     val consumer: ConsumerBean? = null
 
     inner class ConsumerBean : Serializable {
-        val head: String? = null
-        val openid: String? = null
-        val nickname: String? = null
-        val mobile: String? = null
-        val real_name: String? = null
-        val alipay_account: String? = null
-        val idcode: String? = null
-        val gameInfo: String? = null
-        var sumCoin: String? = null
-        val surplus //余额
-                = 0.0
-        val coin // 积分
-                = 0
+        val head: String = ""
+        val openid: String = ""
+        val nickname: String = ""
+        val mobile: String = ""
+        val real_name: String = ""
+        val idcode: String = ""
         val pk_id // 用户id
                 : Long = 0
-        val isFirstSignInApp // 首次登录app true:首次
-                = false
     }
 }

app/src/main/java/com/mints/street/login/LoginActivity.kt

@@ -12,6 +12,7 @@ import kotlinx.android.synthetic.main.include_header.*
  * Created by 冯瑞雨 on 2021/7/2.
  */
 class LoginActivity : BaseActivity<ActivityLoginBinding, LoginViewModel>(), View.OnClickListener {
+
     override fun initContentView(savedInstanceState: Bundle?) = R.layout.activity_login
 
     override fun initVariableId() = BR.viewModel

app/src/main/java/com/mints/street/login/LoginViewModel.kt

@@ -11,9 +11,9 @@ import me.goldze.mvvmhabit.utils.KLog
 /**
  * Created by 冯瑞雨 on 2021/7/2.
  */
-class LoginViewModel(application:Application):BaseViewModel(application) {
+class LoginViewModel(application: Application) : BaseViewModel(application) {
 
-    fun login(){
+    fun login() {
 //        val vo = hashMapOf<String, Any>()
 //        vo["shumeiId"] = ""
 //        vo["mobile"] = ""
@@ -22,13 +22,10 @@ class LoginViewModel(application:Application):BaseViewModel(application) {
 
         ApiModel.coinMsg(lifecycleProvider).safeSubscribe(
                 object : HttpSubscribeImpl<BaseResponse<AwardBean>>(
-                        this@LoginViewModel,true){
-            override fun onBusinessSuccess(response: BaseResponse<AwardBean>) {
-                KLog.e("sfdsdf",response.result.toString())
-            }
-            override fun onBusinessFail(response: BaseResponse<AwardBean>?) {
-
-            }
-        })
+                        this@LoginViewModel, true) {
+                    override fun onBusinessSuccess(response: BaseResponse<AwardBean>) {
+                        KLog.e("sfdsdf", response.result.toString())
+                    }
+                })
     }
 }
\ No newline at end of file

app/src/main/java/com/mints/street/manager/UserManager.kt

@@ -13,11 +13,6 @@ class UserManager {
 
     companion object {
 
-        /**
-         *  游客 or 登录用户
-         */
-        private const val IS_TEMP_USER = "is_temp_user"
-
         /**
          * 用户ID
          */
@@ -43,41 +38,6 @@ class UserManager {
          */
         private const val REAL_NAME = "realName"
 
-        /**
-         * 支付宝
-         */
-        private const val ALIPAY_ACCOUNT = "alipay_account"
-
-        /**
-         * 用户金币
-         */
-        private const val USER_GOLD = "user_gold"
-
-        /**
-         * 用户总金币
-         */
-        private const val USER_SUM_GOLD = "user_sum_gold"
-
-        /**
-         * 用户零钱
-         */
-        private const val USER_CASH = "user_cash"
-
-        /**
-         * 是否老用户  true-老用户
-         */
-        private const val USER_OLD = "user_old"
-
-        /**
-         * 猎豹游戏info
-         */
-        private const val GAME_INFO = "game_info"
-
-        /**
-         * 广告隐藏标识
-         */
-        private const val AD_SHOW_FLAG = "ad_show_flag"
-
         /**
          * 微信名称
          */
@@ -117,25 +77,16 @@ class UserManager {
         if (user != null) {
             val mobile: String? = user.mobile
             val openid: String? = user.openid
-            if (mobile == null && openid == null) {
-                MMKV.mmkvWithID(IS_TEMP_USER).remove(IS_TEMP_USER)
-            } else {
-                MMKV.mmkvWithID(IS_TEMP_USER).encode(IS_TEMP_USER, mobile + openid)
-            }
             MMKV.mmkvWithID(USER_ID).encode(USER_ID, user.pk_id.toString())
             MMKV.mmkvWithID(CODE_ID).encode(CODE_ID, user.idcode.toString())
-            MMKV.mmkvWithID(MOBILE).encode(MOBILE, mobile)
-            MMKV.mmkvWithID(ALIPAY_ACCOUNT)
-                .encode(ALIPAY_ACCOUNT, user.alipay_account.toString())
-            MMKV.mmkvWithID(USER_GOLD).encode(USER_GOLD, user.coin.toString())
-            MMKV.mmkvWithID(USER_CASH)
-                .encode(USER_CASH, String.format("%.2f", user.surplus))
-            MMKV.mmkvWithID(USER_SUM_GOLD).encode(USER_SUM_GOLD, user.sumCoin.toString())
-            MMKV.mmkvWithID(USER_OLD).encode(USER_OLD, !user.isFirstSignInApp)
+            if (!TextUtils.isEmpty(mobile)) {
+                MMKV.mmkvWithID(MOBILE).encode(MOBILE, mobile)
+            }
             MMKV.mmkvWithID(WX_NAME).encode(WX_NAME, user.nickname.toString())
             MMKV.mmkvWithID(WX_HEADER).encode(WX_HEADER, user.head)
-            MMKV.mmkvWithID(WX_OPENID).encode(WX_OPENID, openid)
-            MMKV.mmkvWithID(GAME_INFO).encode(GAME_INFO, user.gameInfo)
+            if (!TextUtils.isEmpty(openid)) {
+                MMKV.mmkvWithID(WX_OPENID).encode(WX_OPENID, openid)
+            }
             MMKV.mmkvWithID(REAL_NAME).encode(REAL_NAME, user.real_name)
         }
     }
@@ -154,7 +105,7 @@ class UserManager {
      * @return true为已登录   false 为未登录
      */
     fun userIsLogin(): Boolean {
-        val kv = MMKV.mmkvWithID(IS_TEMP_USER).decodeString(IS_TEMP_USER, "")
+        val kv = MMKV.mmkvWithID(WX_OPENID).decodeString(WX_OPENID, "")
         return !TextUtils.isEmpty(kv)
     }
 
@@ -200,83 +151,6 @@ class UserManager {
         kv.encode(REAL_NAME, name)
     }
 
-    /**
-     * 是否老用户  true-老用户
-     */
-    fun getUserOld(): Boolean {
-        val kv = MMKV.mmkvWithID(USER_OLD)
-        return kv.decodeBool(USER_OLD, false)
-    }
-
-    fun getAdShowFlag(): Boolean {
-        val kv = MMKV.mmkvWithID(AD_SHOW_FLAG)
-        return kv.decodeBool(AD_SHOW_FLAG, false)
-    }
-
-    /**
-     * 设置真实姓名
-     *
-     * @param userOld
-     */
-    fun setUserOld(userOld: Boolean) {
-        val kv = MMKV.mmkvWithID(USER_OLD)
-        kv.encode(USER_OLD, userOld)
-    }
-
-    /**
-     * 获取支付宝账户
-     */
-    fun getAlipayAccount(): String {
-        val kv = MMKV.mmkvWithID(ALIPAY_ACCOUNT)
-        return kv.decodeString(ALIPAY_ACCOUNT, "")
-    }
-
-    /**
-     * 设置支付宝账户
-     *
-     * @param alipay
-     */
-    fun setAlipayAccount(alipay: String?) {
-        val kv = MMKV.mmkvWithID(ALIPAY_ACCOUNT)
-        kv.encode(ALIPAY_ACCOUNT, alipay)
-    }
-
-    fun getUserSumGold(): String {
-        val kv = MMKV.mmkvWithID(USER_SUM_GOLD)
-        return kv.decodeString(USER_SUM_GOLD, "")
-    }
-
-    /**
-     * 获取用户金币/积分
-     */
-    fun getUserGold(): String {
-        val kv = MMKV.mmkvWithID(USER_GOLD)
-        return kv.decodeString(USER_GOLD, "")
-    }
-
-    /**
-     * 设置用户金币/积分
-     *
-     * @param gold
-     */
-    fun setUserGold(gold: String?) {
-        val kv = MMKV.mmkvWithID(USER_GOLD)
-        kv.encode(USER_GOLD, gold)
-    }
-
-    /**
-     * 获取用户零钱
-     */
-    fun getUserCash(): String {
-        val kv = MMKV.mmkvWithID(USER_CASH)
-        return kv.decodeString(USER_CASH, "")
-    }
-
-    fun getGameInfo(): String {
-        val kv = MMKV.mmkvWithID(GAME_INFO)
-        return kv.decodeString(GAME_INFO, "")
-    }
-
     fun getWxName(): String {
         val kv = MMKV.mmkvWithID(WX_NAME)
         return kv.decodeString(WX_NAME, "")
@@ -292,21 +166,6 @@ class UserManager {
         return kv.decodeString(WX_OPENID, "")
     }
 
-    /**
-     * 设置用户零钱
-     *
-     * @param cash
-     */
-    fun setUserCash(cash: String?) {
-        val kv = MMKV.mmkvWithID(USER_CASH)
-        kv.encode(WX_OPENID, cash)
-    }
-
-    fun setGameInfo(gameInfo: String?) {
-        val kv = MMKV.mmkvWithID(GAME_INFO)
-        kv.encode(GAME_INFO, gameInfo)
-    }
-
     fun setWxName(wxName: String?) {
         val kv = MMKV.mmkvWithID(WX_NAME)
         kv.encode(WX_NAME, wxName)
@@ -327,25 +186,14 @@ class UserManager {
         kv.encode(MOBILE, mobile)
     }
 
-    fun setAdShowFlag(adShowFlag: Boolean) {
-        val kv = MMKV.mmkvWithID(AD_SHOW_FLAG)
-        kv.encode(AD_SHOW_FLAG, adShowFlag)
-    }
-
     fun userLogout() {
         MMKV.mmkvWithID(USER_ID).remove(USER_ID)
         MMKV.mmkvWithID(CODE_ID).remove(CODE_ID)
         MMKV.mmkvWithID(TOKEN_ID).remove(TOKEN_ID)
         MMKV.mmkvWithID(REAL_NAME).remove(REAL_NAME)
-        MMKV.mmkvWithID(IS_TEMP_USER).remove(IS_TEMP_USER)
-        MMKV.mmkvWithID(ALIPAY_ACCOUNT).remove(ALIPAY_ACCOUNT)
-        MMKV.mmkvWithID(USER_GOLD).remove(USER_GOLD)
-        MMKV.mmkvWithID(USER_CASH).remove(USER_CASH)
-        MMKV.mmkvWithID(USER_OLD).remove(USER_OLD)
         MMKV.mmkvWithID(WX_OPENID).remove(WX_OPENID)
         MMKV.mmkvWithID(WX_NAME).remove(WX_NAME)
         MMKV.mmkvWithID(WX_HEADER).remove(WX_HEADER)
-//        MMKV.mmkvWithID(GAME_INFO).remove(GAME_INFO)
     }
 
 }
\ No newline at end of file

mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/BaseResponse.java

@@ -43,7 +43,7 @@ public class BaseResponse<T> {
     }
 
     public boolean isOk() {
-        return status >= 200 && status < 300;
+        return status == 200 && status < 700;
     }
 
     public String getMessage() {