Преглед на файлове

1.添加区域码的校验功能。

20241218TB223FC(测试jar包)
wangwanlei преди 10 месеца
родител
ревизия
ccc3510844

+ 5
- 0
app/src/main/java/com/xhly/manageapp/network/UriAdress.kt Целия файл

@@ -123,4 +123,9 @@ object UriAdress {
123 123
      * pushType  6恢复出厂设置
124 124
      */
125 125
     const val EDIT_RESETED="/logdoperate/edit_reseted"
126
+
127
+    /**
128
+     * 区域码校验 参数regionCode string
129
+     */
130
+    const val REGION_CHECK_CODE="region/check_code"
126 131
 }

+ 8
- 0
app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt Целия файл

@@ -83,6 +83,11 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
83 83
                 Toast(getString(R.string.codeerror))
84 84
             }
85 85
         }
86
+        viewModel.regionCodeData.observe(this){
87
+           if (!it){
88
+               regioncode=""
89
+           }
90
+        }
86 91
         val exitControlFlag = currentSpUtils.getParam(Const.EXIT_CONTROL, false) as Boolean
87 92
         //如果解除管控为真,则不在执行以下代码
88 93
         if (!exitControlFlag){
@@ -267,6 +272,9 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
267 272
                         } else {
268 273
                             ""
269 274
                         }
275
+                        if (regioncode.isNotEmpty()){
276
+                            viewModel.postRegionCheckCode(regioncode)
277
+                        }
270 278
                     }
271 279
                     cancelTv.setOnClickListener {
272 280
                         dialog.dismiss()

+ 6
- 0
app/src/main/java/com/xhly/manageapp/ui/login/netservice/LoginService.kt Целия файл

@@ -67,4 +67,10 @@ interface LoginService {
67 67
      */
68 68
     @POST(UriAdress.EDIT_RESETED)
69 69
     suspend fun postExitReseted(@Body map:HashMap<String,Any>):ResponseData<Any>
70
+
71
+    /**
72
+     * 区域码校验
73
+     */
74
+    @POST(UriAdress.REGION_CHECK_CODE)
75
+    suspend fun postRegionCheckCode(@Body map:HashMap<String,Any>):ResponseData<Boolean>
70 76
 }

+ 34
- 14
app/src/main/java/com/xhly/manageapp/ui/login/viewmodel/LoginViewModel.kt Целия файл

@@ -2,6 +2,7 @@ package com.xhly.manageapp.ui.login.viewmodel
2 2
 
3 3
 import androidx.lifecycle.LiveData
4 4
 import androidx.lifecycle.MutableLiveData
5
+import com.xhly.corelib.utils.LogShow
5 6
 import com.xhly.manageapp.bean.login.LoginBean
6 7
 import com.xhly.manageapp.bean.user.UserBean
7 8
 import com.xhly.manageapp.viewmodel.BaseViewModel
@@ -10,23 +11,42 @@ class LoginViewModel: BaseViewModel() {
10 11
 
11 12
     private val loginResult=MutableLiveData<UserBean>()
12 13
     val loginData:LiveData<UserBean> =loginResult
14
+    private val regionCodeResult=MutableLiveData<Boolean>()
15
+    val regionCodeData:LiveData<Boolean> =regionCodeResult
13 16
 
14 17
     fun login(loginBean: LoginBean){
15 18
         launchUI {
16
-            val postLogin = loginService.postLogin(loginBean)
17
-            if (postLogin.code==0){
18
-                if (postLogin.obj!=null){
19
-                    loginResult.value=postLogin.obj
20
-                }
21
-            }else{
22
-                val userBean=UserBean()
23
-                userBean.xhlyLoginSucess=false
24
-                if (postLogin.msg!=null){
25
-                    userBean.xhlyLoginMessage=postLogin.msg
26
-                }
27
-                loginResult.value=userBean
28
-            }
19
+          try {
20
+              val postLogin = loginService.postLogin(loginBean)
21
+              if (postLogin.code==0){
22
+                  if (postLogin.obj!=null){
23
+                      loginResult.value=postLogin.obj
24
+                  }
25
+              }else{
26
+                  val userBean=UserBean()
27
+                  userBean.xhlyLoginSucess=false
28
+                  if (postLogin.msg!=null){
29
+                      userBean.xhlyLoginMessage=postLogin.msg
30
+                  }
31
+                  loginResult.value=userBean
32
+              }
33
+          }catch (e:Exception){
34
+              val userBean=UserBean()
35
+              userBean.xhlyLoginSucess=false
36
+              loginResult.value=userBean
37
+              LogShow(e.toString())
38
+          }
29 39
         }
30 40
     }
31
-
41
+  fun postRegionCheckCode(regionCode:String){
42
+      launchUI {
43
+          val map=HashMap<String,Any>()
44
+          map["regionCode"]=regionCode
45
+          val result = loginService.postRegionCheckCode(map)
46
+          regionCodeResult.value = result.code==0&& result.obj
47
+          if (!result.msg.isNullOrEmpty()){
48
+              netMessage.value=result.msg
49
+          }
50
+      }
51
+  }
32 52
 }

Loading…
Отказ
Запис