update 优化添加员工逻辑

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

@@ -74,7 +74,7 @@ class AddStaffActivity : BaseActivity<ActivityAddStaffBinding>() {
     // 发送验证码
     viewBind.tvGetCode.setOnClickListener {
       val mobile = viewBind.etMobile.text.toString().replace(" ", "")
-      if (mobile.length == 13) {
+      if (mobile.length == 11) {
         requestSmsCode(mobile)
       } else {
         ToastUtil.showToast(this, "请输入11位手机号")
@@ -96,7 +96,7 @@ class AddStaffActivity : BaseActivity<ActivityAddStaffBinding>() {
 
   private fun requestAddUser() {
     val hashMap = HashMap<String, String?>()
-    hashMap["mobile"] = viewBind.etMobile.text.toString()
+    hashMap["mobile"] = viewBind.etMobile.text.toString().replace(" ", "")
     hashMap["code"] = viewBind.etSmsCode.text.toString()
     PersonalRemoteDataSource.postAddUser(postAddUserCallBack, hashMap)
   }
@@ -111,10 +111,10 @@ class AddStaffActivity : BaseActivity<ActivityAddStaffBinding>() {
 
   private fun setChangeButtonStatus(flag: Boolean) {
     if (flag) {
-      viewBind.include.tvMenu.alpha = 1.0f
+      viewBind.include.tvMenu.setTextColor(ContextCompat.getColor(this, R.color.color_1852F1))
       viewBind.include.tvMenu.isEnabled = true
     } else {
-      viewBind.include.tvMenu.alpha = 0.32f
+      viewBind.include.tvMenu.setTextColor(ContextCompat.getColor(this, R.color.color_661852F1))
       viewBind.include.tvMenu.isEnabled = false
     }
   }

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

@@ -111,7 +111,7 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
         }
         2 -> {
           val mobile = viewBind.etNewMobile.text.toString().replace(" ", "")
-          if (mobile.length == 13) {
+          if (mobile.length == 11) {
             requestSmsCode(mobile)
           } else {
             ToastUtil.showToast(this, "请输入11位手机号")
@@ -125,7 +125,7 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
       // 更换账号，进行验证码校验
       val code = viewBind.etOldCode.text.toString()
       val paramsMap = HashMap<String, String?>()
-      paramsMap["mobile"] = managerOldMobile
+      paramsMap["mobile"] = managerOldMobile.replace(" ", "")
       paramsMap["code"] = code
       PersonalRemoteDataSource.getCheckSmsCode(getCheckOldSmsCodeCallBack, paramsMap)
     }
@@ -162,7 +162,7 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
       managerNewMobile = viewBind.etNewMobile.text.toString().replace(" ", "")
       val code = viewBind.etNewCode.text.toString()
       val paramsMap = HashMap<String, String?>()
-      paramsMap["mobile"] = managerNewMobile
+      paramsMap["mobile"] = managerNewMobile.replace(" ", "")
       paramsMap["code"] = code
       // todo 生活号id待赋值
       paramsMap["life_account_id"] = ""
@@ -177,7 +177,6 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
       it.setSpan(ForegroundColorSpan(Color.parseColor("#1852F1")), 28, 39, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
       it.setSpan(object : ClickableSpan() {
         override fun onClick(widget: View) {
-          // todo 待修改为用户协议
           val urlMap = HashMap<String, String>()
           urlMap[ProtocolActivity.ProtocolUrlKey] = AppConfig.privacyPolicyStatement
           XPageManager.push(XRouterPathConstants.PROTOCOL, urlMap)
@@ -185,7 +184,6 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
       }, 28, 33, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
       it.setSpan(object : ClickableSpan() {
         override fun onClick(widget: View) {
-          // todo 待修改为隐私政策
           val urlMap = HashMap<String, String>()
           urlMap[ProtocolActivity.ProtocolUrlKey] = AppConfig.privacyPolicyStatement
           XPageManager.push(XRouterPathConstants.PROTOCOL, urlMap)

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

@@ -46,12 +46,13 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
   }
 
   private fun requestAccountList() {
-    val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, "")
-    if (lifeAccountId.isNotBlank()) {
+    val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, 0L)
+//    if (lifeAccountId.isNotBlank()) {
       val paramsMap = HashMap<String, String?>()
-      paramsMap["life_account_id"] = lifeAccountId
+//      paramsMap["life_account_id"] = lifeAccountId.toString()
+      paramsMap["life_account_id"] = "9018797088604161"
       PersonalRemoteDataSource.getAccountList(this, paramsMap)
-    }
+//    }
   }
 
   private fun initView() {
@@ -61,21 +62,21 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
 
   private fun initClick() {
     // 管理员信息
-    viewBind.clManager.setOnClickListener {
-      managerInfo?.let {
-        val hashMap = HashMap<String, Any?>()
-        hashMap["managerInfo"] = it
-        XPageManager.push(XRouterPathConstants.PERSONAL_MANAGER_INFO, hashMap)
-      }
-    }
+//    viewBind.clManager.setOnClickListener {
+//      managerInfo?.let {
+//        val hashMap = HashMap<String, Any?>()
+//        hashMap["managerInfo"] = it
+//        XPageManager.push(XRouterPathConstants.PERSONAL_MANAGER_INFO, hashMap)
+//      }
+//    }
     // 更新管理员
-    viewBind.tvChange.setOnClickListener {
-      managerInfo?.let {
-        val hashMap = HashMap<String, String?>()
-        hashMap["mobile"] = it.mobile
-        XPageManager.push(XRouterPathConstants.PERSONAL_MANAGER_CHANGE, hashMap)
-      }
-    }
+//    viewBind.tvChange.setOnClickListener {
+//      managerInfo?.let {
+//        val hashMap = HashMap<String, String?>()
+//        hashMap["mobile"] = it.mobile
+//        XPageManager.push(XRouterPathConstants.PERSONAL_MANAGER_CHANGE, hashMap)
+//      }
+//    }
     // 点击添加
     viewBind.tvAddStaff.setOnClickListener {
       XPageManager.push(XRouterPathConstants.PERSONAL_ADD_STAFF, null)

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

@@ -93,6 +93,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
 
     // 本期需求无资产功能 仅做UI展示
     viewBind.avMerchantAsset.setMerchantAssetData("8856.88", "675.00")
+    // todo 测试代码
+    viewBind.avMerchantAsset.setOnClickListener {
+      XPageManager.push(XRouterPathConstants.PERSONAL_MY_STAFF, null)
+    }
   }
 
   private fun initListener() {

Components/newscontent/src/main/res/layout/activity_my_staff.xml

@@ -54,6 +54,7 @@
             android:text="更换"
             android:textColor="@color/color_333333"
             android:textSize="14sp"
+            android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toStartOf="parent"