将发送短信验证码接口以及相关能力迁移到BGeneralBusiness

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/URLs.kt

@@ -18,8 +18,6 @@ class URLs {
     const val getKSYunObjectId = "Ksy/ksyun/buildObectid"
     const val getKSYunBucket = "Ksy/ksyun/getBucket"
     const val businessLicenseOCR = "/Identify/BusLicense/businessLicenseOcr"
-    const val sendMsgCode = "/sms/sms/send_code"
-    const val mobileLogin = "/user/user/login"
     const val userLogout = "/user/user/logout"
     const val accountList = "/merchant/auth/account_list"
     const val createLifeAccount = "/merchant/enterprise/check_life"

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/ZapServiceNameConstants.kt

@@ -9,6 +9,10 @@ class ZapServiceNameConstants {
   companion object {
     // 生活号列表服务名称
     const val LifeNumberListServiceName = "LifeNumberListService"
+    // BGeneralBusiness组件中提供的通用服务
+    const val GeneralAbilityServiceName = "GeneralAbilityServiceName"
+    // BGeneralBusiness组件中给H5提供的通用网络请求服务(名称需要和H5同步的)
+    const val BNAHttpReq = "BNAHttpReq"
 
   }
 

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/app/BGeneralBusinessApplication.kt

 package com.yidian.shenghuoquan.bgeneralbusiness.app
 
 import com.yidian.bcommon.app.YdBaseApplication
+import com.yidian.bcommon.services.ZapServiceNameConstants
 import com.yidian.news.util.ProcessUtil
-import com.yidian.shenghuoquan.bgeneralbusiness.http.BNAHttpReqService
+import com.yidian.shenghuoquan.bgeneralbusiness.service.GeneralAbilityService
+import com.yidian.shenghuoquan.bgeneralbusiness.service.net.BNAHttpReqService
 import com.yidian.yac.core.core.YacModuleSpec
 import com.yidian.yac.core.zap.Zap
 
@@ -17,6 +19,7 @@ class BGeneralBusinessApplication : YdBaseApplication() {
   }
 
   private fun initService() {
-    Zap.addService(BNAHttpReqService.SERVICE_NAME, BNAHttpReqService())
+    Zap.addService(ZapServiceNameConstants.BNAHttpReq, BNAHttpReqService())
+    Zap.addService(ZapServiceNameConstants.GeneralAbilityServiceName, GeneralAbilityService())
   }
 }

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/GeneralBusinessApiService.kt

+package com.yidian.shenghuoquan.bgeneralbusiness.http
+
+import com.yidian.bcommon.http.*
+import io.reactivex.rxjava3.core.Observable
+import retrofit2.http.GET
+import retrofit2.http.QueryMap
+
+interface GeneralBusinessApiService {
+
+  private companion object {
+    const val sendMsgCode = "/sms/sms/send_code"
+  }
+
+  /**
+   * 发送验证码
+   */
+  @GET(sendMsgCode)
+  fun sendMsgCode(@QueryMap commonParams: Map<String, String>, @QueryMap params: Map<String, String?>): Observable<HttpResult<Any?>>
+}

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/GeneralBusinessRemoteDataService.kt

+package com.yidian.shenghuoquan.bgeneralbusiness.http
+
+import com.yidian.bcommon.http.*
+import com.yidian.http.ServiceFactory
+
+object GeneralBusinessRemoteDataService {
+
+  private var api = ServiceFactory.getInstance().createService(GeneralBusinessApiService::class.java)
+
+  // 获取短信验证码
+  fun sendMsgCode(requestParams: HashMap<String, String?>, callback: ((Boolean) -> Unit)? = null) {
+    val timeStamp = System.currentTimeMillis()
+    val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+    val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
+    api.sendMsgCode(publicParamsMap, privateParamsMap)
+      .compose(TransformUtil.defaultSchedulers())
+      .subscribe(object : HttpResultSubscriber<Any?>() {
+        override fun onSuccess(result: HttpResult<Any?>?) {
+          callback?.invoke(true)
+        }
+
+        override fun onFailure(result: HttpResult<Any?>?) {
+        }
+      })
+  }
+}

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/service/GeneralAbilityService.kt

+package com.yidian.shenghuoquan.bgeneralbusiness.service
+
+import com.yidian.bcommon.services.ZapServiceActionConstants
+import com.yidian.shenghuoquan.bgeneralbusiness.http.GeneralBusinessRemoteDataService
+import com.yidian.xarc.xrouter.ResultResolver
+import com.yidian.yac.core.zap.ZapService
+import org.json.JSONObject
+
+
+/**
+ * 通用能力服务，提供其他组件的共用操作能力
+ */
+class GeneralAbilityService : ZapService() {
+
+  private lateinit var resolver: ResultResolver
+
+  override fun onAction(path: String, action: String, params: Any, options: Any, resolver: ResultResolver) {
+    this.resolver = resolver
+    params as JSONObject
+    when (action) {
+      ZapServiceActionConstants.ActionRequestSmsCode -> requestSmsCode(params)
+    }
+  }
+
+  override fun onExit() {
+  }
+
+  override fun onInit() {
+  }
+
+  /**
+   * 请求短信验证码
+   */
+  private fun requestSmsCode(params: JSONObject) {
+    val mobile = params.optString("mobile")
+    val scene = params.optString("scene")
+    val paramsMap = HashMap<String, String?>()
+    paramsMap["mobile"] = mobile
+    paramsMap["scene"] = scene
+    GeneralBusinessRemoteDataService.sendMsgCode(paramsMap) {
+      if (it) {
+        resolver.success(true)
+      }
+    }
+  }
+}

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/BNAHttpReqService.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/service/net/BNAHttpReqService.kt

-package com.yidian.shenghuoquan.bgeneralbusiness.http
+package com.yidian.shenghuoquan.bgeneralbusiness.service.net
 
 import com.google.gson.Gson
 import com.yidian.bcommon.BuildConfig
 import com.yidian.bcommon.http.HttpResult
-import com.yidian.shenghuoquan.bgeneralbusiness.http.callback.IBNARequestCallBack
+import com.yidian.shenghuoquan.bgeneralbusiness.service.net.callback.IBNARequestCallBack
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.yac.core.zap.ZapService
 import org.json.JSONObject
@@ -14,10 +14,6 @@ import org.json.JSONObject
  */
 class BNAHttpReqService : ZapService() {
 
-  companion object {
-    const val SERVICE_NAME: String = "BNAHttpReq"
-  }
-
   private lateinit var resolver: ResultResolver
 
   override fun onAction(path: String, action: String, params: Any, options: Any, resolver: ResultResolver) {

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/BNARemoteDataSource.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/service/net/BNARemoteDataSource.kt

-package com.yidian.shenghuoquan.bgeneralbusiness.http
+package com.yidian.shenghuoquan.bgeneralbusiness.service.net
 
 import com.yidian.bcommon.http.HttpParamsUtils
 import com.yidian.bcommon.http.HttpResult
 import com.yidian.bcommon.http.HttpResultSubscriber
 import com.yidian.bcommon.http.TransformUtil
-import com.yidian.shenghuoquan.bgeneralbusiness.http.callback.IBNARequestCallBack
+import com.yidian.shenghuoquan.bgeneralbusiness.service.net.callback.IBNARequestCallBack
 import com.yidian.http.ServiceFactory
 
 object BNARemoteDataSource {

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/BNAService.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/service/net/BNAService.kt

-package com.yidian.shenghuoquan.bgeneralbusiness.http
+package com.yidian.shenghuoquan.bgeneralbusiness.service.net
 
 import com.yidian.bcommon.http.HttpResult
 import io.reactivex.rxjava3.core.Observable

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/callback/IBNARequestCallBack.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/service/net/callback/IBNARequestCallBack.kt

-package com.yidian.shenghuoquan.bgeneralbusiness.http.callback
+package com.yidian.shenghuoquan.bgeneralbusiness.service.net.callback
 
 import com.yidian.bcommon.http.HttpResult
 

Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/http/SettingService.kt → Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/http/SettingApiService.kt

@@ -5,11 +5,10 @@ import io.reactivex.rxjava3.core.Observable
 import retrofit2.http.GET
 import retrofit2.http.QueryMap
 
-interface SettingService {
+interface SettingApiService {
 
   private companion object {
     const val mobileLogin = "/user/user/login"
-//    const val sendMsgCode = "/sms/sms/send_code"
     const val userLogout = "/user/user/logout"
   }
 
@@ -19,12 +18,6 @@ interface SettingService {
   @GET(mobileLogin)
   fun mobileLogin(@QueryMap commonParams: Map<String, String>, @QueryMap params: Map<String, String?>): Observable<HttpResult<Any?>>
 
-//  /**
-//   * 发送验证码
-//   */
-//  @GET(sendMsgCode)
-//  fun sendMsgCode(@QueryMap commonParams: Map<String, String>, @QueryMap params: Map<String, String?>): Observable<HttpResult<Any?>>
-
   /**
    * 退出登录
    */

Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/http/SettingRemoteDataSource.kt

@@ -9,7 +9,7 @@ import com.yidian.shenghuoquan.bsetting.bean.MobileLoginBean
 
 object SettingRemoteDataSource {
 
-  private var api = ServiceFactory.getInstance().createService(SettingService::class.java)
+  private var api = ServiceFactory.getInstance().createService(SettingApiService::class.java)
 
   /**
    * 手机号登录

Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/ui/login/LoginLifeCircleActivity.kt

@@ -194,7 +194,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), View.OnFoc
     val jsonObject = JSONObject()
     jsonObject.put("mobile", mobile)
     jsonObject.put("scene", "login")
-    ZapTicket(ZapServiceNameConstants.LifeNumberListServiceName)
+    ZapTicket(ZapServiceNameConstants.GeneralAbilityServiceName)
       .withAction(ZapServiceActionConstants.ActionRequestSmsCode)
       .withServiceParams(jsonObject)
       .onResult { result ->

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/ApiService.kt

@@ -55,24 +55,6 @@ class ApiService {
         })
     }
 
-    // 获取短信验证码
-    fun sendMsgCode(requestParams: HashMap<String, String?>, callback: ((Boolean) -> Unit)? = null) {
-      val timeStamp = System.currentTimeMillis()
-      val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
-      ServiceFactory.getInstance().createService(CommonService::class.java)
-        .sendMsgCode(publicParamsMap, privateParamsMap)
-        .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<Any?>() {
-          override fun onSuccess(result: HttpResult<Any?>?) {
-            callback?.invoke(true)
-          }
-
-          override fun onFailure(result: HttpResult<Any?>?) {
-          }
-        })
-    }
-
     // 用户退出登录接口
     fun userLogout(apiCallback: IUserLogoutCallBack) {
       val timeStamp = System.currentTimeMillis()

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/CommonService.kt

@@ -51,12 +51,6 @@ interface CommonService {
     @Body requestParams: Map<String, String?>
   ): Observable<HttpResult<Any?>>
 
-  @GET(URLs.sendMsgCode)
-  fun sendMsgCode(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>): Observable<HttpResult<Any?>>
-
-  @GET(URLs.mobileLogin)
-  fun mobileLogin(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>): Observable<HttpResult<Any?>>
-
   @GET(URLs.userLogout)
   fun userLogout(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>): Observable<HttpResult<Any?>>
 

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/http/PersonalRemoteDataSource.kt

@@ -36,26 +36,6 @@ object PersonalRemoteDataSource {
       })
   }
 
-  /**
-   * 获取短信验证码
-   */
-  fun getSmsCode(apiCallback: IPersonalGetSmsCodeCallBack, requestParams: HashMap<String, String?>) {
-    val timeStamp = System.currentTimeMillis()
-    val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-    val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
-    api
-      .getSmsCode(publicParamsMap, privateParamsMap)
-      .compose(TransformUtil.defaultSchedulers())
-      .subscribe(object : HttpResultSubscriber<Any?>() {
-        override fun onSuccess(result: HttpResult<Any?>?) {
-          apiCallback.getSmsCodeSuccess()
-        }
-
-        override fun onFailure(result: HttpResult<Any?>?) {
-        }
-      })
-  }
-
   /**
    * 校验短信验证码
    */

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/http/PersonalService.kt

@@ -12,7 +12,6 @@ interface PersonalService {
   private companion object {
     const val accountList = "/merchant/enterprise/get_account_role_list"
     const val changeRole = "/merchant/enterprise/change_role"
-    const val sendMobileCode = "/sms/sms/send_code"
     const val checkMobileCode = "/merchant/enterprise/check_mobile_code"
     const val addUser = "/merchant/enterprise/add_user"
     const val disassociate = "/merchant/enterprise/delete_life_user"
@@ -30,12 +29,6 @@ interface PersonalService {
   @GET(changeRole)
   fun getChangeManager(@QueryMap commonParams: Map<String, String>, @QueryMap params: Map<String, String?>): Observable<HttpResult<Any?>>
 
-  /**
-   * 变更管理员 发送短信，老管理员/新管理员
-   */
-  @GET(sendMobileCode)
-  fun getSmsCode(@QueryMap commonParams: Map<String, String>, @QueryMap params: Map<String, String?>): Observable<HttpResult<Any?>>
-
   /**
    * 变更管理员 验证短信，老管理员/新管理员
    */

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/http/callback/IPersonalGetSmsCodeCallBack.kt

-package com.yidian.shenghuoquan.newscontent.personnel.http.callback
-
-
-interface IPersonalGetSmsCodeCallBack {
-  fun getSmsCodeSuccess()
-}
-

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/AddStaffActivity.kt

@@ -6,17 +6,20 @@ import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
+import com.yidian.bcommon.services.ZapServiceActionConstants
+import com.yidian.bcommon.services.ZapServiceNameConstants
 import com.yidian.bcommon.widget.EditTextInputCallback
 import com.yidian.bcommon.widget.PhoneNumberTextWatcher
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityAddStaffBinding
 import com.yidian.shenghuoquan.newscontent.personnel.http.PersonalRemoteDataSource
 import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalAddUserCallBack
-import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalGetSmsCodeCallBack
 import com.yidian.bcommon.utils.CountDownTimerUtils
 import com.yidian.bcommon.utils.TextWatcherAdapter
 import com.yidian.utils.ToastUtil
 import com.yidian.xpage.XPageManager
+import com.yidian.yac.core.zap.ZapTicket
+import org.json.JSONObject
 
 /**
  * 人员管理 —— 添加员工
@@ -122,21 +125,22 @@ class AddStaffActivity : BaseActivity<ActivityAddStaffBinding>() {
   }
 
   /**
-   * 获取验证码
+   * 请求短信验证码
    */
   private fun requestSmsCode(mobile: String) {
-    val paramsMap = HashMap<String, String?>()
-    paramsMap["mobile"] = mobile
-    paramsMap["scene"] = "add_user"
-    PersonalRemoteDataSource.getSmsCode(getSmsCodeCallBack, paramsMap)
-  }
-
-  private val getSmsCodeCallBack = object : IPersonalGetSmsCodeCallBack {
-
-    override fun getSmsCodeSuccess() {
-      // 开始倒计时
-      mCountDownTimerUtils.start()
-    }
+    val jsonObject = JSONObject()
+    jsonObject.put("mobile", mobile)
+    jsonObject.put("scene", "add_user")
+    ZapTicket(ZapServiceNameConstants.GeneralAbilityServiceName)
+      .withAction(ZapServiceActionConstants.ActionRequestSmsCode)
+      .withServiceParams(jsonObject)
+      .onResult { result ->
+        // 请求成功开始倒计时
+        if (result.result as Boolean) {
+          mCountDownTimerUtils.start()
+        }
+      }
+      .ship()
   }
 
   private val postAddUserCallBack = object : IPersonalAddUserCallBack {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerChangeActivity.kt

@@ -16,6 +16,8 @@ import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MANAG
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.initTitleBar
+import com.yidian.bcommon.services.ZapServiceActionConstants
+import com.yidian.bcommon.services.ZapServiceNameConstants
 import com.yidian.bcommon.widget.EditTextInputCallback
 import com.yidian.bcommon.widget.PhoneNumberTextWatcher
 import com.yidian.shenghuoquan.newscontent.R
@@ -24,7 +26,6 @@ import com.yidian.shenghuoquan.newscontent.databinding.ActivityManagerChangeBind
 import com.yidian.shenghuoquan.newscontent.personnel.http.PersonalRemoteDataSource
 import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalChangeAccountCallBack
 import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalCheckSmsCodeCallBack
-import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalGetSmsCodeCallBack
 import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
 import com.yidian.bcommon.utils.CountDownTimerUtils
 import com.yidian.bcommon.utils.StorageUtil
@@ -32,6 +33,8 @@ import com.yidian.bcommon.utils.TextWatcherAdapter
 import com.yidian.bcommon.webview.PublicWebViewActivity
 import com.yidian.utils.ToastUtil
 import com.yidian.xpage.XPageManager
+import com.yidian.yac.core.zap.ZapTicket
+import org.json.JSONObject
 
 /**
  * 人员管理 —— 管理员变更
@@ -192,13 +195,22 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
   }
 
   /**
-   * 获取验证码
+   * 请求短信验证码
    */
   private fun requestSmsCode(mobile: String) {
-    val paramsMap = HashMap<String, String?>()
-    paramsMap["mobile"] = mobile
-    paramsMap["scene"] = "enterprise"
-    PersonalRemoteDataSource.getSmsCode(getSmsCodeCallBack, paramsMap)
+    val jsonObject = JSONObject()
+    jsonObject.put("mobile", mobile)
+    jsonObject.put("scene", "enterprise")
+    ZapTicket(ZapServiceNameConstants.GeneralAbilityServiceName)
+      .withAction(ZapServiceActionConstants.ActionRequestSmsCode)
+      .withServiceParams(jsonObject)
+      .onResult { result ->
+        // 请求成功开始倒计时
+        if (result.result as Boolean) {
+          mCountDownTimerUtils.start()
+        }
+      }
+      .ship()
   }
 
   private fun updateChangeButton() {
@@ -241,14 +253,6 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
 
   }
 
-  private val getSmsCodeCallBack = object : IPersonalGetSmsCodeCallBack {
-
-    override fun getSmsCodeSuccess() {
-      // 开始倒计时
-      mCountDownTimerUtils.start()
-    }
-  }
-
   private val getCheckOldSmsCodeCallBack = object : IPersonalCheckSmsCodeCallBack {
 
     override fun checkSmsCodeSuccess() {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/LifeNumberListService.kt

@@ -31,7 +31,7 @@ class LifeNumberListService : ZapService() {
     params as JSONObject
     when (action) {
       ZapServiceActionConstants.ActionRequestList -> requestLifeNumberList()
-      ZapServiceActionConstants.ActionRequestSmsCode -> requestSmsCode(params)
+//      ZapServiceActionConstants.ActionRequestSmsCode -> requestSmsCode(params)
       ZapServiceActionConstants.ActionClearAuthenticationData -> clearAuthenticationData()
     }
   }
@@ -103,22 +103,6 @@ class LifeNumberListService : ZapService() {
 
   }
 
-  /**
-   * 请求短信验证码
-   */
-  private fun requestSmsCode(params: JSONObject) {
-    val mobile = params.optString("mobile")
-    val scene = params.optString("scene")
-    val paramsMap = HashMap<String, String?>()
-    paramsMap["mobile"] = mobile
-    paramsMap["scene"] = scene
-    ApiService.sendMsgCode(paramsMap) {
-      if (it) {
-        resolver.success(true)
-      }
-    }
-  }
-
   /**
    * 清除内存中的认证数据
    */