1.优化首页消息弹窗展示逻辑

baselib/src/main/java/com/yingyangfly/baselib/dialog/BindingPhoneDialog.kt

@@ -88,8 +88,8 @@ class BindingPhoneDialog : DialogFragment() {
     private fun initListener() {
         btnCode?.click {
             if (mContent != null) {
-                if (editCode?.text.toString().trim().isEmpty()) {
-                    "请输入验证码".toast()
+                if (editPhone?.text.toString().trim().isEmpty()) {
+                    "请输入手机号".toast()
                 } else {
                     sendCode()
                 }
@@ -125,7 +125,7 @@ class BindingPhoneDialog : DialogFragment() {
      */
     private fun sendCode() {
         BaselibServiceFactory.getService()
-            .sendCode(editPhone?.text.toString().trim())
+            .getCheckCode(editPhone?.text.toString().trim())
             .subscribeOn(Schedulers.io())
             .compose(MyRxScheduler.ioMain(mContent!!, true))
             .subscribe(object : BaseObserver<Any>() {
@@ -144,7 +144,7 @@ class BindingPhoneDialog : DialogFragment() {
      */
     private fun login() {
         BaselibServiceFactory.getService()
-            .loginMsg(editPhone?.text.toString().trim(), editCode?.text.toString().trim())
+            .largeLoginMsg(editPhone?.text.toString().trim(), editCode?.text.toString().trim())
             .subscribeOn(Schedulers.io())
             .compose(MyRxScheduler.ioMain(mContent!!, true))
             .subscribe(object : BaseObserver<String>() {
@@ -153,8 +153,8 @@ class BindingPhoneDialog : DialogFragment() {
                         User.saveToken(t!!)
                         User.savePhone(editPhone?.text.toString().trim())
                         onDialogClickListener?.invoke(editPhone?.text.toString().trim())
-                        dismiss()
                     }
+                    dismiss()
                 }
 
                 override fun onFail(msg: String) {

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

@@ -52,4 +52,21 @@ interface BaselibApiService {
         @Query("checkCode") checkCode: String
     ): Observable<XBaseEntity<String>>
 
+    /**
+     * 获取验证码
+     */
+    @POST("large-screen/getCheckCode")
+    fun getCheckCode(
+        @Query("mobile") mobile: String
+    ): Observable<XBaseEntity<Any>>
+
+    /**
+     * 验证码登录
+     */
+    @POST("large-screen/loginMsg")
+    fun largeLoginMsg(
+        @Query("mobile") mobile: String,
+        @Query("checkCode") checkCode: String
+    ): Observable<XBaseEntity<String>>
+
 }

home/src/main/java/com/yingyangfly/home/hospital/HospitalViewModel.kt

@@ -13,7 +13,7 @@ class HospitalViewModel : BaseViewModel() {
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: String?) -> Unit)? = null,
     ) = launchFlow(true) {
-        HOME_API.logout()
+        HOME_API.largeLogout()
     }.runUI(
         success,
         fail

home/src/main/java/com/yingyangfly/home/net/HomeApiService.kt

@@ -90,4 +90,10 @@ interface HomeApiService {
     @POST("app/reviewTask/his")
     suspend fun getReviewTaskHistoryList(@Body requestBody: RequestBody): BaseResp<List<EvaluationHistoryBean>>
 
+    /**
+     * 退出登录
+     */
+    @POST("large-screen/logout")
+    suspend fun largeLogout(): BaseResp<String>
+
 }