shihuiyun 2 years ago
parent
commit
bab0cbf3e7

+ 4 - 0
app/src/main/java/com/hdl/xl/activity/MainActivity.kt

@@ -25,11 +25,15 @@ class MainActivity : MBActivity<MainVModel, ActivityMainBinding>(){
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
         StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00000000"))
+//        vm.getUserInfo()
         initData()
         //检查更新
         UpdateUtils.checkUpgrade(false,true)
 
+    }
 
+    override fun vmClass(): Class<MainVModel> {
+        return MainVModel::class.java
     }
 
     private fun initData() {

+ 2 - 2
app/src/main/java/com/hdl/xl/fragment/HomeFirstFragment.kt

@@ -42,9 +42,9 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
-        vm.toGetBanner()
+
         vm.getUserInfo()
-        vm.getMessageList()
+
 
 
         vm.bannerList.observe(this) {

+ 14 - 17
app/src/main/java/com/hdl/xl/vmodel/MainVModel.kt

@@ -2,9 +2,12 @@ package com.hdl.xl.vmodel
 
 import android.app.Application
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import com.hdl.xl.model.User
+import com.hdl.xl.utils.net.NetEngine
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import kotlinx.coroutines.launch
 
 /**
  *
@@ -12,27 +15,21 @@ import com.ysnows.base.base.BViewModel
  */
 class MainVModel(application: Application) : BViewModel<BRepository>(application) {
 
-    val user: MutableLiveData<com.hdl.xl.model.User> = MutableLiveData<com.hdl.xl.model.User>()
 
-    fun getUserInfo(){
 
-//        viewModelScope.launch {
-//
-//            var it  = repository().lreqTo { NetEngine.service.getUser() }
-//            if(it.ok(false)){
-//
-//                user.value = it.datas
-//                it.data()?.let { user ->
-//                    user.save()
-//                }
-//
-//            }
-//
-//        }
+    fun getUserInfo() {
 
-    }
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.getUser() }
+            if (it.ok()) {
+
+                it.data()?.let { user ->
+                    user.save()
+                }
 
-   //去登陆
+            }
+        }
+    }
 
 
 

+ 4 - 2
base/src/main/java/com/ysnows/base/base/BRRepository.kt

@@ -58,8 +58,10 @@ open class BRRepository : BRepository() {
                         view().refreshing(false)
                     }
                 }
-                bView.toLogin()
-                // bView.processCodeOffline()
+                if(resp.isLogin()==-1) {
+                    bView.toLogin()
+                }
+               //  bView.processCodeOffline()
             } else {
 
                 if (page <= 1) {

+ 3 - 0
base/src/main/java/com/ysnows/base/base/BRepository.kt

@@ -200,6 +200,9 @@ open class BRepository : IRepository {
                     }
                 }
 
+//                if(resp.isLogin()==-1){
+//                    bView.toLogin()
+//                }
                 bView.processCodeOffline()
             } else {
                 when {

+ 1 - 1
base/src/main/java/com/ysnows/base/net/Resp.kt

@@ -9,7 +9,7 @@ open class Resp<D>(
         val total: Int = 0,
         val count: Int = 10,
         val data: D? = null,
-        val is_login:Int=0//0 登录超时 1登录成功
+        val is_login:Int=0//0 登录超时 1登录成功 -1需要重新登录
 
 ) : IResp<D> {