update 添加员工接口联调

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/bean/AccountListDto.kt

@@ -51,5 +51,5 @@ data class AccountUser(
   @SerializedName("show_button")
   val showButton: Int? = null,
   @SerializedName("user_id")
-  val userId: Int? = null
+  val userId: Long? = null
 ) : Parcelable

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

@@ -5,6 +5,7 @@ import androidx.core.content.ContextCompat
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.extensions.clickAntiShake
 import com.yidian.common.widget.EditTextInputCallback
 import com.yidian.common.widget.PhoneNumberTextWatcher
 import com.yidian.shenghuoquan.newscontent.R
@@ -72,7 +73,8 @@ class AddStaffActivity : BaseActivity<ActivityAddStaffBinding>() {
     })
 
     // 发送验证码
-    viewBind.tvGetCode.setOnClickListener {
+    viewBind.tvGetCode.clickAntiShake {
+      viewBind.etSmsCode.setText("")
       val mobile = viewBind.etMobile.text.toString().replace(" ", "")
       if (mobile.length == 11) {
         requestSmsCode(mobile)

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

@@ -10,10 +10,13 @@ import android.text.style.ClickableSpan
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import androidx.core.content.ContextCompat
+import com.orhanobut.hawk.Hawk
 import com.yidian.common.AppConfig
+import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.extensions.clickAntiShake
 import com.yidian.common.extensions.initTitleBar
 import com.yidian.common.widget.EditTextInputCallback
 import com.yidian.common.widget.PhoneNumberTextWatcher
@@ -100,7 +103,7 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
       }
     })
     // 发送验证码
