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-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/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" /> diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_default_black_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_default_black_logo.png new file mode 100644 index 0000000000..5480b6d165 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_default_black_logo.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_default_black_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_default_black_logo.png new file mode 100644 index 0000000000..5480b6d165 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_default_black_logo.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_default_black_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_default_black_logo.png new file mode 100644 index 0000000000..e02a57044f Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_default_black_logo.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_default_black_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_default_black_logo.png new file mode 100644 index 0000000000..e02a57044f Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_default_black_logo.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_navi_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi.png rename to skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_navi_light.png diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_normal_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_normal_image_light.png new file mode 100644 index 0000000000..8cad619232 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_normal_image_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi_light.png new file mode 100644 index 0000000000..1e635c539a Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_normal_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_normal_image_light.png new file mode 100644 index 0000000000..8cad619232 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_normal_image_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_navi_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi.png rename to skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_navi_light.png diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_normal_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_normal_image_light.png new file mode 100644 index 0000000000..8cad619232 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_normal_image_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi_light.png new file mode 100644 index 0000000000..564236aaba Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_normal_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_normal_image_light.png new file mode 100644 index 0000000000..8cad619232 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_normal_image_light.png differ