add 创建生活号页面跳转

CommonLib/Common/src/main/java/com/yidian/common/XRouterPathConstants.kt

@@ -35,5 +35,7 @@ class XRouterPathConstants {
         const val LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION = "/lifeAccountEnterpriseCertification"
         const val LIFE_ACCOUNT_PERSONAL_AUTH = "/lifeAccountPersonalAuth"
         const val LIFE_ACCOUNT_CREATE = "/createLiveAccountActivity"
+        const val PERSONAL_AUTHENTICATION = "/PersonalAuthenticationActivity"
+        const val ENTERPRISE_CERTIFICATION = "/EnterpriseCertificationActivity"
     }
 }
\ No newline at end of file

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

 package com.yidian.shenghuoquan.newscontent.ui
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import com.yidian.common.XRouterPathConstants.Companion.ENTERPRISE_CERTIFICATION
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityEnterpriseCertificationBinding
@@ -18,17 +20,41 @@ class EnterpriseCertificationActivity : BaseActivity<ActivityEnterpriseCertifica
     }
 
     override fun getXPageName(): String {
-        return ""
+        return ENTERPRISE_CERTIFICATION
     }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    private var companyName = "北京一点网聚科技有限公司"
+    private var creditCode = "WD1212312223331"
+    private var realName = "兰花花"
+    private var idNumber = "120803********0660"
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
         viewBind.root.title.text = resources.getString(R.string.enterprise_certification)
+        initListener()
+        initData()
+    }
+    private fun initListener() {
         viewBind.createLifeNumber.setOnClickListener {
-            startActivity(Intent(this@EnterpriseCertificationActivity, PersonalAuthenticationActivity::class.java))
+            startActivity(
+                Intent(
+                    this@EnterpriseCertificationActivity,
+                    LiveAccountCreateActivity::class.java
+                )
+            )
         }
-        viewBind.root.back.setOnClickListener{
+        viewBind.root.back.setOnClickListener {
             finish()
         }
     }
+    private fun initData() {
+
+        showData()
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun showData() {
+        viewBind.companyName.text = companyName
+        viewBind.creditCode.text = creditCode
+        viewBind.operatorInformation.text = "$realName $idNumber"
+
+    }
 }
\ No newline at end of file

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

@@ -13,6 +13,11 @@ import kotlinx.android.synthetic.main.top_bar.view.*
  * Describe:  activity_enterprise_certification  创建生活号
  */
 class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>() {
+
+    companion object{
+        const val ACCOUNT_NAME = "live_account_name"
+    }
+
     override fun createViewBinding(): ActivityLifeNumberBinding {
         return ActivityLifeNumberBinding.inflate(layoutInflater)
     }
@@ -20,12 +25,37 @@ class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>() {
     override fun getXPageName(): String {
         return ""
     }
+    private var liveAccountName = "一点招聘生活号"
+    private var managerName = "微微微蓝"
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    private var phoneNumber = "18210128848"
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
         viewBind.root.title.text = resources.getString(R.string.create_a_life_number)
-        viewBind.root.back.setOnClickListener{
+        initListener()
+        initData()
+    }
+
+    private fun initData() {
+
+        liveAccountName = intent.getStringExtra(ACCOUNT_NAME)?:""
+
+        showData()
+    }
+
+    private fun showData() {
+        viewBind.personalShop.text = liveAccountName
+        viewBind.occupationLabelValue.text = managerName
+        viewBind.actualNameValue.text = phoneNumber
+    }
+
+    private fun initListener() {
+        viewBind.root.back.setOnClickListener {
             finish()
         }
+        viewBind.information.setOnClickListener {
+            // TODO: 2021/5/27 去体验跳转
+        }
     }
+
 }
\ No newline at end of file

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

@@ -13,6 +13,9 @@ import com.yidian.shenghuoquan.newscontent.databinding.ActivityCreateAccountBind
 import com.yidian.shenghuoquan.newscontent.utils.TextWatcherAdapter
 
 class LiveAccountCreateActivity :BaseActivity<ActivityCreateAccountBinding>(),ICreateLifeAccountCallback{
+    companion object{
+        const val ACCOUNT_NAME ="account_name"
+    }
     override fun createViewBinding(): ActivityCreateAccountBinding {
         return ActivityCreateAccountBinding.inflate(layoutInflater)
     }
@@ -21,6 +24,7 @@ class LiveAccountCreateActivity :BaseActivity<ActivityCreateAccountBinding>(),IC
         return LIFE_ACCOUNT_CREATE
     }
     private val accountMaxLength = 40
+    private var accountName = ""
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
         initView()
@@ -29,7 +33,8 @@ class LiveAccountCreateActivity :BaseActivity<ActivityCreateAccountBinding>(),IC
     }
 
     private fun initData() {
-
+        accountName = intent.getStringExtra(ACCOUNT_NAME)?:""
+        viewBind.etAccount.setText(accountName)
         setUserName("兰小花","15800003242")
 
     }
@@ -59,8 +64,11 @@ class LiveAccountCreateActivity :BaseActivity<ActivityCreateAccountBinding>(),IC
         //模拟网络请求成功
        // ApiService.createLifeAccount(this,request)
         viewBind.btnCreateAccount.postDelayed({
-              startActivity(Intent(this@LiveAccountCreateActivity,LifeNumberActivity::class.java))
-        },2000L)
+            accountName = viewBind.etAccount.text.toString()
+            val intent = Intent(this@LiveAccountCreateActivity, LifeNumberActivity::class.java)
+            intent.putExtra(LifeNumberActivity.ACCOUNT_NAME,accountName)
+            startActivity(intent)
+        },500L)
 
     }
 
