feat : 与医疗app统一蓝色色值

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.49.10",
             "m-consultant"    : "0.0.59.91",
             "m-fm"            : "0.0.30.03",
-            "m-user"          : "0.0.61.58",
+            "m-user"          : "0.0.61.63",
             "m-home"          : "0.0.22.70",
             "m-im"            : "0.0.19.75",
             "m-dynamic"       : "0.0.7.28",
@@ -33,10 +33,10 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.40.33",
+            "ydl-platform"    : "0.0.40.39",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.47",
+            "ydl-webview"     : "0.0.38.49",
             "ydl-media"       : "0.0.21.10",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.37",
@@ -91,7 +91,7 @@ ext {
             "m-confide"       : "0.0.49.10",
             "m-consultant"    : "0.0.59.91",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.61.58",
+            "m-user"          : "0.0.61.63",
             "m-home"          : "0.0.22.70",
             "m-im"            : "0.0.19.75",
             "m-dynamic"       : "0.0.7.28",
@@ -115,10 +115,10 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.40.33",
+            "ydl-platform"    : "0.0.40.39",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.47",
+            "ydl-webview"     : "0.0.38.49",
             "ydl-media"       : "0.0.21.10",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.37",
@@ -261,7 +261,7 @@ ext {
             "free_reflection"              : "me.weishu:free_reflection:2.0.0",
             "imagepicker"                  : "com.ydl:imagepicker:1.0.8.2",
             "pictureselector"              : "com.ydl:pictureselector:1.2.0",
-            "protector"                    : "com.ydl:protector:1.0.1-SNAPSHOT@aar",
+            "protector"                    : "com.ydl:protector:1.0.9-SNAPSHOT@aar",
             "ydl-hnet"                     : "com.ydl:h-net:0.0.8",
             "ydl-user-router"              : "com.ydl:router:1.0.0-SNAPSHOT@aar",
             "ydl-device"                   : "com.ydl:device-id:0.0.30@aar",

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -49,7 +49,6 @@ import com.ydl.ydlcommon.router.YdlCommonRouterManager
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.Utils
-import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
@@ -605,11 +604,6 @@ class AudioHomeActivity :
                 userCloseCalling()
             }
 
-            ActionCountUtils.count(
-                "shengwang_popup_layer_page|shengwang_popup_layer_refuse_click",
-                YdlCommonRouterManager.getYdlCommonRoute().getUid().toString(),
-                uid = YdlCommonRouterManager.getYdlCommonRoute().getUid().toString()
-            )
 
         }
         //免提
@@ -1145,11 +1139,6 @@ class AudioHomeActivity :
         )
 
 
-        ActionCountUtils.count(
-            "shengwang_popup_layer_page|shengwang_popup_layer_page_visit",
-            "",
-            uid = YdlCommonRouterManager.getYdlCommonRoute().getUid().toString()
-        )
     }
 
     override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {

m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt

@@ -46,7 +46,6 @@ import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.Utils
-import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
@@ -665,11 +664,7 @@ class ConsultantAudioHomeActivity :
         }
         showStopService()
         writeAgoraLog("用户点击挂断按钮")
-        ActionCountUtils.count(
-            "shengwang_popup_layer_page|shengwang_popup_layer_refuse_click",
-            YdlCommonRouterManager.getYdlCommonRoute().getUid().toString(),
-            uid = YdlCommonRouterManager.getYdlCommonRoute().getUid().toString()
-        )
+
     }
 
     /**
@@ -689,11 +684,6 @@ class ConsultantAudioHomeActivity :
         executeCall(true)
 
 
-        ActionCountUtils.count(
-            "shengwang_popup_layer_page|shengwang_popup_layer_answer_click",
-            YdlCommonRouterManager.getYdlCommonRoute().getUid().toString(),
-            uid = YdlCommonRouterManager.getYdlCommonRoute().getUid().toString()
-        )
     }
 
     /**
@@ -749,11 +739,6 @@ class ConsultantAudioHomeActivity :
             SensorManager.SENSOR_DELAY_NORMAL
         )
 
-        ActionCountUtils.count(
-            "shengwang_popup_layer_page|shengwang_popup_layer_page_visit",
-            "",
-            uid = YdlCommonRouterManager.getYdlCommonRoute().getUid().toString()
-        )
     }
 
     override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -120,7 +120,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
                 ds.color =
-                    ContextCompat.getColor(this@RegisterAndLoginActivity, R.color.user_1da1f2trans)
+                    ContextCompat.getColor(this@RegisterAndLoginActivity, R.color.user_medical_blue)
                 ds.isUnderlineText = true      //设置下划线
             }
 
@@ -136,7 +136,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
                 ds.color =
-                    ContextCompat.getColor(this@RegisterAndLoginActivity, R.color.user_1da1f2trans)
+                    ContextCompat.getColor(this@RegisterAndLoginActivity, R.color.user_medical_blue)
                 ds.isUnderlineText = true      //设置下划线
             }
 

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -353,7 +353,7 @@ class VerificationCodeActivity :
                 tv_countdown_time.setTextColor(
                     ContextCompat.getColor(
                         this,
-                        R.color.platform_color_2EB0FF
+                        R.color.user_medical_blue
                     )
                 )
             })

m-user/src/main/java/com/yidianling/user/widget/PinField/PinField.kt

@@ -59,7 +59,7 @@ open class PinField : AppCompatEditText {
             invalidate()
         }
 
-    var highlightPaintColor = ContextCompat.getColor(context, R.color.user_pinFieldLibraryAccent)
+    var highlightPaintColor = ContextCompat.getColor(context, R.color.user_medical_blue)
         set(value) {
             field = value
             highlightPaint.color = field
@@ -106,7 +106,7 @@ open class PinField : AppCompatEditText {
 
     var onTextCompleteListener: OnTextCompleteListener? = null
 
-    var fieldBgColor = ContextCompat.getColor(context, R.color.user_pinFieldLibraryAccent)
+    var fieldBgColor = ContextCompat.getColor(context, R.color.user_medical_blue)
         set(value) {
             field = value
             fieldBgPaint.color = fieldBgColor

m-user/src/main/res/layout/user_activity_verification_code_new.xml

@@ -66,6 +66,7 @@
         app:User_highlightType="currentField"
         app:User_isCursorEnabled="true"
         app:User_noOfFields="4"
+        app:User_fieldColor="@color/user_medical_blue"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_phone"

m-user/src/main/res/layout/user_kefu_tipdialog.xml

@@ -89,7 +89,7 @@
             android:text="立即拨打"
             android:textSize="17sp"
             android:gravity="center"
-            android:textColor="@color/platform_color_1DA1F2"
+            android:textColor="@color/user_medical_blue"
             android:id="@+id/dial_right_now"
             />
     </LinearLayout>

m-user/src/main/res/values/colors.xml

@@ -27,4 +27,5 @@
     <color name="user_pinFieldLibraryTransparent">#00000000</color>
     <color name="user_bgcolorred">#ff5040</color>
     <color name="user_1da1f2trans">#601da1f2</color>
+    <color name="user_medical_blue">#3464ec</color>
 </resources>