From 9b4607b37adc684b553cc9b1cb2d9c5061c38a4d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 17 Dec 2020 15:36:26 +0800 Subject: [PATCH] opt --- .../res/layout/modudle_camera_layout_info.xml | 4 --- .../utils/CameraLiveNoticeHelper.java | 28 +++++++++++------- .../src/main/res/drawable-ldpi/icon_space.png | Bin 0 -> 163 bytes .../src/main/res/drawable-mdpi/icon_space.png | Bin 0 -> 163 bytes .../main/res/drawable-xhdpi/icon_space.png | Bin 0 -> 163 bytes .../media/widget/CircleNumberProgress.java | 14 +++++++-- .../module/media/window/MediaWindow2.java | 9 +----- ...le_media_music_window_alert_layout_new.xml | 2 ++ .../src/main/res/values/colors.xml | 2 +- .../service/location/MogoRTKLocation.java | 5 ++++ 10 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-ldpi/icon_space.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-mdpi/icon_space.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/icon_space.png 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" /> - - \ 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 { - 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?T zfNTy1#`a7G7LXDkmI7i12Id8f49q~95hS*N2`lFz;gC(9 dV0`8t7X#C5#)1#A%8Nk?JYD@<);T3K0RVV#8oU4i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a2350b85a83e3be89d63ea1461878407f940a1ee GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMwQX@Rme0>?T zfNTy1#`a7G7LXDkmI7i12Id8f49q~95hS*N2`lFz;gC(9 dV0`8t7X#C5#)1#A%8Nk?JYD@<);T3K0RVV#8oU4i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a2350b85a83e3be89d63ea1461878407f940a1ee GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMwQX@Rme0>?T zfNTy1#`a7G7LXDkmI7i12Id8f49q~95hS*N2`lFz;gC(9 dV0`8t7X#C5#)1#A%8Nk?JYD@<);T3K0RVV#8oU4i literal 0 HcmV?d00001 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 @@ #fff #7affffff #444E6E - #B63737 + #80ffffff 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"); } }