@@ -98,6 +106,7 @@ class LiveAccountCreateActivity :BaseActivity<ActivityCreateAccountBinding>(),IC
     override fun createLifeAccountCallback(result: Boolean) {
         //创建生活号的回调
         if (result){
+            accountName = viewBind.etAccount.text.toString()
            //todo 创建成功 页面跳转
 
         }else{

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

 package com.yidian.shenghuoquan.newscontent.ui
 
+import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -123,6 +124,9 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
             ToastUtil.showToast(this, "隐私政策")
             XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_IDENTITY, null)
         }
+        viewBind.btnOpenAccount.setOnClickListener {
+            startActivity(Intent(this@LoginLifeCircleActivity,LiveAccountCreateActivity::class.java))
+        }
     }
 
     private fun changeLoginButtonStatus(){

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

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui
 
 import android.content.Intent
 import android.os.Bundle
+import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_AUTHENTICATION
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityPersonalAuthenticationBinding
@@ -13,27 +14,53 @@ import kotlinx.android.synthetic.main.top_bar.view.*
  * Describe:  activity_enterprise_certification  个人认证成功页面 activity_personal_authentication
  */
 class PersonalAuthenticationActivity : BaseActivity<ActivityPersonalAuthenticationBinding>() {
+
+    companion object{
+        const val OCCUPATION = "occupation"
+        const val REAL_NAME = "real_name"
+        const val ID_NUMBER = "id_number"
+    }
+
     override fun createViewBinding(): ActivityPersonalAuthenticationBinding {
         return ActivityPersonalAuthenticationBinding.inflate(layoutInflater)
     }
 
     override fun getXPageName(): String {
-        return ""
+        return PERSONAL_AUTHENTICATION
     }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    private var occupation = "兽医"
+    private var realName = "兰花花"
+    private var phoneNumber = "18210128848"
+    private var idNumber = "103834712904123949123419"
+    override fun init(savedInstanceState: Bundle?) {
         viewBind.root.title.text = resources.getString(R.string.personal_authentication)
+        initListener()
+        initData()
+    }
+
+    private fun initData() {
+        occupation = intent.getStringExtra(OCCUPATION)?:""
+        realName = intent.getStringExtra(REAL_NAME)?:""
+        idNumber = intent.getStringExtra(ID_NUMBER)?:""
+        showData()
+    }
+
+    private fun showData() {
+        viewBind.occupationLabelValue.text = occupation
+        viewBind.actualNameValue.text = realName
+        viewBind.phoneNumberValue.text = phoneNumber
+        viewBind.idNumberValue.text = idNumber
+    }
+
+    private fun initListener() {
         viewBind.root.back.setOnClickListener {
             finish()
         }
+        viewBind.information.setOnClickListener {
+            // TODO: 2021/5/27 去体验页面跳转
+        }
         viewBind.turnOnEnterpriseCertification.setOnClickListener {
-            startActivity(
-                Intent(
-                    this@PersonalAuthenticationActivity,
-                    LifeNumberActivity::class.java
-                )
-            )
+            // TODO: 2021/5/27 升级为企业认证页面
         }
     }
 }
\ No newline at end of file