Merge branch 'dev' into dev_commodity

# Conflicts:
#	CommonLib/Common/src/main/java/com/yidian/common/base/BaseActivity.kt
#	app/build.gradle
#	app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
#	config/config.gradle

CommonLib/Common/src/main/java/com/yidian/common/base/BaseActivity.kt

 package com.yidian.common.base
 
+import android.annotation.SuppressLint
+import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.view.View
 import androidx.viewbinding.ViewBinding
@@ -11,11 +13,14 @@ import com.yidian.xpage.XPageViewProtocol
 
 
 abstract class BaseActivity<VB : ViewBinding> : NightAppCompatActivity(), XPageViewProtocol {
+
   protected lateinit var viewBind: VB
 
+  @SuppressLint("SourceLockedOrientationActivity")
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     viewBind = createViewBinding()
+    requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
     extraViewBinding()
     setContentView(viewBind.root)
     init(savedInstanceState)

CommonLib/Common/src/main/java/com/yidian/common/services/AppUpgradeService.kt

@@ -13,6 +13,7 @@ import com.yidian.yac.pm.appupdate.YDAppUpdateManager
 import com.yidian.yac.pm.appupdate.callback.AppUpdateCallback
 import com.yidian.yac.pm.base.UpdateInfo
 import java.io.File
+import java.lang.StringBuilder
 
 /**
  * author: yinjiacheng
@@ -125,12 +126,15 @@ class AppUpgradeService : ZapService(), CommonHintDialog.OnHintOptionCallback, H
    * 展示升级弹窗
    */
   private fun showAppUpgradeDialog(data: AppUpdateInfo<AppUpdateEchoData>) {
+    // 版本更新信息
+    val content = StringBuilder().append("检测到版本更新").append("\n").append(data.result?.get(0)?.package_version).append("\n")
+      .append(data.result?.get(0)?.update_time).append("\n").append(data.result?.get(0)?.note).toString()
     if (data.echo_data?.force_update == true) {
       // 强制升级
-      CommonHintDialog(DStackActivityManager.getInstance().topActivity, "检测到版本更新", arrayListOf("立即升级"), this).show()
+      CommonHintDialog(DStackActivityManager.getInstance().topActivity, content, arrayListOf("立即升级"), this).show()
     } else {
       // 非强制升级
-      CommonHintDialog(DStackActivityManager.getInstance().topActivity, "检测到版本更新", arrayListOf("取消", "立即升级"), this).show()
+      CommonHintDialog(DStackActivityManager.getInstance().topActivity, content, arrayListOf("取消", "立即升级"), this).show()
     }
   }
 

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

@@ -8,6 +8,8 @@ package com.yidian.shenghuoquan.newscontent.bean
 class LifeAccountMerchantAuthData {
   var merchantType: Int = 0
   var isBusinessLicenseUpload: Boolean = false
+  var businessLicenseUrl: String? = null // 营业执照图片唯一标识
+  var businessLicenseBucket: String? = null
   var businessLicenseObjectKey: String? = null
   var registrationName: String? = null
   var registrationCode: String? = null
@@ -32,6 +34,8 @@ class LifeAccountMerchantAuthData {
   fun clearData() {
     merchantType = 0
     isBusinessLicenseUpload = false
+    businessLicenseUrl = null
+    businessLicenseBucket = null
     businessLicenseObjectKey = null
     registrationName = null
     registrationCode = null

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

@@ -10,6 +10,8 @@ class LifeAccountPersonalAuthData {
   var idCardNum: String? = null
   var phoneNum: String? = null // 法人手机号
   var occupation: String? = null
+  var idCardPortraitFaceUrl: String? = null // 身份证人像面图片唯一标识
+  var idCardNationalEmblemFaceUrl: String? = null // 身份证国徽面图片唯一标识
   var idCardPortraitFaceObjectKey: String? = null
   var idCardNationalEmblemFaceObjectKey: String? = null
   var idCardPortraitFaceBucket: String? = null
@@ -37,6 +39,8 @@ class LifeAccountPersonalAuthData {
     idCardNum = null
     phoneNum = null
     occupation = null
+    idCardPortraitFaceUrl = null
+    idCardNationalEmblemFaceUrl = null
     idCardPortraitFaceObjectKey = null
     idCardNationalEmblemFaceObjectKey = null
     idCardPortraitFaceBucket = null

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthAuthenticationBean.kt

@@ -13,10 +13,10 @@ class AuthAuthenticationBean(val response: Response) : Serializable {
     val address: String,
     val audit_status: Int,
     val auth: Int,
-        val back_id_card: String,
+    val back_image_url: String, // 身份证国徽面bucket/objectid
     val back_id_card_url: String,
     val create_time: String,
-        val front_id_card: String,
+    val posit_image_url: String,  // 身份证人像面bucket/objectid
     val front_id_card_url: String,
     val full_name: String,
     val gender: String,

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthMerchantCheckBean.kt

@@ -22,16 +22,16 @@ class AuthMerchantCheckBean : Serializable {
     val enterprice_address: String,
     val enterprice_type: String,
     val enterprise_auth_record_id: Long,
-    val entterprise_image: String,
+    val business_image_url: String, // 营业执照bucket/objectid
     val entterprise_image_url: String,
     val establishment_date: String,
     val form: String,
     val funding: String,
     val issue_date: String,
     val legal_address: String,
-    val legal_back_id_card: String,
+    val back_image_url: String, // 身份证国徽面bucket/objectid
     val legal_back_id_card_url: String,
-    val legal_front_id_card: String,
+    val posit_image_url: String, // 身份证人像面bucket/objectid
     val legal_front_id_card_url: String,
     val legal_id_card: String,
     val legal_issued_by: String,

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/BusinessLicenseOCRBean.kt

@@ -6,7 +6,7 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
  * description: 营业执照OCR
  */
 class BusinessLicenseOCRBean {
-    data class Request(val business_image_objectid: String, val business_image_bucket: String)
+  data class Request(val business_image_url: String)
 
   data class Response(
     val addr: String,

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/GetIDCardOCRBean.kt

@@ -7,10 +7,8 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
  */
 class GetIDCardOCRBean(val request: Request, val response: Response) {
   data class Request(
-        val posit_image_objectid: String,
-        val back_image_objectid: String,
-        val posit_bucket: String,
-        val back_bucket: String
+    val back_image_url: String,
+    val posit_image_url: String
   )
 
   data class Response(
@@ -48,6 +46,3 @@ class GetIDCardOCRBean(val request: Request, val response: Response) {
     val Temporary_ID_Photo: Double
   )
 }
-
-    
-    

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/IdentifyIdOcrVerifyBean.kt

 package com.yidian.shenghuoquan.newscontent.http.httpbean
 
 class IdentifyIdOcrVerifyBean(val request: Request, val response: Response) {
-    data class Request(val biz_token: String, val meglive_objectid: String)
+  data class Request(val biz_token: String, val meglive_url: String)
+
   data class Response(val verify_result: Boolean)
 }
-
-    

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

@@ -50,8 +50,8 @@ object LifeAccountAuthDataManager {
     personalAuthData.realName = data.full_name
     personalAuthData.idCardNum = data.id_card
     personalAuthData.occupation = data.occupation
-    personalAuthData.idCardPortraitFaceObjectKey = data.front_id_card
-    personalAuthData.idCardNationalEmblemFaceObjectKey = data.back_id_card
+    personalAuthData.idCardPortraitFaceUrl = data.posit_image_url
+    personalAuthData.idCardNationalEmblemFaceUrl = data.back_image_url
     personalAuthData.address = data.address
     personalAuthData.nationality = data.nationality
     personalAuthData.gender = data.gender
@@ -69,12 +69,10 @@ object LifeAccountAuthDataManager {
    */
   fun generateAuthPersonalCheckRequest(): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
-    requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
-    requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
-    requestMap["front_completeness"] =
-      personalAuthData.idCardPortraitFaceCompleteness.toString()
-    requestMap["bak_completeness"] =
-      personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
+    requestMap["posit_image_url"] = personalAuthData.idCardPortraitFaceUrl
+    requestMap["back_image_url"] = personalAuthData.idCardNationalEmblemFaceUrl
+    requestMap["front_completeness"] = personalAuthData.idCardPortraitFaceCompleteness.toString()
+    requestMap["bak_completeness"] = personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
     requestMap["id_card"] = personalAuthData.idCardNum
     requestMap["gender"] = personalAuthData.gender
     requestMap["name"] = personalAuthData.realName
@@ -130,7 +128,7 @@ object LifeAccountAuthDataManager {
     merchantAuthData.form = data.form
     merchantAuthData.funding = data.funding
     merchantAuthData.dateIssue = data.issue_date
-    merchantAuthData.businessLicenseObjectKey = data.entterprise_image
+    merchantAuthData.businessLicenseUrl = data.business_image_url
     merchantAuthData.pers = data.pers
     personalAuthData.realName = data.legal_person
     personalAuthData.idCardNum = data.legal_id_card
@@ -141,8 +139,8 @@ object LifeAccountAuthDataManager {
     personalAuthData.issuedBy = data.legal_issued_by
     personalAuthData.validDateStart = data.legal_validity_start_time
     personalAuthData.validDateEnd = data.legal_validity_end_time
-    personalAuthData.idCardPortraitFaceObjectKey = data.legal_front_id_card
-    personalAuthData.idCardNationalEmblemFaceObjectKey = data.legal_back_id_card
+    personalAuthData.idCardPortraitFaceUrl = data.posit_image_url
+    personalAuthData.idCardNationalEmblemFaceUrl = data.back_image_url
     personalAuthData.isIDCardPortraitFaceUpload = true
     personalAuthData.isIDCardNationalEmblemFaceUpload = true
     personalAuthData.idCardPortraitFaceCompleteness = 0
@@ -171,7 +169,7 @@ object LifeAccountAuthDataManager {
     requestMap["form"] = merchantAuthData.form
     requestMap["funding"] = merchantAuthData.funding
     requestMap["issue_date"] = merchantAuthData.dateIssue
-    requestMap["entterprise_image"] = merchantAuthData.businessLicenseObjectKey
+    requestMap["entterprise_image_url"] = merchantAuthData.businessLicenseUrl
     requestMap["data_from"] = Constant.DATA_FROM_B.toString()
     requestMap["data_type"] = merchantAuthData.merchantType.toString()
     lifeAccountId?.let { requestMap["life_account_id"] = it }
@@ -185,12 +183,10 @@ object LifeAccountAuthDataManager {
   fun generateAuthIndividualBusinessIdentityCommitRequest(): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
     requestMap["record_id"] = merchantAuthData.authRecordId.toString()
-    requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
-    requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
-    requestMap["front_completeness"] =
-      personalAuthData.idCardPortraitFaceCompleteness.toString()
-    requestMap["bak_completeness"] =
-      personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
+    requestMap["posit_image_url"] = personalAuthData.idCardPortraitFaceUrl
+    requestMap["back_image_url"] = personalAuthData.idCardNationalEmblemFaceUrl
+    requestMap["front_completeness"] = personalAuthData.idCardPortraitFaceCompleteness.toString()
+    requestMap["bak_completeness"] = personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
     requestMap["idcard_number"] = personalAuthData.idCardNum
     requestMap["gender"] = personalAuthData.gender
     requestMap["name"] = personalAuthData.realName
@@ -210,12 +206,10 @@ object LifeAccountAuthDataManager {
   ): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
     requestMap["record_id"] = merchantAuthData.authRecordId.toString()
-    requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
-    requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
-    requestMap["front_completeness"] =
-      personalAuthData.idCardPortraitFaceCompleteness.toString()
-    requestMap["bak_completeness"] =
-      personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
+    requestMap["posit_image_url"] = personalAuthData.idCardPortraitFaceUrl
+    requestMap["back_image_url"] = personalAuthData.idCardNationalEmblemFaceUrl
+    requestMap["front_completeness"] = personalAuthData.idCardPortraitFaceCompleteness.toString()
+    requestMap["bak_completeness"] = personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
     requestMap["idcard_number"] = personalAuthData.idCardNum
     requestMap["gender"] = personalAuthData.gender
     requestMap["name"] = personalAuthData.realName
@@ -225,9 +219,7 @@ object LifeAccountAuthDataManager {
     requestMap["valid_date_end"] = personalAuthData.validDateEnd
     requestMap["issued_by"] = personalAuthData.issuedBy
     requestMap["mobile"] = personalAuthData.phoneNum
-    lifeAccountId?.let {
-      requestMap["life_account_id"] = it
-    }
+    lifeAccountId?.let { requestMap["life_account_id"] = it }
     return requestMap
   }
 
@@ -237,9 +229,7 @@ object LifeAccountAuthDataManager {
   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
-    }
+    lifeAccountId?.let { requestMap["life_account_id"] = it }
     return requestMap
   }
 }

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

@@ -240,10 +240,7 @@ class LifeAccountBusinessLicenseAuthFragment :
       )
       return
     }
-    val requestParams = HashMap<String, String?>()
-    requestParams["business_image_objectid"] = objectKey
-    requestParams["business_image_bucket"] = bucket
-    ApiService.businessLicenseOCR(this, requestParams)
+    ApiService.businessLicenseOCR(this, hashMapOf(Pair("business_image_url", "$bucket/$objectKey")))
   }
 
   /**
@@ -287,7 +284,9 @@ class LifeAccountBusinessLicenseAuthFragment :
 
   override fun onTaskSuccess(bucket: String?, objectKey: String?) {
     LifeAccountAuthDataManager.merchantAuthData.isBusinessLicenseUpload = true
+    LifeAccountAuthDataManager.merchantAuthData.businessLicenseBucket = bucket
     LifeAccountAuthDataManager.merchantAuthData.businessLicenseObjectKey = objectKey
+    LifeAccountAuthDataManager.merchantAuthData.businessLicenseUrl = "${bucket}/${objectKey}"
     // 执行营业执照OCR
     startBusinessLicenseOCR(objectKey, bucket)
   }

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

@@ -461,6 +461,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
               objectKey
             LifeAccountAuthDataManager.personalAuthData.idCardPortraitFaceBucket =
               bucket
+            LifeAccountAuthDataManager.personalAuthData.idCardPortraitFaceUrl = "${bucket}/${objectKey}"
           } else {
             LifeAccountAuthDataManager.personalAuthData.isIDCardNationalEmblemFaceUpload =
               true
@@ -468,6 +469,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
               objectKey
             LifeAccountAuthDataManager.personalAuthData.idCardNationalEmblemFaceBucket =
               bucket
+            LifeAccountAuthDataManager.personalAuthData.idCardNationalEmblemFaceUrl = "${bucket}/${objectKey}"
           }
           startIDCardOCR(face, objectKey, bucket)
         }
@@ -508,8 +510,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
           }
 
         }, hashMapOf(
-          Pair("posit_image_objectid", objectKey),
-          Pair("posit_bucket", bucket)
+          Pair("posit_image_url", "$bucket/$objectKey")
         )
       )
     } else {
@@ -534,8 +535,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
           }
 
         }, hashMapOf(
-          Pair("back_image_objectid", objectKey),
-          Pair("back_bucket", bucket)
+          Pair("back_image_url", "$bucket/$objectKey")
         )
       )
     }
@@ -660,8 +660,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
           "biz_token",
           LifeAccountAuthDataManager.personalAuthData.liveDetectBizToken
         ),
-        Pair("meglive_objectid", objectKey),
-        Pair("meglive_bucket", bucket)
+        Pair("meglive_url", "$bucket/$objectKey")
       )
     )
   }

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

@@ -100,9 +100,9 @@ class LifeAccountModifyNameActivity : BaseActivity<ActivityLifeAccountModifyName
       // 生活号名称修改成功 发送事件通知商户基本信息页面和商户管理中心页面
       XEventManager.post(XBaseEvent(XEventConfig.LIFE_ACCOUNT_NAME_MODIFY, viewBind.evLifeAccountName.getEditContent()))
       XPageManager.pop(null)
-    } else {
-      // 生活号名称修改失败 提示
-      viewBind.evLifeAccountName.showErrorTips(resources.getString(R.string.life_account_name_already_exist))
+//    } else {
+//      // 生活号名称修改失败 提示
+//      viewBind.evLifeAccountName.showErrorTips(resources.getString(R.string.life_account_name_already_exist))
     }
   }
 

app/build.gradle

@@ -13,6 +13,8 @@ android {
         targetSdkVersion build_versions.targetSdkVersion
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
+        buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey)
+        buildConfigField("boolean", "IS_APP_UPGRADE_ONLINE", rootProject.ext.android.isAppUpgradeOnline)
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         manifestPlaceholders = [qqappid: "101923771"]