中建365-二期开发-项目瘦包及bug修复

app/src/main/java/com/zj365/dc/activity/MainActivity.kt

@@ -175,9 +175,11 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData>  {
                     "user_release_${MMkvHelper.getLong(Const.USER_ID)}"
                 )
        //     }
+
+            mViewModel.getUserEquipmentInformationizationRequest(userId)
         }
 
-        mViewModel.getUserEquipmentInformationizationRequest(userId)
+
         mViewModel.getBanners(userId,3)
 
 

app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt

@@ -706,7 +706,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
         } else {
             MMkvHelper.getLong(Const.USER_ID).toString()
         }
-        request()
+       // request()
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

app/src/main/java/com/zj365/dc/fragment/MineFrag.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.text.TextUtils
+import android.util.Log
 import android.view.View
 import androidx.annotation.RequiresApi
 import cn.jpush.android.api.JPushInterface
@@ -62,6 +63,8 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
     var isDemonstrate: Boolean = false
 
     var otherInfo: UserOtherInfo? = null
+
+    var isLogin= false
     override fun setLayout(): View = binding.root
 
     private val defaultIcon by lazy {
@@ -529,8 +532,7 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
 
     override fun onResume() {
         super.onResume()
-        if (!TextUtils.isEmpty(showIdInfo)){
+        if (!TextUtils.isEmpty(showIdInfo)  && !isLogin){
-
             Const.mainLiveData.value?: mViewModel.getMySetting()
 
             Const.userDeviceLiveData.value?:mViewModel.getUserDeviceInfo(showIdInfo)
@@ -538,6 +540,10 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
             mViewModel.getUserOtherInfo()
         }
 
+        if(isLogin){
+            isLogin = false
+        }
+
     }
 
     override fun observer() {
@@ -643,6 +649,7 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
         } else {
             MMkvHelper.getLong(Const.USER_ID).toString()
         }
+        isLogin = true
         mViewModel.getMySetting()
         mViewModel.getUserDeviceInfo(showIdInfo)
         mViewModel.searchInviteInfo()

config.gradle

@@ -6,8 +6,8 @@ ext {
             appId            : "com.zj365.dc",
             minSdk           : 23,
             targetSdk        : 32,
-            versionCode      : 116,
+            versionCode      : 118,
-            versionName      : "1.1.2"
+            versionName      : "1.2.0"
     ]
 
 
@@ -25,28 +25,28 @@ ext {
     url = [
             releaseTime:    String.valueOf(new Date().format("ddHHmm")),
             //正式环境
-            /*debug_url  : "https://app.zhongjian365.com/app/",
+            debug_url  : "https://app.zhongjian365.com/app/",
             release_url: "https://app.zhongjian365.com/app/",
 
             h5_debug_url : "https://built.zhongjian365.com/",
-            h5_release_url : "https://built.zhongjian365.com/"*/
+            h5_release_url : "https://built.zhongjian365.com/"
             //测试环境
-            debug_url  : "http://java01.zhongjian365.com/app/",
+           /* debug_url  : "http://java01.zhongjian365.com/app/",
             release_url: "http://java01.zhongjian365.com/app/",
 
             h5_debug_url : "http://testbuilt.zhongjian365.com/",
-            h5_release_url : "http://testbuilt.zhongjian365.com/"
+            h5_release_url : "http://testbuilt.zhongjian365.com/"*/
 
 
     ]
 
     image_preifx = [
-
+/*
             debug_url  : "http://java01.zhongjian365.com/app/",
-            release_url: "http://java01.zhongjian365.com/app/"
+            release_url: "http://java01.zhongjian365.com/app/"*/
 
-//debug_url  : "http://175.6.39.20:8181/app/",
+            debug_url  : "https://app.zhongjian365.com/app/",
-//release_url: "http://175.6.39.20:8181/app/"
+            release_url: "https://app.zhongjian365.com/app/"
 
 
     ]