update 个人认证、企业认证完成页面

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

@@ -21,8 +21,8 @@ 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"
+        const val LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE = "/lifeAccountPersonalAuthComplete"
+        const val LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE = "/lifeAccountEnterpriseAuthComplete"
         const val LIFE_ACCOUNT_ENTERPRISE_AUTH = "/lifeAccountEnterpriseAuth"
         const val LIFE_NUMBER = "/lifeNumberActivity"
     }

Components/newscontent/src/main/AndroidManifest.xml

@@ -47,10 +47,10 @@
             android:name=".ui.TempListActivity"
             android:theme="@style/Transparent" />
         <activity
-            android:name=".ui.EnterpriseCertificationActivity"
+            android:name=".ui.auth.LifeAccountEnterpriseAuthCompleteActivity"
             android:theme="@style/Transparent" />
         <activity
-            android:name=".ui.PersonalAuthenticationActivity"
+            android:name=".ui.auth.LifeAccountPersonalAuthCompleteActivity"
             android:theme="@style/Transparent" />
         <activity
             android:name=".ui.LifeNumberActivity"

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt

@@ -7,9 +7,11 @@ import com.yidian.common.XRouterPathConstants.Companion.GALLERY
 import com.yidian.common.XRouterPathConstants.Companion.ID_CARD_TEST
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH
+import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_IDENTITY
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
+import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
 import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
 import com.yidian.common.XRouterPathConstants.Companion.NEWS_CONTENT
 import com.yidian.common.XRouterPathConstants.Companion.NEWS_MAIN
@@ -150,6 +152,30 @@ class NewsContentApplication : YdBaseApplication() {
                     }
                 }),
 
