Merge branch 'dev_commodity' of...

Merge branch 'dev_commodity' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_commodity

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

 package com.yidian.common.services
 
+import android.graphics.Typeface
 import android.os.Handler
 import android.os.Message
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.AbsoluteSizeSpan
+import android.text.style.StyleSpan
 import com.yidian.common.widget.CommonHintDialog
+import com.yidian.utils.DensityUtil
 import com.yidian.xarc.xbase.net.CheckUpdateCallback
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.xpage.observer.DStackActivityManager
@@ -13,7 +19,6 @@ 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
@@ -127,14 +132,16 @@ 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()
+    val content = SpannableStringBuilder().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)
+    content.setSpan(AbsoluteSizeSpan(DensityUtil.sp2px(18f)), 0, 4, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    content.setSpan(StyleSpan(Typeface.BOLD), 0, 4, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
     if (data.echo_data?.force_update == true) {
       // 强制升级
-      CommonHintDialog(DStackActivityManager.getInstance().topActivity, content, arrayListOf("立即升级"), this).show()
+      CommonHintDialog(DStackActivityManager.getInstance().topActivity, content, arrayListOf("升级"), this).show()
     } else {
       // 非强制升级
-      CommonHintDialog(DStackActivityManager.getInstance().topActivity, content, arrayListOf("取消", "立即升级"), this).show()
+      CommonHintDialog(DStackActivityManager.getInstance().topActivity, content, arrayListOf("取消", "升级"), this).show()
     }
   }
 

CommonLib/Common/src/main/java/com/yidian/common/widget/CommonHintDialog.kt

@@ -19,7 +19,7 @@ import com.yidian.utils.DensityUtil
  */
 class CommonHintDialog @JvmOverloads constructor(
   context: Context,
-  val content: String,
+  val content: CharSequence,
   val options: ArrayList<String>,
   val callback: OnHintOptionCallback?,
   private val leftBtnColor: Int = R.color.color_8F000000,

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

@@ -25,10 +25,10 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/tv_privacy_policy"
+        android:id="@+id/tv_user_agreement"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/privacy_policy"
+        android:text="@string/user_agreement"
         android:textColor="@color/color_FF1852F1"
         android:textSize="@dimen/sp13"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -36,14 +36,14 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/tv_user_agreement"
+        android:id="@+id/tv_privacy_policy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/user_agreement"
+        android:text="@string/privacy_policy"
         android:textColor="@color/color_FF1852F1"
         android:textSize="@dimen/sp13"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tv_privacy_policy"
+        app:layout_constraintStart_toEndOf="@id/tv_user_agreement"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file