diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
index 6ef394fe31..836d01608a 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -121,7 +121,6 @@ class CosStatusController : CosStatusCallback {
downloadUrl: String?,
localPath: String?
) {
- Log.d(TAG, "uploadFile mType= $mType")
Log.d(TAG, "uploadCosCompleted localPath = $localPath")
Log.d(TAG, "uploadCosCompleted downloadUrl = $downloadUrl")
Log.d(TAG, "uploadCosCompleted cosPath = $cosPath")
@@ -150,17 +149,19 @@ class CosStatusController : CosStatusCallback {
sendGetInfoFailedReceiver("100")
}
} else {
+ trackUploadCos(4)
//分享成功，并打点，如果是上报拥堵，需要takeVideo
LatLngStickyEventBus.getInstance()
.postSticky(GetImageSuccessEvent(downloadUrl, mType))
//上传录像以及缩略图成功
sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
}
+ } else {
+ trackUploadCos(5)
}
} else {
//上传图片成功, 如果是上报路况，直接上传，TODO
Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType")
-// if (mType.equals("1") || mType.equals("-1")) {
sendInformationDirectly(
INFO_TYPE_IMG,
mutableMapOf("pic" to downloadUrl as String),
@@ -170,7 +171,6 @@ class CosStatusController : CosStatusCallback {
mLongitude,
mLatitude
)
-// }
}
Log.d(TAG, "delete file: ${localPath!!}")
CosCallbackMapController.unregisterCallback(localPath)
@@ -200,7 +200,6 @@ class CosStatusController : CosStatusCallback {
longitude: Double,
latitude: Double
) {
- Log.d(TAG, "sendInformationDirectly isCustomSend = ${entity?.isCustom}")
Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId")
//开始上传
entity?.isCustom?.let {
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
index 1e48a22717..3ef6ac2e10 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
@@ -28,7 +28,7 @@ const val CarNet_Get_Strategy:String = "CarNet_Get_Strategy" //策略拉取成
const val CarNet_Create_Task:String = "CarNet_Create_Task" //创建定时任务
const val CarNet_Get_Picture:String = "CarNet_Get_Picture" //获取图片,type=1 调用, type=2 成功, type=3 失败
const val CarNet_Get_Video:String = "CarNet_Get_Video" //获取视频,type=1 调用,type=2 成功,type=3 失败
-const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始
+const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始， type=4 成功返回视频和缩略图，type=5 成功没有返回全视频和缩略图
const val CarNet_Servers_Upload:String = "CarNet_Servers_Upload" //上传服务端, type=1 成功,type=2 失败, type=3 开始
const val CarNet_Voice_Search:String = "CarNet_Voice_Search" //语音搜索路况,type=1 成功,type=2 失败
const val CarNet_USER_SHOW:String = "CarNet_user_show" //情报展示时长,showtime 加载列表时长
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java
index f7f69cc940..70a68303ed 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java
@@ -7,9 +7,14 @@ import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.bumptech.glide.load.Transformation;
+import com.bumptech.glide.load.engine.Resource;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPoolAdapter;
+import com.bumptech.glide.load.resource.bitmap.BitmapResource;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
+import com.mogo.commons.AbsMogoApplication;
public
/**
@@ -33,7 +38,15 @@ class SkinAbleBitmapTarget extends SimpleTarget< Bitmap > {
public void onResourceReady( @NonNull Bitmap resource, @Nullable Transition< ? super Bitmap > transition ) {
try {
mTarget.setImageResource( 0 );
- mTarget.setImageBitmap( resource );
+ if(mOptions.getTransformations().containsKey(Bitmap.class)) {
+ Transformation t = (Transformation) mOptions.getTransformations().get(Bitmap.class);
+ BitmapResource r = BitmapResource.obtain(resource, new BitmapPoolAdapter());
+ Resource r2 = t.transform(AbsMogoApplication.getApp(), r, resource.getWidth(),
+ resource.getHeight());
+ mTarget.setImageBitmap(r2.get());
+ }else {
+ mTarget.setImageBitmap(resource);
+ }
} catch( Exception e ){
e.printStackTrace();
}
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index bf2ac37b46..c93701df86 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -17,6 +17,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import com.alibaba.android.arouter.launcher.ARouter;
+import com.bumptech.glide.request.RequestOptions;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpFragment;
@@ -32,6 +33,7 @@ import com.mogo.map.navi.MogoTraffic;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.dialog.WMDialog;
+import com.mogo.module.common.glide.SkinAbleBitmapTarget;
import com.mogo.module.common.map.CustomNaviInterrupter;
import com.mogo.module.common.map.MapCenterPointStrategy;
import com.mogo.module.common.map.Scene;
@@ -540,7 +542,9 @@ public class EntranceFragment extends MvpFragment>event.lat = " + event.lat + " >>event.lon = " + event.lon + " >>event.imageUrl =" + event.imageUrl);
@@ -1118,7 +1118,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
AIAssist.getInstance(getContext()).speakTTSVoice((
String.format(voiceShareSuccessTts, getMathRandom())), null);
- TipToast.shortTip("分享成功");
+ TipToast.shortTip("分享成功",new TipDrawable(getResources().getDrawable(R.drawable.module_tanlu_upload_success)));
IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity);
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_fail.png
new file mode 100644
index 0000000000..f11f2cb3cd
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_fail.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_success.png
new file mode 100644
index 0000000000..19829a2454
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_success.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_fail.png
new file mode 100644
index 0000000000..f11f2cb3cd
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_fail.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_success.png
new file mode 100644
index 0000000000..19829a2454
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_success.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_fail.png
new file mode 100644
index 0000000000..4511f314bb
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_fail.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_success.png
new file mode 100644
index 0000000000..1ad96fc40f
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_success.png differ
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java
index b8a025e465..40e05358a0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java
@@ -14,7 +14,9 @@ import androidx.appcompat.app.AppCompatDelegate;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.module.v2x.R;
+import com.mogo.skin.support.IMogoSkinCompatSupportable;
import com.mogo.skin.support.IMogoSkinSupportInstaller;
+import com.mogo.skin.support.MogoSkinManager;
import com.mogo.skin.support.SkinMode;
/**
@@ -24,12 +26,13 @@ import com.mogo.skin.support.SkinMode;
* desc :
* version: 1.0
*/
-public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkinSupportInstaller {
+public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkinCompatSupportable {
private float roundLayoutRadius = 14f;
private Path roundPath;
private RectF rectF;
+
public RoundConstraintLayout(Context context) {
this(context, null);
}
@@ -81,23 +84,9 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin
super.draw(canvas);
}
- @Override
- public void install(Application application) {
-
- }
@Override
- public void loadSkin(SkinMode skinMode) {
-
- }
-
- @Override
- public AppCompatDelegate getSkinAppCompatDelegate(AppCompatActivity activity, AppCompatCallback callback) {
- return null;
- }
-
- @Override
- public void init(Context context) {
+ public void applySkin() {
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
index cf25fe1b0d..5099c33fbb 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
+++ b/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() {
+
+ }
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
index 1dad69a517..c5f6baf569 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
@@ -1,9 +1,9 @@
-
-
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
index 13636e15b9..7b835f3f95 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
index 3c6389b1f9..073241387f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index bb45e400c0..903bed8cfa 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
- android:textColor="@color/v2x_FFF_333_white"
+ android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_28"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
@@ -74,7 +74,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.59"
- android:textColor="@color/v2x_FFF_999_white"
+ android:textColor="@color/v2x_FFF_999"
android:textSize="@dimen/dp_26"
app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:gravity="center_vertical"
- android:textColor="@color/v2x_FFF_333_white"
+ android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_80"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
index b7d53a2321..f59c92e5d9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
index a2c65f66b0..48bdbca7bd 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index d9afa4955a..cabc198172 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -77,7 +77,7 @@
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="1"
- android:textColor="#FFFFFF"
+ android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_34"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
@@ -92,7 +92,7 @@
android:layout_marginBottom="@dimen/dp_24"
android:alpha="0.6"
android:gravity="center_vertical"
- android:textColor="#FFFFFF"
+ android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_30"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tvAddress"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index 43c372672e..79771659da 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -22,7 +22,7 @@
android:alpha="0.7"
android:gravity="bottom"
android:text="你还没有分享过道路事件，快去试试吧"
- android:textColor="@color/v2x_FFF_333_white"
+ android:textColor="@color/v2x_FFF_333"
android:textSize="18px" />
16px
16px
4px
-
+ 30px
+ 120px
diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml
index 918a85b0b2..1285a749e4 100644
--- a/modules/mogo-module-v2x/src/main/res/values/colors.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml
@@ -13,11 +13,10 @@
#FFFFFF
#10121E
#99FFFFFF
- #FFFFFF
- #FFFFFF
- #ff616381
- //endColor="#ff616381" android:startColor="#ff48495e"
-
-
+ #FFFFFF
+ #FFFFFF
+ #ff616381
+ #FFFFFF
+ #555A75
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index 735550dda3..5d2165aaac 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -56,5 +56,7 @@
16px
20px
66px
+ 16px
+
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png
new file mode 100644
index 0000000000..c20fc46314
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png
new file mode 100644
index 0000000000..46e9240f43
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_parking_p_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_parking_p_light.png
new file mode 100644
index 0000000000..430f4db852
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_parking_p_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png
new file mode 100644
index 0000000000..c20fc46314
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png
new file mode 100644
index 0000000000..47c45a2b5c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png
new file mode 100644
index 0000000000..cfbbe87d04
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
similarity index 80%
rename from skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml
rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
index a6ee48b155..fc0bfb4660 100644
--- a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
@@ -4,8 +4,8 @@
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
index c354dea572..0d1e99e607 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
@@ -10,7 +10,9 @@
#FFFFFF
#333333
#333333
- #999999
- #333333
+ #999999
+ #333333
+ #666666
+ #F5F5F5