update 用户昵称和手机号在C端通过客户端信息服务获取

CommonLib/BCommon/src/main/java/com/yidian/bcommon/sdk/BCommonManager.kt

@@ -43,7 +43,6 @@ object BCommonManager {
 
   /**
    * 获取C端uid
-   * todo C端用户信息数据接口待定
    */
   fun getUid(): String? {
     var userId: String? = null
@@ -55,6 +54,32 @@ object BCommonManager {
     return userId
   }
 
+  /**
+   * 获取C端用户昵称
+   */
+  fun getUserName(): String? {
+    var userName: String? = null
+    if (JudgeClientUtils.judgeClient(YdBaseApplication.context.packageName) == ClientType.MERCHANT_C) {
+      ZapTicket(ZapServiceNameConstants.ClientInfoService).withAction(ZapServiceActionConstants.ActionGetUserInfo).onResult {
+        userName = (it.result as JSONObject).optString("userName")
+      }.ship()
+    }
+    return userName
+  }
+
+  /**
+   * 获取C端用户手机号
+   */
+  fun getUserPhone(): String? {
+    var userPhone: String? = null
+    if (JudgeClientUtils.judgeClient(YdBaseApplication.context.packageName) == ClientType.MERCHANT_C) {
+      ZapTicket(ZapServiceNameConstants.ClientInfoService).withAction(ZapServiceActionConstants.ActionGetUserInfo).onResult {
+        userPhone = (it.result as JSONObject).optString("userPhone")
+      }.ship()
+    }
+    return userPhone
+  }
+
   /**
    * 获取加密接口实现
    */

Components/BDemo/src/main/java/com/yidian/shenghuoquan/bdemo/service/ClientInfoService.kt

@@ -16,7 +16,7 @@ class ClientInfoService : ZapService() {
     when (action) {
       ZapServiceActionConstants.ActionGetUserInfo -> {
         // 获取C端userId 调试时可修改为开发者自己的userId
-        resolver.success(JSONObject().put("userId", "510227073302"))
+        resolver.success(JSONObject().put("userId", "510227073302").put("userName", "yjc0314").put("userPhone", "15054298387"))
       }
     }
   }

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/auth/LifeAccountCreateActivity.kt

@@ -6,18 +6,19 @@ import android.text.Editable
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.orhanobut.hawk.Hawk
+import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
-import com.yidian.bcommon.base.BaseActivity
+import com.yidian.bcommon.sdk.BCommonManager
+import com.yidian.bcommon.utils.InputFilterUtil
+import com.yidian.bcommon.utils.SensitiveInfoUtil
+import com.yidian.bcommon.utils.TextWatcherAdapter
 import com.yidian.shenghuoquan.bmanagercenter.R
-import com.yidian.shenghuoquan.bmanagercenter.http.callback.ICreateLifeAccountCallback
 import com.yidian.shenghuoquan.bmanagercenter.constant.Constant
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityLifeAccountCreateBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
-import com.yidian.bcommon.utils.InputFilterUtil
-import com.yidian.bcommon.utils.SensitiveInfoUtil
-import com.yidian.bcommon.utils.TextWatcherAdapter
+import com.yidian.shenghuoquan.bmanagercenter.http.callback.ICreateLifeAccountCallback
 import com.yidian.utils.ToastUtil
 import com.yidian.xpage.XPageManager
 
@@ -54,7 +55,10 @@ class LifeAccountCreateActivity : BaseActivity<ActivityLifeAccountCreateBinding>
       }
     }
     // 设置管理员信息