-    viewBind.tvGetCode.setOnClickListener {
+    viewBind.tvGetCode.clickAntiShake {
       when (verificationSteps) {
         1 -> {
           if (mobileMatchSuccess) {
@@ -121,7 +124,7 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
     }
 
     // 更换账号
-    viewBind.tvChangeAccount.setOnClickListener {
+    viewBind.tvChangeAccount.clickAntiShake {
       // 更换账号，进行验证码校验
       val code = viewBind.etOldCode.text.toString()
       val paramsMap = HashMap<String, String?>()
@@ -157,15 +160,14 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
     })
 
     // 确认更换
-    viewBind.tvConfirmChange.setOnClickListener {
+    viewBind.tvConfirmChange.clickAntiShake {
       // 确认更换
       managerNewMobile = viewBind.etNewMobile.text.toString().replace(" ", "")
       val code = viewBind.etNewCode.text.toString()
       val paramsMap = HashMap<String, String?>()
       paramsMap["mobile"] = managerNewMobile.replace(" ", "")
       paramsMap["code"] = code
-      // todo 生活号id待赋值
-      paramsMap["life_account_id"] = ""
+      paramsMap["life_account_id"] = Hawk.get(HawkConfig.LifeAccountId, "")
       PersonalRemoteDataSource.getChangeManager(getChangeAccountCallBack, paramsMap)
     }
 

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

@@ -6,6 +6,7 @@ import androidx.core.content.ContextCompat
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MANAGER_INFO
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.extensions.clickAntiShake
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityManagerInfoBinding
 import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountAdmin
@@ -39,7 +40,7 @@ class ManagerInfoActivity : BaseActivity<ActivityManagerInfoBinding>() {
       XPageManager.pop(null)
     }
     viewBind.include.tvMenu.text = "更换"
-    viewBind.include.tvMenu.setOnClickListener {
+    viewBind.include.tvMenu.clickAntiShake {
       val hashMap = HashMap<String, String?>()
       hashMap["mobile"] = managerMobile
       XPageManager.push(XRouterPathConstants.PERSONAL_MANAGER_CHANGE, hashMap)

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

@@ -6,6 +6,7 @@ import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.extensions.clickAntiShake
 import com.yidian.common.extensions.initTitleBar
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityMyStaffBinding
@@ -46,13 +47,12 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
   }
 
   private fun requestAccountList() {
-    val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, 0L)
-//    if (lifeAccountId.isNotBlank()) {
+    val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, "")
+    if (lifeAccountId.isNotBlank()) {
       val paramsMap = HashMap<String, String?>()
-//      paramsMap["life_account_id"] = lifeAccountId.toString()
-      paramsMap["life_account_id"] = "9018797088604161"
+      paramsMap["life_account_id"] = lifeAccountId
       PersonalRemoteDataSource.getAccountList(this, paramsMap)
-//    }
+    }
   }
 
   private fun initView() {
@@ -62,7 +62,7 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
 
   private fun initClick() {
     // 管理员信息
-//    viewBind.clManager.setOnClickListener {
+//    viewBind.clManager.clickAntiShake {
 //      managerInfo?.let {
 //        val hashMap = HashMap<String, Any?>()
 //        hashMap["managerInfo"] = it
@@ -70,7 +70,7 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
 //      }
 //    }
     // 更新管理员
-//    viewBind.tvChange.setOnClickListener {
+//    viewBind.tvChange.clickAntiShake {
 //      managerInfo?.let {
 //        val hashMap = HashMap<String, String?>()
 //        hashMap["mobile"] = it.mobile
@@ -78,11 +78,11 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
 //      }
 //    }
     // 点击添加
-    viewBind.tvAddStaff.setOnClickListener {
+    viewBind.tvAddStaff.clickAntiShake {
       XPageManager.push(XRouterPathConstants.PERSONAL_ADD_STAFF, null)
     }
     // 点击员工信息
-    myStaffAdapter.setOnItemChildClickListener { adapter, _, position ->
+    myStaffAdapter.setOnItemClickListener { adapter, _, position ->
       val user = adapter.data[position] as AccountUser
       val hashMap = HashMap<String, Any?>()
       hashMap["staffInfo"] = user

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

@@ -6,6 +6,7 @@ import androidx.core.content.ContextCompat
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.extensions.clickAntiShake
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityStaffInfoBinding
 import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountUser
@@ -35,12 +36,12 @@ class StaffInfoActivity : BaseActivity<ActivityStaffInfoBinding>() {
 
   private fun initTitle() {
     viewBind.include.tvTitle.text = "员工信息"
-    viewBind.include.ivBack.setOnClickListener {
+    viewBind.include.ivBack.clickAntiShake {
       XPageManager.pop(null)
     }
     viewBind.include.tvMenu.text = "管理"
     viewBind.include.tvMenu.setTextColor(ContextCompat.getColor(this, R.color.color_1852F1))
-    viewBind.include.tvMenu.setOnClickListener {
+    viewBind.include.tvMenu.clickAntiShake {
       val hashMap = HashMap<String, Any?>()
       hashMap["staffInfo"] = staffInfo
       XPageManager.push(XRouterPathConstants.PERSONAL_STAFF_MANAGE, hashMap)

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

@@ -6,6 +6,7 @@ import androidx.core.content.ContextCompat
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.extensions.clickAntiShake
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityStaffManageBinding
@@ -21,7 +22,7 @@ import com.yidian.xpage.XPageManager
  */
 class StaffManageActivity : BaseActivity<ActivityStaffManageBinding>() {
 
-  private var currentUserId: Int? = null
+  private var currentUserId: Long? = null
 
   override fun createViewBinding(): ActivityStaffManageBinding {
     return ActivityStaffManageBinding.inflate(layoutInflater)
@@ -39,12 +40,12 @@ class StaffManageActivity : BaseActivity<ActivityStaffManageBinding>() {
 
   private fun initTitle() {
     viewBind.include.tvTitle.text = "员工管理"
-    viewBind.include.ivBack.setOnClickListener {
+    viewBind.include.ivBack.clickAntiShake {
       XPageManager.pop(null)
     }
     viewBind.include.tvMenu.text = "解除关系"
     viewBind.include.tvMenu.setTextColor(ContextCompat.getColor(this, R.color.color_FFFF3A3A))
-    viewBind.include.tvMenu.setOnClickListener {
+    viewBind.include.tvMenu.clickAntiShake {
       showConfirmDialog()
     }
   }
@@ -92,7 +93,7 @@ class StaffManageActivity : BaseActivity<ActivityStaffManageBinding>() {
    */
   private fun requestDissolve() {
     val paramsMap = HashMap<String, String?>()
-    paramsMap["user_id"] = currentUserId?.toString()
+    paramsMap["user_id"] = currentUserId.toString()
     PersonalRemoteDataSource.getDissolveRelationship(getDissolveCallBack, paramsMap)
   }
 

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

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

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/CountDownTimerUtils.kt

@@ -11,24 +11,25 @@ import android.widget.TextView
  * Describe:
  */
 class CountDownTimerUtils(textView: TextView, millisInFuture: Long, countDownInterval: Long) :
-    CountDownTimer(millisInFuture, countDownInterval) {
-    private var mTextView: TextView? = textView
+  CountDownTimer(millisInFuture, countDownInterval) {
+  private var mTextView: TextView? = textView
 
-    @SuppressLint("SetTextI18n")
-    override fun onTick(millisUntilFinished: Long) {
-        mTextView!!.isClickable = false //设置不可点击
-        mTextView!!.setTextColor(Color.rgb(0xc2,0xc2,0xc2))
-        val temp: Long = millisUntilFinished / 1000
-        if (temp.toString() != "0") {
-            mTextView!!.text = temp.toString() + "s"//设置倒计时时间
-        } else {
-            mTextView!!.text = "获取验证码"
-        }
+  @SuppressLint("SetTextI18n")
+  override fun onTick(millisUntilFinished: Long) {
+    mTextView!!.isClickable = false //设置不可点击
+    mTextView!!.setTextColor(Color.rgb(0xc2, 0xc2, 0xc2))
+    val temp: Long = millisUntilFinished / 1000
+    if (temp.toString() != "0") {
+      mTextView!!.text = temp.toString() + "s"//设置倒计时时间
+    } else {
+      mTextView!!.setTextColor(Color.rgb(0x18, 0x52, 0xf1))
+      mTextView!!.text = "获取验证码"
     }
+  }
 
-    override fun onFinish() {
-        mTextView!!.setTextColor(Color.rgb(0x18,0x52,0xf1))
-        mTextView!!.text = "获取验证码"
-        mTextView!!.isClickable = true //重新获得点击
-    }
-}
\ No newline at end of file
+  override fun onFinish() {
+    mTextView!!.setTextColor(Color.rgb(0x18, 0x52, 0xf1))
+    mTextView!!.text = "获取验证码"
+    mTextView!!.isClickable = true //重新获得点击
+  }
+}