From 7496ce8abd3eb4ab928cf7e498259cc3bd844bf9 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 10 Sep 2020 17:03:57 +0800 Subject: [PATCH 1/3] opt ui --- .../module/main/service/MogoMainService.java | 2 +- .../drawable-ldpi/tanlu_navi_light.png | Bin 0 -> 457 bytes .../drawable-ldpi/tanlu_normal_image_light.png | Bin 0 -> 8672 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_navi_light.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_normal_image_light.png diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java index 077ec59994..b7c220f00b 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java @@ -82,7 +82,7 @@ class MogoMainService extends Service implements IMogoLocationListener { UiThreadHandler.postDelayed(() -> { Logger.d(TAG, "startTanluService ---------- "); mServiceApis.getTanluApi().startTanluService(); - }, 58_000L + }, 2_000L ); } diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_navi_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_navi_light.png new file mode 100644 index 0000000000000000000000000000000000000000..1e635c539a17713cbaa327a63d46c17d26df97fa GIT binary patch literal 457 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 literal 0 HcmV?d00001 From 9c7a5db517ab5f0cb7ed2a6f446405990cf2c724 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 10 Sep 2020 17:41:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=81=93=E8=B7=AF?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5=E6=97=B6=E7=9A=84poiType?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/CarCorderController.kt | 22 +++++++++---------- .../service/CosStatusController.kt | 22 +++++++++---------- .../roadcondition/service/MainService.kt | 10 ++++----- .../module/share/manager/GridBtnManager.kt | 5 +++++ .../src/main/res/layout/item_share_btn.xml | 5 ++++- 5 files changed, 36 insertions(+), 28 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index 845db90855..ebd938a034 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -159,16 +159,16 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { val entity = TakeEntity(isCustom, 0L) Log.e(TAG, "onTakePhotoFail -----mType = $mType --- isCustom = $isCustom") //语音播报 1：上报路况，2：交通检查，3：封路 默认 mType 应该为null - if (mType.equals(TANLU_ROAD_CONGESTION) || mType.equals(TANLU_TRAFFIC_CHECK) || mType.equals( - TANLU_ROAD_CLOSURE - ) - || mType.equals(TANLU_ROAD_CURRENT) || mType.equals(TANLU_ROAD_PONDING) || mType.equals( - TANLU_ROAD_ICING - ) - || mType.equals(TANLU_ROAD_HEAVY_FOG) || mType.equals(TANLU_ROAD_ACCIDENT) || mType.equals( - TANLU_ROAD_WORK - ) - ) { +// if (mType.equals(TANLU_ROAD_CONGESTION) || mType.equals(TANLU_TRAFFIC_CHECK) || mType.equals( +// TANLU_ROAD_CLOSURE +// ) +// || mType.equals(TANLU_ROAD_CURRENT) || mType.equals(TANLU_ROAD_PONDING) || mType.equals( +// TANLU_ROAD_ICING +// ) +// || mType.equals(TANLU_ROAD_HEAVY_FOG) || mType.equals(TANLU_ROAD_ACCIDENT) || mType.equals( +// TANLU_ROAD_WORK +// ) +// ) { taskAsync(1_500) { try { // VoiceController.speakVoice("上报失败") @@ -192,7 +192,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { mLatitude ); } - } +// } } //拍照成功回调返回图片本地路径 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 290bbba5d7..fc11da05b0 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 @@ -79,22 +79,22 @@ class CosStatusController : CosStatusCallback { Log.d(TAG, "uploadCosFailed = $localPath") trackUploadCos(2) //语音播报 1：上报路况，2：交通检查，3：封路 默认 mType 应该为null - if (CarCorderController.mType.equals(TANLU_ROAD_CONGESTION) || CarCorderController.mType.equals( - TANLU_TRAFFIC_CHECK - ) || CarCorderController.mType.equals(TANLU_ROAD_CLOSURE) - || CarCorderController.mType.equals(TANLU_ROAD_CURRENT) || CarCorderController.mType.equals( - TANLU_ROAD_PONDING - ) || CarCorderController.mType.equals(TANLU_ROAD_ICING) - || CarCorderController.mType.equals(TANLU_ROAD_HEAVY_FOG) || CarCorderController.mType.equals( - TANLU_ROAD_ACCIDENT - ) || CarCorderController.mType.equals(TANLU_ROAD_WORK) - ) { +// if (CarCorderController.mType.equals(TANLU_ROAD_CONGESTION) || CarCorderController.mType.equals( +// TANLU_TRAFFIC_CHECK +// ) || CarCorderController.mType.equals(TANLU_ROAD_CLOSURE) +// || CarCorderController.mType.equals(TANLU_ROAD_CURRENT) || CarCorderController.mType.equals( +// TANLU_ROAD_PONDING +// ) || CarCorderController.mType.equals(TANLU_ROAD_ICING) +// || CarCorderController.mType.equals(TANLU_ROAD_HEAVY_FOG) || CarCorderController.mType.equals( +// TANLU_ROAD_ACCIDENT +// ) || CarCorderController.mType.equals(TANLU_ROAD_WORK) +// ) { // VoiceController.speakVoice("cos上报失败") Log.d(TAG, "uploadCosFailed mType = $mType") if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { sendGetInfoFailedReceiver("100") } - } +// } if (!isRetry) { isRetry = true diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 7e734f6140..58020431ef 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -93,10 +93,10 @@ class MainService : Service() { mLongitude = it.lon mLatitude = it.lat Log.d(TAG, "onStartCommand shareType = $shareType --fromType = $fromType --mainInfoId = $mainInfoId -- mLongitude = $mLongitude --mLatitude = $mLatitude --it.duration = ${it.duration} ") - if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT - || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG - || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK - ) { +// if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT +// || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG +// || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK +// ) { // takePhoto(1, false, true) if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) { // 如果是策略上报，isCustom = false @@ -104,7 +104,7 @@ class MainService : Service() { } else { takeVideo(it.duration, isCustom = true, id = id) } - } +// } } } else { Log.e(TAG, "intent == null ") diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt index 0ff0380ca3..275a0e1b1a 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt @@ -39,6 +39,11 @@ class GridBtnManager(val context: Context, private val container: GridLayout, pr } else { GlideApp.with(context).load(button.iconRes).placeholder(button.iconRes).error(button.iconRes).into(img) } +// if (button.iconUrl.isNotEmpty()) { +// GlideApp.with(context).load(button.iconUrl).into(img) +// } else { +// GlideApp.with(context).load(button.iconRes).into(img) +// } content.text = button.title view.setOnClickListener { btnClickListener?.invoke(button) diff --git a/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml b/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml index 8ae0f36968..05cbfa82f4 100644 --- a/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml +++ b/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml @@ -28,7 +28,10 @@ android:id="@+id/tvShareContent" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="上报拥堵" + android:text="上报拥堵上报拥堵上报拥堵上报拥堵" + android:maxEms="4" + android:singleLine="true" + android:ellipsize="end" android:textColor="@color/module_share_dialog_icon_text_color" android:textSize="@dimen/share_module_item" android:textStyle="bold" /> From 2ebc57430985493504b5f844f9809149c425e35f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Sep 2020 17:51:16 +0800 Subject: [PATCH 3/3] changed the mark point name --- .idea/misc.xml | 2 +- .../src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt index c5b94fcb41..4b2d52a97a 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt @@ -7,7 +7,7 @@ import com.mogo.service.analytics.IMogoAnalytics object AnalyticsUtil { - const val INVOKE_TRACK_PLAY_PASS_ID = "v2x_play_pass" + const val INVOKE_TRACK_PLAY_PASS_ID = "mogu_play_pass" const val INVOKE_TRACK_PASS_TIME = "pass_time" const val INVOKE_TRACK_PLAY_TIME = "play_time"