-    setUserName(Hawk.get(HawkConfig.Nickname, ""), Hawk.get(HawkConfig.Mobile, ""))
+    setUserName(
+      BCommonManager.getUserName() ?: Hawk.get(HawkConfig.Nickname, ""),
+      BCommonManager.getUserPhone() ?: Hawk.get(HawkConfig.Mobile, "")
+    )
   }
 
   private fun initView() {

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/auth/LifeAccountCreateCompleteActivity.kt

@@ -7,6 +7,7 @@ import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.bean.LifeAccountItemBean
 import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.sdk.BCommonManager
 import com.yidian.shenghuoquan.bmanagercenter.R
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityLifeAccountCreateCompleteBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
@@ -58,8 +59,8 @@ class LifeAccountCreateCompleteActivity : BaseActivity<ActivityLifeAccountCreate
   private fun initData() {
     viewBind.ivMerchantInfo.fillAuthInfo(
       params?.get(EXTRA_LIFE_ACCOUNT_NAME)?.let { it as String },
-      Hawk.get(HawkConfig.Nickname, ""),
-      Hawk.get(HawkConfig.Mobile, "")
+      BCommonManager.getUserName() ?: Hawk.get(HawkConfig.Nickname, ""),
+      BCommonManager.getUserPhone() ?: Hawk.get(HawkConfig.Mobile, "")
     )
   }
 

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/auth/LifeAccountPersonalAuthActivity.kt

@@ -4,20 +4,21 @@ import android.os.Bundle
 import android.view.View
 import android.widget.CompoundButton
 import com.orhanobut.hawk.Hawk
+import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.constant.XEventConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
-import com.yidian.bcommon.base.BaseActivity
+import com.yidian.bcommon.sdk.BCommonManager
 import com.yidian.bcommon.services.ZapServiceActionConstants
 import com.yidian.bcommon.services.ZapServiceNameConstants
+import com.yidian.bcommon.utils.StorageUtil
+import com.yidian.bcommon.widget.dialog.HintDialog
 import com.yidian.shenghuoquan.bmanagercenter.R
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityLifeAccountPersonalAuthBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
 import com.yidian.shenghuoquan.bmanagercenter.http.callback.IAuthPersonalCompleteCallback
 import com.yidian.shenghuoquan.bmanagercenter.http.httpbean.AuthAuthenticationBean
 import com.yidian.shenghuoquan.bmanagercenter.http.httpbean.AuthPersonalCompleteBean
-import com.yidian.bcommon.widget.dialog.HintDialog
-import com.yidian.bcommon.utils.StorageUtil
 import com.yidian.shenghuoquan.bmanagercenter.widget.CommonTopBarView
 import com.yidian.xarc.xevent.XBaseEvent
 import com.yidian.xarc.xevent.XEventManager
@@ -171,7 +172,7 @@ class LifeAccountPersonalAuthActivity :
       XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE,
       hashMapOf(
         Pair(LifeAccountPersonalAuthCompleteActivity.OCCUPATION, result?.occupation),
-        Pair(LifeAccountPersonalAuthCompleteActivity.PHONE_NUM, Hawk.get(HawkConfig.Mobile, "")),
+        Pair(LifeAccountPersonalAuthCompleteActivity.PHONE_NUM, BCommonManager.getUserPhone() ?: Hawk.get(HawkConfig.Mobile, "")),
         Pair(LifeAccountPersonalAuthCompleteActivity.REAL_NAME, result?.full_name),
         Pair(LifeAccountPersonalAuthCompleteActivity.ID_CARD_NUM, result?.id_card),
         Pair(LifeAccountPersonalAuthCompleteActivity.EXTRA_LIFE_ACCOUNT_ID, result?.life_account_id),

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/center/MerchantAuthInfoActivity.kt

@@ -6,6 +6,7 @@ import com.orhanobut.hawk.Hawk
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.sdk.BCommonManager
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityMerchantAuthInfoBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.httpbean.GetLifeAccountInfoByIdBean
 import com.yidian.shenghuoquan.bmanagercenter.manager.LifeAccountManager
@@ -67,7 +68,7 @@ class MerchantAuthInfoActivity : BaseActivity<ActivityMerchantAuthInfoBinding>()
           lifeAccountInfo?.occupation,
           lifeAccountInfo?.legal_person,
           lifeAccountInfo?.id_card,
-          Hawk.get(HawkConfig.Mobile)
+          BCommonManager.getUserPhone() ?: Hawk.get(HawkConfig.Mobile)
         )
       }
     }