update 生活号id由Long类型改为String类型

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

@@ -165,7 +165,7 @@ object LifeAccountAuthDataManager {
      * 生成营业执照上传接口请求体
      */
     fun generateAuthBusinessLicenseCommitRequest(
-        lifeAccountId: Long?
+        lifeAccountId: String?
     ): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
         requestMap["code"] = merchantAuthData.registrationCode
@@ -187,7 +187,7 @@ object LifeAccountAuthDataManager {
         requestMap["data_from"] = Constant.DATA_FROM_B.toString()
         requestMap["data_type"] = merchantAuthData.merchantType.toString()
         lifeAccountId?.let {
-            requestMap["life_account_id"] = it.toString()
+            requestMap["life_account_id"] = it
         }
         return requestMap
     }
@@ -219,7 +219,7 @@ object LifeAccountAuthDataManager {
      * 生成普通企业法人身份信息上传接口请求体
      */
     fun generateAuthEnterpriseLegalIdentityCommitRequest(
-        lifeAccountId: Long?
+        lifeAccountId: String?
     ): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
         requestMap["record_id"] = merchantAuthData.authRecordId.toString()
@@ -239,7 +239,7 @@ object LifeAccountAuthDataManager {
         requestMap["issued_by"] = personalAuthData.issuedBy
         requestMap["mobile"] = personalAuthData.phoneNum
         lifeAccountId?.let {
-            requestMap["life_account_id"] = it.toString()
+            requestMap["life_account_id"] = it
         }
         return requestMap
     }
@@ -247,11 +247,11 @@ object LifeAccountAuthDataManager {
     /**
      * 生成个体工商户认证完成接口请求体
      */
-    fun generateAuthIndividualBusinessCompleteRequest(lifeAccountId: Long?): HashMap<String, String?> {
+    fun generateAuthIndividualBusinessCompleteRequest(lifeAccountId: String?): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
         requestMap["record_id"] = merchantAuthData.authRecordId.toString()
         lifeAccountId?.let {
-            requestMap["life_account_id"] = it.toString()
+            requestMap["life_account_id"] = it
         }
         return requestMap
     }

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

@@ -34,7 +34,7 @@ class LifeAccountCreateActivity : BaseActivity<ActivityLifeAccountCreateBinding>
     }
 
     private val accountMaxLength = 20
-    private var lifeAccountId: Long = 0
+    private var lifeAccountId: String? = null
     private var lifeAccountName: String = ""
 
     override fun init(savedInstanceState: Bundle?) {
@@ -47,7 +47,7 @@ class LifeAccountCreateActivity : BaseActivity<ActivityLifeAccountCreateBinding>
     private fun initData() {
         val params = intent.getSerializableExtra(XRouterPathConstants.ParamsKey)
         if (params != null && params is HashMap<*, *>) {
-            lifeAccountId = params[LIFE_ACCOUNT_ID] as Long
+            lifeAccountId = params[LIFE_ACCOUNT_ID] as String
         }
         // 设置管理员信息
         val name = Hawk.get(HawkConfig.Nickname, "")

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

@@ -62,7 +62,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
     private val personalLifeAccountId by lazy {
         intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
             (it as HashMap<*, *>)[EXTRA_LIFE_ACCOUNT_ID]?.let { id ->
-                id as Long
+                id as String
             } ?: Hawk.get(HawkConfig.LifeAccountId, null)
         }
     }

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

@@ -28,7 +28,7 @@ class LifeAccountModifyNameActivity : BaseActivity<ActivityLifeAccountModifyName
         const val EXTRA_LIFE_ACCOUNT_NAME = "life_account_name"
     }
 
-    private var lifeAccountId: Long? = null
+    private var lifeAccountId: String? = null
     private var lifeAccountName: String? = null
 
     override fun createViewBinding(): ActivityLifeAccountModifyNameBinding {
@@ -59,7 +59,7 @@ class LifeAccountModifyNameActivity : BaseActivity<ActivityLifeAccountModifyName
     private fun initData() {
         intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let { params ->
             (params as HashMap<*, *>).let {
-                lifeAccountId = it[EXTRA_LIFE_ACCOUNT_ID] as Long
+                lifeAccountId = it[EXTRA_LIFE_ACCOUNT_ID] as String
                 lifeAccountName = it[EXTRA_LIFE_ACCOUNT_NAME] as String
             }
         }

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

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_FFFFFFFF">
+    android:background="@color/color_FFFFFFFF"
+    android:fitsSystemWindows="true">
 
     <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
         android:id="@+id/bv_top_bar"

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

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFF5F6F7">
+    android:background="#FFF5F6F7"
+    android:fitsSystemWindows="true">
 
     <include
         android:id="@+id/view_common_header"

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

@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <include
         android:id="@+id/view_common_header"
@@ -19,9 +20,9 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp1"
-        android:background="@color/color_FFF2F2F2"
         android:layout_marginStart="@dimen/dp19"
         android:layout_marginEnd="@dimen/dp19"
+        android:background="@color/color_FFF2F2F2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/iv_life_account_name" />