update 个人认证切换XInsight API

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

@@ -41,7 +41,7 @@ class LifeAccountPersonalAuthActivity :
   /**
    * 当前fragment
    */
-  private lateinit var curFragment: LifeAccountIDCardAuthFragment
+  private lateinit var curFragment: LifeAccountIDCardAuthFragmentV2
 
   /**
    * 认证数据 还原认证流程用
@@ -92,11 +92,11 @@ class LifeAccountPersonalAuthActivity :
 
   private fun initData() {
     // 如果有已存在的认证流程则还原进度
-    authData?.let { LifeAccountAuthDataManager.generatePersonalAuthData(it) }
+    authData?.let { LifeAccountAuthDataManagerV2.generatePersonalAuthData(it) }
     authData?.occupation?.let { viewBind.svOccupation.setContentResult(it) }
-    curFragment = LifeAccountIDCardAuthFragment()
+    curFragment = LifeAccountIDCardAuthFragmentV2()
     val bundle = Bundle()
-    bundle.putSerializable(LifeAccountIDCardAuthFragment.EXTRA_AUTH_DATA, authData)
+    bundle.putSerializable(LifeAccountIDCardAuthFragmentV2.EXTRA_AUTH_DATA, authData)
     curFragment.arguments = bundle
     supportFragmentManager.beginTransaction()
       .add(R.id.fragment_container, curFragment).commit()
@@ -106,9 +106,9 @@ class LifeAccountPersonalAuthActivity :
    * 检查是否可以进行下一步
    */
   fun checkNextCondition() {
-    if (LifeAccountAuthDataManager.personalAuthData.isAgreePrivacyAgreement
-      && !LifeAccountAuthDataManager.personalAuthData.occupation.isNullOrEmpty()
-      && LifeAccountAuthDataManager.personalAuthData.isFaceAuthPass
+    if (LifeAccountAuthDataManagerV2.personalAuthData.isAgreePrivacyAgreement
+      && !LifeAccountAuthDataManagerV2.personalAuthData.occupation.isNullOrEmpty()
+      && LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass
     ) {
       viewBind.tvNext.alpha = 1f
       viewBind.tvNext.isEnabled = true
@@ -130,14 +130,14 @@ class LifeAccountPersonalAuthActivity :
    * 避免在升级企业认证时出现数据异常
    */
   private fun clearLifeAccountAuthData() {
-    LifeAccountAuthDataManager.personalAuthData.isAgreePrivacyAgreement = false
-    LifeAccountAuthDataManager.personalAuthData.occupation = null
-    LifeAccountAuthDataManager.personalAuthData.isFaceAuthPass = false
-    LifeAccountAuthDataManager.personalAuthData.realName = null
-    LifeAccountAuthDataManager.personalAuthData.idCardNum = null
-    LifeAccountAuthDataManager.personalAuthData.occupation = null
-    LifeAccountAuthDataManager.personalAuthData.isIDCardPortraitFaceUpload = false
-    LifeAccountAuthDataManager.personalAuthData.isIDCardNationalEmblemFaceUpload = false
+    LifeAccountAuthDataManagerV2.personalAuthData.isAgreePrivacyAgreement = false
+    LifeAccountAuthDataManagerV2.personalAuthData.occupation = null
+    LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass = false
+    LifeAccountAuthDataManagerV2.personalAuthData.realName = null
+    LifeAccountAuthDataManagerV2.personalAuthData.idCardNum = null
+    LifeAccountAuthDataManagerV2.personalAuthData.occupation = null
+    LifeAccountAuthDataManagerV2.personalAuthData.isIDCardPortraitFaceUpload = false
+    LifeAccountAuthDataManagerV2.personalAuthData.isIDCardNationalEmblemFaceUpload = false
   }
 
   override fun onClick(v: View?) {
@@ -192,7 +192,7 @@ class LifeAccountPersonalAuthActivity :
     when (event?.name) {
       XEventConfig.CHOOSE_CAREER -> {
         val selectedCareer = event.body as String
-        LifeAccountAuthDataManager.personalAuthData.occupation = selectedCareer
+        LifeAccountAuthDataManagerV2.personalAuthData.occupation = selectedCareer
         viewBind.svOccupation.setContentResult(selectedCareer)
         checkNextCondition()
       }
@@ -206,7 +206,7 @@ class LifeAccountPersonalAuthActivity :
     // 清空职业标签回显
     viewBind.svOccupation.clearContentResult()
     // 清空身份信息页 直接替换fragment
-    val targetFragment = LifeAccountIDCardAuthFragment()
+    val targetFragment = LifeAccountIDCardAuthFragmentV2()
     supportFragmentManager.beginTransaction().remove(curFragment).add(R.id.fragment_container, targetFragment).commit()
     curFragment = targetFragment
   }

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

@@ -21,9 +21,13 @@ object FileUtil {
     if (uri != null) {
       val file = File(path)
       if (file.exists()) file.delete()
-            file.parentFile?.mkdirs()
+      if (file.parentFile?.exists() == false) file.parentFile?.mkdirs()
       file.createNewFile()
-            context?.contentResolver?.openInputStream(uri)?.copyTo(FileOutputStream(path))
+      val inputStream = context?.contentResolver?.openInputStream(uri)
+      val outputStream = FileOutputStream(path)
+      inputStream?.copyTo(outputStream)
+      inputStream?.close()
+      outputStream.close()
     }
   }
 
@@ -35,9 +39,11 @@ object FileUtil {
   fun copyFileFromAssets(context: Context?, assetFileName: String, destPath: String) {
     val file = File(destPath)
     if (file.exists()) file.delete()
-        file.parentFile?.mkdirs()
+    if (file.parentFile?.exists() == false) file.parentFile?.mkdirs()
     file.createNewFile()
-        context?.assets?.open(assetFileName)?.copyTo(FileOutputStream(file))
+    val outputStream = FileOutputStream(file)
+    context?.assets?.open(assetFileName)?.copyTo(outputStream)
+    outputStream.close()
   }
 
   /**
@@ -49,7 +55,7 @@ object FileUtil {
     if (data.isNullOrEmpty()) return
     val file = File(destPath)
     if (file.exists()) file.delete()
-        file.parentFile?.mkdirs()
+    if (file.parentFile?.exists() == false) file.parentFile?.mkdirs()
     file.createNewFile()
     File(destPath).writeText(data)
   }