Merge branch 'develop' into dev_second

# Conflicts:
#	app/src/main/java/com/zj365/dc/activity/RegisterAct.kt
#	app/src/main/res/layout/frag_mine.xml
#	mine/src/main/java/com/zj365/mime/act/AgreementAct.kt

app/src/main/java/com/zj365/dc/activity/LoginAct.kt

@@ -148,7 +148,7 @@ class LoginAct : BaseVmAct<LoginVm>() {
      * 隐私条款
      */
     fun setPrv() {
-        var txtCol = ContextCompat.getColor(this, R.color.col_313)
+        var txtCol = ContextCompat.getColor(this, R.color.col_02c)
         binding.seleck.setOnClickListener {
             it.isSelected = !it.isSelected
         }

app/src/main/java/com/zj365/dc/activity/RegisterAct.kt

@@ -122,7 +122,7 @@ class RegisterAct : BaseVmAct<RegisterVm>() {
      * 隐私条款
      */
     private fun setPrv() {
-        var txtCol = ContextCompat.getColor(this, R.color.col_313)
+        var txtCol = ContextCompat.getColor(this, R.color.col_02c)
         binding.mPrivate.movementMethod = MyLinkedMovementMethod().getInstance()
         var span = SpannableString(getString(R.string.private_info))
         span.setSpan(object : ClickableSpan() {

app/src/main/java/com/zj365/dc/weight/PrevDialog.kt

@@ -32,7 +32,7 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
         percentHeight = 3 / 5f
         setDialogPadding(80, 0, 80, 80)
 
-        val txtCol = ContextCompat.getColor(context, R.color.col_009)
+        val txtCol = ContextCompat.getColor(context, R.color.col_02c)
         binding.mContent.movementMethod = MyLinkedMovementMethod().getInstance()
         val string = context.getString(R.string.prev_content)
         val span = SpannableString(string)

base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt

@@ -78,7 +78,7 @@ class AppUpdateDialog(
             isShow.invoke(false)
             return
         }
-     //   binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE
+        binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE
         isShow.invoke(true)
         loadPath = url
         show()