Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts:
#	OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java

OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt

@@ -191,14 +191,6 @@ object LoginModel {
             OchCommonServiceManager.queryDriverServiceStatus(it, object : OchCommonServiceCallback<DriverStatusQueryRespBean> {
                     override fun onSuccess(data: DriverStatusQueryRespBean?) {
                         go2LoginInfo(data,"接口获取")
-                        // TODO yangyakun 根据后台配置的用户租户对应的皮肤包进行下载换肤
-                        val skin = Skin(
-                            "ce67cbe250672c6b44720f0f08f43ca1",
-                            "YiXin-skin_v1_2024_10_15.apk",
-                            "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/YiXin-skin_v1_2024_10_15.apk"
-                        )
-                        //换肤
-                        SkinManager.getInstance().selectSkin(Utils.getApp(), skin)
                     }
 
                     override fun onError() {

OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt

@@ -10,6 +10,7 @@ import android.view.*
 import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.LinearInterpolator
+import android.widget.VideoView
 import androidx.core.content.ContextCompat
 import androidx.core.widget.addTextChangedListener
 import com.mogo.commons.AbsMogoApplication
@@ -26,10 +27,13 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.KeyboardUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.eagle.core.utilcode.util.Utils
 import com.mogo.och.biz.BuildConfig
 import com.mogo.och.biz.R
 import com.mogo.och.biz.login.callback.ILoginViewCallback
 import com.mogo.och.biz.login.presenter.LoginPresenter
+import com.mogo.skin.Skin
+import com.mogo.skin.SkinManager
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack
 import com.shuyu.gsyvideoplayer.utils.Debuger
@@ -90,6 +94,14 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), ILoginView
 
     override fun initViews() {
         CallerLogger.d(TAG, "init")
+        // TODO yangyakun 根据后台配置的用户租户对应的皮肤包进行下载换肤
+        val skin = Skin(
+            "9b69f8c4a2b3b953e1600930eda6a099",
+            "YiXin-skin_v1_2024_10_23.apk",
+            "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/YiXin-skin_v1_2024_10_23.apk"
+        )
+        //换肤
+        SkinManager.getInstance().selectSkin(Utils.getApp(), skin)
 
         context?.let {
             val videoUrl:String

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml

@@ -38,7 +38,7 @@
             android:layout_marginStart="@dimen/dp_40"
             android:layout_marginEnd="@dimen/dp_40">
 
-            <ImageView
+            <com.mogo.skin.widget.SkinImageView
                 android:id="@+id/ivCarType"
                 android:layout_width="@dimen/dp_760"
                 android:layout_height="@dimen/dp_400"

gradle.properties

@@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.42
 # 远程通讯模块
 MOGO_TELEMATIC_VERSION=1.4.7.42
 # 动态换肤SDK
-MOGO_SKIN_VERSION=1.4.7.49.3-debug
+MOGO_SKIN_VERSION=1.4.7.49.7-debug
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=3.4.1.16