+                XPageNode(LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE, XPageNodePageType.NATIVE, object : XPageHandler {
+                    override fun handler(params: Map<String, Any?>?) {
+                        val intent = Intent()
+                        if (params != null) {
+                            intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+                        }
+                        intent.setClass(context, LifeAccountPersonalAuthCompleteActivity::class.java)
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                        context.startActivity(intent)
+                    }
+                }),
+
+                XPageNode(LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE, XPageNodePageType.NATIVE, object : XPageHandler {
+                    override fun handler(params: Map<String, Any?>?) {
+                        val intent = Intent()
+                        if (params != null) {
+                            intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+                        }
+                        intent.setClass(context, LifeAccountEnterpriseAuthCompleteActivity::class.java)
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                        context.startActivity(intent)
+                    }
+                }),
+
                 XPageNode(NEWS_CONTENT, XPageNodePageType.NATIVE, object : XPageHandler {
                     override fun handler(params: Map<String, Any?>?) {
                         val intent = Intent()

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
-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
-import com.yidian.xpage.XPageManager
-import kotlinx.android.synthetic.main.top_bar.view.*
-
-/**
- * Author: houzhenpu
- * Date: 2021/5/26 10:44 AM
- * Describe:  activity_enterprise_certification  企业认证成功页面
- */
-class EnterpriseCertificationActivity : BaseActivity<ActivityEnterpriseCertificationBinding>() {
-    override fun createViewBinding(): ActivityEnterpriseCertificationBinding {
-        return ActivityEnterpriseCertificationBinding.inflate(layoutInflater)
-    }
-
-    override fun getXPageName(): String {
-        return ENTERPRISE_CERTIFICATION
-    }
-    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 {
-            val params = hashMapOf(Pair(LiveAccountCreateActivity.ENTERPRISE_CODE,creditCode))
-           XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_CREATE,params)
-        }
-        viewBind.root.back.setOnClickListener {
-            finish()
-        }
-    }
-    private fun initData() {
-        // TODO: 2021/5/31 认证信息数据传递赋值
-        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/PersonalAuthenticationActivity.kt

-package com.yidian.shenghuoquan.newscontent.ui
-
-import android.content.Intent
-import android.os.Bundle
-import com.yidian.common.XRouterPathConstants
-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
-import com.yidian.utils.ToastUtil
-import com.yidian.xpage.XPageManager
-import kotlinx.android.synthetic.main.top_bar.view.*
-
-/**
- * Author: houzhenpu
- * Date: 2021/5/26 15:44 PM
- * 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 PERSONAL_AUTHENTICATION
-    }
-    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 {
-            ToastUtil.showToast(this, "去体验页面跳转跳转")
-            // TODO: 2021/5/27 去体验页面跳转
-        }
-        viewBind.turnOnEnterpriseCertification.setOnClickListener {
-            XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH,null)
-        }
-    }
-}
\ No newline at end of file

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

+package com.yidian.shenghuoquan.newscontent.ui.auth
+
+import android.os.Bundle
+import androidx.core.view.isVisible
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.R
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseAuthCompleteBinding
+import com.yidian.shenghuoquan.newscontent.ui.LiveAccountCreateActivity
+import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
+import com.yidian.xpage.XPageManager
+
+/**
+ * Author: houzhenpu
+ * Date: 2021/5/26 10:44 AM
+ * Describe:  activity_life_account_enterprise_auth_complete  企业认证成功页面
+ */
+class LifeAccountEnterpriseAuthCompleteActivity :
+    BaseActivity<ActivityLifeAccountEnterpriseAuthCompleteBinding>() {
+
+    companion object {
+        const val REGISTRATION_NAME = "registrationName"
+        const val REGISTRATION_CODE = "registrationCode"
+        const val ID_CARD_NAME = "idCardName"
+        const val ID_CARD_NUM = "idCardNum"
+    }
+
+    /**
+     * 跳转参数
+     */
+    private val params by lazy { intent.getSerializableExtra(XRouterPathConstants.ParamsKey) as HashMap<*, *> }
+
+    override fun createViewBinding(): ActivityLifeAccountEnterpriseAuthCompleteBinding {
+        return ActivityLifeAccountEnterpriseAuthCompleteBinding.inflate(layoutInflater)
+    }
+
+    override fun getXPageName(): String {
+        return XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        initView()
+        initListener()
+        initData()
+    }
+
+    private fun initView() {
+        viewBind.viewCommonHeader.tvTitle.text = resources.getString(R.string.enterprise_auth)
+        viewBind.viewCommonHeader.ivBack.isVisible = false
+    }
+
+    private fun initListener() {
+        viewBind.createLifeAccount.setOnClickListener {
+            XPageManager.push(
+                XRouterPathConstants.LIFE_ACCOUNT_CREATE,
+                hashMapOf(
+                    Pair(
+                        LiveAccountCreateActivity.ENTERPRISE_CODE,
+                        params[REGISTRATION_CODE]
+                    )
+                )
+            )
+        }
+    }
+
+    private fun initData() {
+        viewBind.companyName.text = params[REGISTRATION_NAME] as String
+        viewBind.creditCode.text = params[REGISTRATION_CODE] as String
+        viewBind.operatorInformation.text =
+            "${params[ID_CARD_NAME]} ${SensitiveInfoUtil.idCardNumEncrypt(params[ID_CARD_NUM] as String)}"
+    }
+}
\ No newline at end of file

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

+package com.yidian.shenghuoquan.newscontent.ui.auth
+
+import android.os.Bundle
+import androidx.core.view.isVisible
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.R
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountPersonalAuthCompleteBinding
+import com.yidian.xpage.XPageManager
+
+/**
+ * Author: houzhenpu
+ * Date: 2021/5/26 15:44 PM
+ * Describe: 个人认证成功页面 activity_life_account_personal_auth_complete
+ */
+class LifeAccountPersonalAuthCompleteActivity :
+    BaseActivity<ActivityLifeAccountPersonalAuthCompleteBinding>() {
+
+    companion object {
+        const val OCCUPATION = "occupation"
+        const val REAL_NAME = "realName"
+        const val ID_CARD_NUM = "idCardNum"
+        const val PHONE_NUM = "phoneNum"
+    }
+
+    /**
+     * 跳转参数
+     */
+    private val params by lazy { intent.getSerializableExtra(XRouterPathConstants.ParamsKey) as HashMap<*, *> }
+
+    override fun createViewBinding(): ActivityLifeAccountPersonalAuthCompleteBinding {
+        return ActivityLifeAccountPersonalAuthCompleteBinding.inflate(layoutInflater)
+    }
+
+    override fun getXPageName(): String {
+        return XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        initView()
+        initListener()
+        initData()
+    }
+
+    private fun initView() {
+        viewBind.viewCommonHeader.tvTitle.text =
+            resources.getString(R.string.personal_auth)
+        viewBind.viewCommonHeader.ivBack.isVisible = false
+    }
+
+    private fun initData() {
+        viewBind.occupationLabelValue.text = params[OCCUPATION] as String
+        viewBind.actualNameValue.text = params[REAL_NAME] as String
+        viewBind.idNumberValue.text = params[ID_CARD_NUM] as String
+        viewBind.phoneNumberValue.text = params[PHONE_NUM] as String
+    }
+
+    private fun initListener() {
+        viewBind.enterLifeAccount.setOnClickListener {
+            // TODO: 2021/5/27 跳转生活号管理首页
+        }
+        viewBind.upgradeEnterpriseAuth.setOnClickListener {
+            XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH, null)
+        }
+    }
+}
\ No newline at end of file

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

+package com.yidian.shenghuoquan.newscontent.utils
+
+/**
+ * author: yinjiacheng
+ * date: 6/6/21 2:23 PM
+ * description: 敏感信息脱敏操作
+ */
+object SensitiveInfoUtil {
+
+    /**
+     * 身份证号码出生日期脱敏
+     */
+    fun idCardNumEncrypt(content: String): String {
+        val rule = "(\\d{6})\\d{8}(\\d{4})"
+        return content.replace(rule.toRegex(), "$1********$2")
+    }
+}
\ No newline at end of file

Components/newscontent/src/main/res/layout/activity_enterprise_certification.xml → Components/newscontent/src/main/res/layout/activity_life_account_enterprise_auth_complete.xml

@@ -2,147 +2,152 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:fitsSystemWindows="true"
     android:background="@color/white"
+    android:fitsSystemWindows="true"
+    android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <include layout="@layout/top_bar" />
+    <include
+        android:id="@+id/view_common_header"
+        layout="@layout/layout_common_header"
+        android:layout_width="match_parent"
+        android:layout_height="42dp"
+        android:layout_marginTop="10dp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="38dp"
+        android:drawableStart="@mipmap/success_icon"
+        android:drawablePadding="6dp"
         android:gravity="center"
         android:text="@string/submitted_successfully"
-        android:drawablePadding="6dp"
-        android:drawableStart="@mipmap/success_icon"
         android:textColor="#FFF26E3D"
         android:textSize="24sp" />
 
     <TextView
         android:layout_width="240dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:gravity="center"
         android:text="@string/mobile_phone_number_notification_information"
-        android:textSize="16sp"
         android:textColor="#FF999999"
-        android:layout_marginTop="4dp"
-        android:gravity="center" />
+        android:textSize="16sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="25dp"
         android:layout_marginTop="25dp"
         android:layout_marginEnd="25dp"
-        android:layout_marginStart="25dp"
-        android:paddingStart="30dp"
-        android:paddingBottom="30dp"
         android:background="@mipmap/enterprise_certification_bg"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingStart="30dp"
+        android:paddingBottom="30dp">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
             android:layout_marginTop="40dp"
-            android:gravity="center_vertical">
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:gravity="left"
                 android:text="@string/enterprise_certification"
-                android:textSize="24sp"
                 android:textColor="#FF333333"
-                android:layout_marginRight="10dp"
-                android:gravity="left" />
+                android:textSize="24sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/pending_review"
-                android:textSize="14sp"
+                android:background="@drawable/shape_solid_radius9_da3838"
+                android:gravity="center"
                 android:paddingLeft="6dp"
-                android:paddingRight="6dp"
                 android:paddingTop="2dp"
+                android:paddingRight="6dp"
                 android:paddingBottom="2dp"
+                android:text="@string/pending_review"
                 android:textColor="#FFF26E3D"
-                android:background="@drawable/shape_solid_radius9_da3838"
-                android:gravity="center" />
+                android:textSize="14sp" />
         </LinearLayout>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/company_name"
-            android:textSize="16sp"
             android:layout_marginTop="20dp"
+            android:gravity="left"
+            android:text="@string/company_name"
             android:textColor="#FF999999"
-            android:gravity="left" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/company_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="北京一点网聚科技有限公司"
             android:layout_marginTop="6dp"
-            android:textSize="16sp"
+            android:gravity="left"
+            android:text="北京一点网聚科技有限公司"
             android:textColor="#FF333333"
-            android:gravity="left" />
+            android:textSize="16sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/credit_code"
-            android:textSize="16sp"
             android:layout_marginTop="20dp"
+            android:gravity="left"
+            android:text="@string/credit_code"
             android:textColor="#FF999999"
-            android:gravity="left" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/credit_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="WD1212312223331"
             android:layout_marginTop="6dp"
-            android:textSize="16sp"
+            android:gravity="left"
+            android:text="WD1212312223331"
             android:textColor="#FF333333"
-            android:gravity="left" />
+            android:textSize="16sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/operator_information"
-            android:textSize="16sp"
             android:layout_marginTop="20dp"
+            android:gravity="left"
+            android:text="@string/operator_information"
             android:textColor="#FF999999"
-            android:gravity="left" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/operator_information"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="兰花花 120803********0660"
             android:layout_marginTop="6dp"
-            android:textSize="16sp"
+            android:gravity="left"
+            android:text="兰花花 120803********0660"
             android:textColor="#FF333333"
-            android:gravity="left" />
+            android:textSize="16sp" />
 
     </LinearLayout>
 
 
-
     <TextView
-        android:id="@+id/create_life_number"
+        android:id="@+id/create_life_account"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/create_a_life_number"
-        android:textSize="16sp"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
+        android:gravity="center"
         android:paddingLeft="20dp"
-        android:paddingRight="20dp"
         android:paddingTop="7dp"
+        android:paddingRight="20dp"
         android:paddingBottom="7dp"
-        android:layout_marginTop="30dp"
+        android:text="@string/create_a_life_number"
         android:textColor="#1852F1"
-        android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
-        android:gravity="center" />
+        android:textSize="16sp" />
 
 </LinearLayout>
\ No newline at end of file