Merge branch 'ui' into dev

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java

@@ -24,6 +24,7 @@ import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
+import com.mogo.skin.support.IMogoSkinCompatSupportable;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 import com.tencent.rtmp.ITXLivePlayListener;
@@ -41,7 +42,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
  * desc   :
  * version: 1.0
  */
-public class V2XLiveGSYVideoView extends RoundLayout {
+public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatSupportable {
     private final String TAG = "V2XLiveGSYVideoView";
 
     private TXCloudVideoView mTxcVideoView;
@@ -278,4 +279,9 @@ public class V2XLiveGSYVideoView extends RoundLayout {
                 .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_LIVE_UN_WAKEUP);
         super.onDetachedFromWindow();
     }
+
+    @Override
+    public void applySkin() {
+
+    }
 }

modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml

@@ -14,7 +14,7 @@
         android:id="@+id/rlRoadEventImg"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="#555A75"
+        android:background="@color/v2x_555A_F5F5"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"

modules/mogo-module-v2x/src/main/res/values/colors.xml

@@ -17,8 +17,6 @@
     <color name="v2x_FFF_333">#FFFFFF</color>
     <color name="v2x_ff6163_333">#ff616381</color>
     <color name="v2x_FFF_666">#FFFFFF</color>
-    //endColor="#ff616381" android:startColor="#ff48495e"
-
-
+    <color name="v2x_555A_F5F5">#555A75</color>
 
 </resources>

skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml

@@ -13,5 +13,6 @@
     <color name="v2x_FFF_999_light">#999999</color>
     <color name="v2x_FFF_333_light">#333333</color>
     <color name="v2x_FFF_666_light">#666666</color>
+    <color name="v2x_555A_F5F5_light">#F5F5F5</color>
 
 </resources>