Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev

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
                 );
             }
-        }
+//        }
     }
 
     //拍照成功回调返回图片本地路径

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

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 ")

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
         );
     }
 

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)

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" />