diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
index 360fbb6d4a..39535e2391 100644
--- a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
+++ b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
@@ -15,8 +15,4 @@
         android:layout_height="wrap_content"
         android:src="@drawable/module_camera_real_time_traffic" />
 
-    <TextView
-        android:layout_width="1px"
-        android:layout_height="1px"/>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
index cecf99c144..9413d2bcc6 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
@@ -34,7 +34,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
     private Context mContext;
     private static IMogoMarker mMogoMarker;
     private CloudRoadData mCloudRoadData;
-
+    private boolean isFirst;
 
     public void init(Context context) {
         Logger.d(TAG, "init ======= ");
@@ -60,14 +60,21 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
             }
         });
 
-        UiThreadHandler.postDelayed(() -> {
-            mCloudRoadData = new CloudRoadData();
-            mCloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
+        if (!isFirst) {
+            isFirst = true;
+            UiThreadHandler.postDelayed(() -> {
+                mCloudRoadData = new CloudRoadData();
+                mCloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
             mCloudRoadData.setLat(40.200353);
             mCloudRoadData.setLon(116.745467);
+
+//                mCloudRoadData.setLat(40.200481);
+//                mCloudRoadData.setLon(116.738473);
+
 //            CameraLiveManager.getInstance().init(mCloudRoadData);
-            addCameraMarker(mCloudRoadData);
-        }, 2_000);
+                addCameraMarker(mCloudRoadData);
+            }, 2_000);
+        }
 
     }
 
@@ -90,15 +97,14 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
                 .longitude(roadData.getLon());
         options.anchor(0.5f, 0.5f);
 
-        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_real_time_traffic, null);
+        //icon_space
+        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_default_user_head, null);
         options.icon(bitmap);
         mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
                 .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-
-        mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), mMogoMarker.getMogoMarkerOptions()));
-        mMogoMarker.showInfoWindow();
-
         if (mMogoMarker != null) {
+            mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), mMogoMarker.getMogoMarkerOptions()));
+            mMogoMarker.showInfoWindow();
             mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
         }
     }
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/icon_space.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/icon_space.png
new file mode 100644
index 0000000000..a2350b85a8
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/icon_space.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/icon_space.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/icon_space.png
new file mode 100644
index 0000000000..a2350b85a8
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/icon_space.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/icon_space.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/icon_space.png
new file mode 100644
index 0000000000..a2350b85a8
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/icon_space.png differ
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java
index 1334310de3..ecd1fa5405 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java
@@ -1,6 +1,7 @@
 package com.mogo.module.media.widget;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
@@ -9,6 +10,7 @@ import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.mogo.module.media.R;
 import com.mogo.module.media.utils.Utils;
 
 /**
@@ -24,10 +26,12 @@ public class CircleNumberProgress extends View {
     private int paintTextSize = 20;
 
     /** 未完成进度条的颜色 */
-    private int paintUndoneColor = 0xffaaaaaa;
+//    private int paintUndoneColor = 0xffaaaaaa;
+    private int paintUndoneColor;
 
     /** 已完成进度条的颜色 */
-    private int paintDoneColor = 0xff67aae4;
+//    private int paintDoneColor = 0xff67aae4;
+    private int paintDoneColor;
 
     /** 百分比文字的颜色 */
     private int paintTextColor = 0xffff0077;
@@ -70,6 +74,12 @@ public class CircleNumberProgress extends View {
     public CircleNumberProgress(Context context, AttributeSet attrs) {
         super(context, attrs);
         this.context = context;
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.PercentageRing);
+        //中间圆的背景颜色  默认为浅紫色
+        paintUndoneColor = typedArray.getColor(R.styleable.PercentageRing_circleBackground, 0xffafb4db);
+        //外圆环的颜色  默认为深紫色
+        paintDoneColor = typedArray.getColor(R.styleable.PercentageRing_ringColor, 0xff6950a1);
+
         // 构造器中初始化数据
         initData();
     }
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index d30717caea..6acb0415ac 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -314,16 +314,9 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
 //                GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
                 }else{
                     Logger.e(TAG, "mMediaInfoData == null  ");
-//                    mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img);
-                    int size =
-                            mContext.getResources().getDimensionPixelSize(R.dimen.module_media_pop_window_anim_img_size_new);
-                    com.bumptech.glide.request.RequestOptions options =
-                            new com.bumptech.glide.request.RequestOptions()
-                                    .placeholder(R.drawable.module_media_default_music_img).error(R.drawable.module_media_default_music_img).override(size, size);
-                    GlideApp.with(mContext).asBitmap().apply(options).load("").into(new SkinAbleBitmapTarget(mAnimCircleImageView, options));
+                    mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img);
                 }
             }
-
         } else {
             if (mScrollText != null) {
                 mScrollText.setText(mMediaInfoData.getMediaName());
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
index 8c0e5dbe4d..d36414c4b7 100644
--- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
+++ b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
@@ -11,6 +11,8 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:circleBackground="@color/modules_media_music_bg_color"
+        app:ringColor="@color/modules_media_music_circle_color"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/modules/mogo-module-media/src/main/res/values/colors.xml b/modules/mogo-module-media/src/main/res/values/colors.xml
index b0944c76eb..b6ca26aca2 100644
--- a/modules/mogo-module-media/src/main/res/values/colors.xml
+++ b/modules/mogo-module-media/src/main/res/values/colors.xml
@@ -3,5 +3,5 @@
     <color name="modules_media_music_title_text_color">#fff</color>
     <color name="modules_media_music_time_text_color">#7affffff</color>
     <color name="modules_media_music_bg_color">#444E6E</color>
-    <color name="modules_media_music_circle_color">#B63737</color>
+    <color name="modules_media_music_circle_color">#80ffffff</color>
 </resources>
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
index 9ab2c99113..3234b62ae7 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
@@ -11,6 +11,7 @@ import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.module.common.entity.CloudLocationInfo;
@@ -121,7 +122,11 @@ public class MogoRTKLocation {
                 cloudLocationInfo.setSpeed(location.getSpeed());
                 cloudLocationInfo.setSatelliteTime(location.getTime());
                 cloudLocationInfo.setSystemTime(System.currentTimeMillis());
+
+                Log.e("liyz", "lat = " + location.getLatitude() + ">>>>long = " + location.getLongitude());
                 cacheList.add(cloudLocationInfo);
+            } else {
+                Log.e("liyz", "location == null");
             }
         }