diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 6c9165e94e..613fb2d050 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -10,6 +10,7 @@ import com.mogo.och.bus.bean.BusRoutesResult; import com.mogo.och.bus.constant.BusConst; import com.mogo.och.bus.model.OrderModel; import com.mogo.och.common.module.biz.constant.LoginStatusManager; +import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager; import com.zhidao.socket.utils.LoginStatusUtil; import java.util.concurrent.TimeUnit; @@ -72,30 +73,36 @@ public class BusTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹开始下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地无对应轨迹", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地有对应轨迹，认为成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载超时", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 再次发起下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); syncTrajectoryInfo(); } } @@ -186,7 +193,7 @@ public class BusTrajectoryManager { CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } - + OchChainLogManager.writeChainLog("轨迹监控","sendTrajectoryReq() 下发轨迹 轨迹id"+mAutoPilotLine.getLineId(), true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt index 42090c2136..321647a639 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.biz.constant.LoginStatusManager +import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager import com.mogo.och.common.module.utils.SoundPoolHelper import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -63,11 +64,13 @@ object CharterTrajectoryManager { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹开始下载") // ToastUtils.showShort("轨迹开始下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹开始下载", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) stopTrajReqLoop() } else if ("ISYS_INIT_TRAJECTORY_SUCCESS" == guardianInfo.code) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载成功") // ToastUtils.showShort("轨迹下载成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载成功", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) stopTrajReqLoop() } else if ("ISYS_INIT_TRAJECTORY_FAILURE" == guardianInfo.code) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 @@ -75,6 +78,7 @@ object CharterTrajectoryManager { SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹" ) + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地无对应轨迹", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING" == guardianInfo.code) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 @@ -82,14 +86,17 @@ object CharterTrajectoryManager { SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功" ) + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地有对应轨迹，认为成功", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT" == guardianInfo.code) { // 5. 轨迹管理_轨迹下载超时 d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载超时") + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载超时", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) // ToastUtils.showShort("轨迹下载超时"); } else if ("EMAP_ATTITUDE_INIT_FAILED" == guardianInfo.getCode()) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载") + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 当前位置距离轨迹距离大于15m", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) get().getBusOrderResult()?.lineId?.let { syncTrajectoryInfo(it, get().getBusOrderResult()?.lineName!!) @@ -219,6 +226,13 @@ object CharterTrajectoryManager { // mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f"); // mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00 // mAutoPilotLine.setVehicleModel("红旗H9"); + mAutoPilotLine?.let { + OchChainLogManager.writeChainLog("轨迹监控", "sendTrajectoryReq() 下发轨迹 轨迹id" + it.lineId, + true, + OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY + ) + } + sendTrajectoryDownloadReq(mAutoPilotLine!!) d( SceneConstant.M_CHARTER_D + TAG, diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt index c97dd21a46..6dd342e160 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt @@ -16,6 +16,7 @@ object OchChainLogManager { private val TAG = OchChainLogManager::class.java.simpleName const val EVENT_KEY_INFE_WITH_CHANGE = "event_key_och_common_info_and_changeinfo" + const val EVENT_KEY_INFE_WITH_TRAJECTORY = "event_key_och_trajectory_info" /** * @param Info 订单详细信息 @@ -27,7 +28,8 @@ object OchChainLogManager { nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE, paramIndexes = [0,1] ) - fun writeChainLog(Info: String, changeInfo: String,upload:Boolean = true) { + @JvmStatic + fun writeChainLog(Info: String, changeInfo: String,upload:Boolean = true,eventID:String=EVENT_KEY_INFE_WITH_CHANGE) { try { d(SceneConstant.M_OCHCOMMON + TAG, Info) d(SceneConstant.M_OCHCOMMON + TAG, changeInfo) @@ -40,17 +42,10 @@ object OchChainLogManager { params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) params["info"] = Info params["changeInfo"] = changeInfo - MogoAnalyticUtils.track(EVENT_KEY_INFE_WITH_CHANGE, params) + MogoAnalyticUtils.track(eventID, params) } }catch (e:Exception){ - val plateNum = AppConfigInfo.plateNumber - val params = HashMap() - params["sn"] = MoGoAiCloudClientConfig.getInstance().sn - params["env"] = DebugConfig.getNetMode() - params["plate_number"] = if (TextUtils.isEmpty(plateNum)) "" else plateNum - params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) - params["exception"] = e.toString() - MogoAnalyticUtils.track(EVENT_KEY_INFE_WITH_CHANGE, params) + e.printStackTrace() } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index 043f3bb475..d49a3f7a34 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -78,6 +78,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void setVoiceIsMute(boolean isPlay) { ThreadUtils.getSinglePool().execute(() -> { if (mAMapNavi == null) return; + CallerLogger.i(TAG, "setVoiceIsMute()--"+isPlay); this.isPlay = isPlay; if (isPlay) { mAMapNavi.startSpeak(); diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt index 10c8f99f56..e3c3144fc9 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt @@ -35,7 +35,7 @@ class ZhiView @JvmOverloads constructor( const val TAG = "ZhiView" } - private var currentAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 20,this) + private var currentAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 12,this) @Volatile private var status = ZhiRecordWinUi.RecordStatus.STATUS_SILENCE diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_00.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_00.webp deleted file mode 100644 index 59736772d9..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_00.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_01.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_01.webp deleted file mode 100644 index 3b6a5b7842..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_01.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_02.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_02.webp deleted file mode 100644 index 8d3f711e2d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_02.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_03.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_03.webp deleted file mode 100644 index 495e958dfb..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_03.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_04.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_04.webp deleted file mode 100644 index 4207e95be5..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_04.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_05.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_05.webp deleted file mode 100644 index 8d2a9a1120..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_05.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_06.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_06.webp deleted file mode 100644 index b9ba4ec7fe..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_06.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_07.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_07.webp deleted file mode 100644 index 95fa5cf251..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_07.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_08.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_08.webp deleted file mode 100644 index 99044e15f1..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_08.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_09.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_09.webp deleted file mode 100644 index a7d1729386..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_09.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_10.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_10.webp deleted file mode 100644 index e6c5bd1fc6..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_10.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_11.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_11.webp deleted file mode 100644 index 6b3bbaa6d1..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_11.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_12.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_12.webp deleted file mode 100644 index 4ae1887841..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_12.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_13.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_13.webp deleted file mode 100644 index 51ad32bee3..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_13.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_14.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_14.webp deleted file mode 100644 index c7792e61f1..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_14.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_15.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_15.webp deleted file mode 100644 index 85bad67894..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_15.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_16.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_16.webp deleted file mode 100644 index 11c592c273..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_16.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_17.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_17.webp deleted file mode 100644 index 95544019e8..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_17.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_18.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_18.webp deleted file mode 100644 index 2b885a14b7..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_18.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_19.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_19.webp deleted file mode 100644 index 3469bf2478..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_19.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_20.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_20.webp deleted file mode 100644 index c2f7d5a4a2..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_20.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_21.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_21.webp deleted file mode 100644 index 65f189690c..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_21.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_22.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_22.webp deleted file mode 100644 index d44939270a..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_22.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_23.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_23.webp deleted file mode 100644 index fe419028d4..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_23.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_24.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_24.webp deleted file mode 100644 index 3270c5821f..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_24.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_25.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_25.webp deleted file mode 100644 index 5f4994c754..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_25.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_26.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_26.webp deleted file mode 100644 index 54416a4074..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_26.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_27.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_27.webp deleted file mode 100644 index bbb6ea0e9c..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_27.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_28.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_28.webp deleted file mode 100644 index 3ce4ee4fdb..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_28.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_29.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_29.webp deleted file mode 100644 index e2bd5f4d53..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_29.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_30.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_30.webp deleted file mode 100644 index 974bf4220b..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_30.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_31.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_31.webp deleted file mode 100644 index 1abaa76470..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_31.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_32.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_32.webp deleted file mode 100644 index fcf2731522..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_32.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_33.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_33.webp deleted file mode 100644 index b19471408e..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_33.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_34.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_34.webp deleted file mode 100644 index 1f7713a093..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_34.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_35.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_35.webp deleted file mode 100644 index 81cb5afbd3..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_35.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_36.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_36.webp deleted file mode 100644 index 418c6ef9ff..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_36.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_37.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_37.webp deleted file mode 100644 index fc392eab69..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_37.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_38.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_38.webp deleted file mode 100644 index 40b3c23b14..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_38.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_39.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_39.webp deleted file mode 100644 index ea6cca0bd5..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_39.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_40.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_40.webp deleted file mode 100644 index 131f994fc6..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_40.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_41.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_41.webp deleted file mode 100644 index b55ac88773..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_41.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_42.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_42.webp deleted file mode 100644 index 4e2c17b954..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_42.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_43.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_43.webp deleted file mode 100644 index c632e6ce0d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_43.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_44.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_44.webp deleted file mode 100644 index fc98ef6513..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_44.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_45.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_45.webp deleted file mode 100644 index 81bf8998f2..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_45.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_46.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_46.webp deleted file mode 100644 index 5765c4c053..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_46.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_47.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_47.webp deleted file mode 100644 index 7aec6022bd..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_47.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_48.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_48.webp deleted file mode 100644 index f1de312084..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_48.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_49.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_49.webp deleted file mode 100644 index c699556317..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_49.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_50.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_50.webp deleted file mode 100644 index 4217782cd7..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_50.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_51.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_51.webp deleted file mode 100644 index b0f0755168..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_51.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_52.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_52.webp deleted file mode 100644 index 8ec255126d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_52.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_53.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_53.webp deleted file mode 100644 index c07fc56bc5..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_53.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_54.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_54.webp deleted file mode 100644 index 7b32e3b69d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_54.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_55.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_55.webp deleted file mode 100644 index 8c57531000..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_55.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_56.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_56.webp deleted file mode 100644 index 617a637c48..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_56.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_57.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_57.webp deleted file mode 100644 index 9939227685..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_57.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_58.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_58.webp deleted file mode 100644 index d8537918f8..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_58.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_59.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_59.webp deleted file mode 100644 index 93eadcf531..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_59.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_60.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_60.webp deleted file mode 100644 index abe3e84f8a..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_60.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_61.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_61.webp deleted file mode 100644 index 382fe141df..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_61.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_62.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_62.webp deleted file mode 100644 index dff5c24b55..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_62.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_63.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_63.webp deleted file mode 100644 index 729d3efb66..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_63.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_64.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_64.webp deleted file mode 100644 index f0d689b069..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_64.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_65.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_65.webp deleted file mode 100644 index e035435642..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_65.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_66.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_66.webp deleted file mode 100644 index 746500b7ff..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_66.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_67.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_67.webp deleted file mode 100644 index 6352900bca..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_67.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_68.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_68.webp deleted file mode 100644 index 46caa69376..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_68.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_69.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_69.webp deleted file mode 100644 index cd446ce528..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_69.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_70.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_70.webp deleted file mode 100644 index f3e431ec10..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_70.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_71.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_71.webp deleted file mode 100644 index 0a27b49156..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_71.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_72.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_72.webp deleted file mode 100644 index 9389f192b7..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_72.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png new file mode 100755 index 0000000000..9b650832f5 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png new file mode 100755 index 0000000000..b0ee512905 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png new file mode 100755 index 0000000000..1a9eb17d7b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png new file mode 100755 index 0000000000..fff8ab5426 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png new file mode 100755 index 0000000000..abcbefb4b8 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png new file mode 100755 index 0000000000..71df42d412 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png new file mode 100755 index 0000000000..343b71eec6 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png new file mode 100755 index 0000000000..29176c77df Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png new file mode 100755 index 0000000000..3514be34ca Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png new file mode 100755 index 0000000000..682106744b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png new file mode 100755 index 0000000000..f7b1e97c68 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png new file mode 100755 index 0000000000..b600b5cb22 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png new file mode 100755 index 0000000000..d0aaf2c048 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png new file mode 100755 index 0000000000..9deb781f58 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png new file mode 100755 index 0000000000..5462f1f23b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png new file mode 100755 index 0000000000..7d5ffaabe6 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png new file mode 100755 index 0000000000..fb6223e409 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png new file mode 100755 index 0000000000..f792bf1c8a Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png new file mode 100755 index 0000000000..40d56375b0 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png new file mode 100755 index 0000000000..e8bb611925 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png new file mode 100755 index 0000000000..e156eba37b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png new file mode 100755 index 0000000000..22c35f5ef1 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png new file mode 100755 index 0000000000..900175fabe Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png new file mode 100755 index 0000000000..5d4fd47206 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png new file mode 100755 index 0000000000..1df483903e Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png new file mode 100755 index 0000000000..d7f7cd582e Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png new file mode 100755 index 0000000000..a03d3394e8 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png new file mode 100755 index 0000000000..89951cede7 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png new file mode 100755 index 0000000000..81f57d6e8f Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png new file mode 100755 index 0000000000..f3d65a3200 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png new file mode 100755 index 0000000000..460282761d Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png new file mode 100755 index 0000000000..e904ca5758 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png new file mode 100755 index 0000000000..32137993a4 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png new file mode 100755 index 0000000000..8c86c2a258 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png new file mode 100755 index 0000000000..f0d3f7a397 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png new file mode 100755 index 0000000000..9790e6f5d3 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png new file mode 100755 index 0000000000..c92762de1c Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png new file mode 100755 index 0000000000..af636e8370 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png new file mode 100755 index 0000000000..aa16a04e0f Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png new file mode 100755 index 0000000000..016e72d885 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png new file mode 100755 index 0000000000..9a91fd152f Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png new file mode 100755 index 0000000000..1d763f2794 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png new file mode 100755 index 0000000000..c1627112c3 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png new file mode 100755 index 0000000000..dc0db5e9b2 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png new file mode 100755 index 0000000000..68b2f80893 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png new file mode 100755 index 0000000000..a623e4c7aa Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png new file mode 100755 index 0000000000..1ba58a00de Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png new file mode 100755 index 0000000000..af0d9e1a50 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png new file mode 100755 index 0000000000..9b650832f5 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/values/arrays.xml b/OCH/mogo-och-common-module/src/main/res/values/arrays.xml index bf2ee6d379..07e7450afa 100644 --- a/OCH/mogo-och-common-module/src/main/res/values/arrays.xml +++ b/OCH/mogo-och-common-module/src/main/res/values/arrays.xml @@ -1,79 +1,55 @@ - @drawable/charter_p_xiaozhi_normal_00 - @drawable/charter_p_xiaozhi_normal_01 - @drawable/charter_p_xiaozhi_normal_02 - @drawable/charter_p_xiaozhi_normal_03 - @drawable/charter_p_xiaozhi_normal_04 - @drawable/charter_p_xiaozhi_normal_05 - @drawable/charter_p_xiaozhi_normal_06 - @drawable/charter_p_xiaozhi_normal_07 - @drawable/charter_p_xiaozhi_normal_08 - @drawable/charter_p_xiaozhi_normal_09 - @drawable/charter_p_xiaozhi_normal_10 - @drawable/charter_p_xiaozhi_normal_11 - @drawable/charter_p_xiaozhi_normal_12 - @drawable/charter_p_xiaozhi_normal_13 - @drawable/charter_p_xiaozhi_normal_14 - @drawable/charter_p_xiaozhi_normal_15 - @drawable/charter_p_xiaozhi_normal_16 - @drawable/charter_p_xiaozhi_normal_17 - @drawable/charter_p_xiaozhi_normal_18 - @drawable/charter_p_xiaozhi_normal_19 - @drawable/charter_p_xiaozhi_normal_20 - @drawable/charter_p_xiaozhi_normal_21 - @drawable/charter_p_xiaozhi_normal_22 - @drawable/charter_p_xiaozhi_normal_23 - @drawable/charter_p_xiaozhi_normal_24 - @drawable/charter_p_xiaozhi_normal_25 - @drawable/charter_p_xiaozhi_normal_26 - @drawable/charter_p_xiaozhi_normal_27 - @drawable/charter_p_xiaozhi_normal_28 - @drawable/charter_p_xiaozhi_normal_29 - @drawable/charter_p_xiaozhi_normal_30 - @drawable/charter_p_xiaozhi_normal_31 - @drawable/charter_p_xiaozhi_normal_32 - @drawable/charter_p_xiaozhi_normal_33 - @drawable/charter_p_xiaozhi_normal_34 - @drawable/charter_p_xiaozhi_normal_35 - @drawable/charter_p_xiaozhi_normal_36 - @drawable/charter_p_xiaozhi_normal_37 - @drawable/charter_p_xiaozhi_normal_38 - @drawable/charter_p_xiaozhi_normal_39 - @drawable/charter_p_xiaozhi_normal_40 - @drawable/charter_p_xiaozhi_normal_41 - @drawable/charter_p_xiaozhi_normal_42 - @drawable/charter_p_xiaozhi_normal_43 - @drawable/charter_p_xiaozhi_normal_44 - @drawable/charter_p_xiaozhi_normal_45 - @drawable/charter_p_xiaozhi_normal_46 - @drawable/charter_p_xiaozhi_normal_47 - @drawable/charter_p_xiaozhi_normal_48 - @drawable/charter_p_xiaozhi_normal_49 - @drawable/charter_p_xiaozhi_normal_50 - @drawable/charter_p_xiaozhi_normal_51 - @drawable/charter_p_xiaozhi_normal_52 - @drawable/charter_p_xiaozhi_normal_53 - @drawable/charter_p_xiaozhi_normal_54 - @drawable/charter_p_xiaozhi_normal_55 - @drawable/charter_p_xiaozhi_normal_56 - @drawable/charter_p_xiaozhi_normal_57 - @drawable/charter_p_xiaozhi_normal_58 - @drawable/charter_p_xiaozhi_normal_59 - @drawable/charter_p_xiaozhi_normal_60 - @drawable/charter_p_xiaozhi_normal_61 - @drawable/charter_p_xiaozhi_normal_62 - @drawable/charter_p_xiaozhi_normal_63 - @drawable/charter_p_xiaozhi_normal_64 - @drawable/charter_p_xiaozhi_normal_65 - @drawable/charter_p_xiaozhi_normal_66 - @drawable/charter_p_xiaozhi_normal_67 - @drawable/charter_p_xiaozhi_normal_68 - @drawable/charter_p_xiaozhi_normal_69 - @drawable/charter_p_xiaozhi_normal_70 - @drawable/charter_p_xiaozhi_normal_71 - @drawable/charter_p_xiaozhi_normal_72 + @drawable/xiaozhi_normal_0000 + @drawable/xiaozhi_normal_0001 + @drawable/xiaozhi_normal_0002 + @drawable/xiaozhi_normal_0003 + @drawable/xiaozhi_normal_0004 + @drawable/xiaozhi_normal_0005 + @drawable/xiaozhi_normal_0006 + @drawable/xiaozhi_normal_0007 + @drawable/xiaozhi_normal_0008 + @drawable/xiaozhi_normal_0009 + @drawable/xiaozhi_normal_0010 + @drawable/xiaozhi_normal_0011 + @drawable/xiaozhi_normal_0012 + @drawable/xiaozhi_normal_0013 + @drawable/xiaozhi_normal_0014 + @drawable/xiaozhi_normal_0015 + @drawable/xiaozhi_normal_0016 + @drawable/xiaozhi_normal_0017 + @drawable/xiaozhi_normal_0018 + @drawable/xiaozhi_normal_0019 + @drawable/xiaozhi_normal_0020 + @drawable/xiaozhi_normal_0021 + @drawable/xiaozhi_normal_0022 + @drawable/xiaozhi_normal_0023 + @drawable/xiaozhi_normal_0024 + @drawable/xiaozhi_normal_0025 + @drawable/xiaozhi_normal_0026 + @drawable/xiaozhi_normal_0027 + @drawable/xiaozhi_normal_0028 + @drawable/xiaozhi_normal_0029 + @drawable/xiaozhi_normal_0030 + @drawable/xiaozhi_normal_0031 + @drawable/xiaozhi_normal_0032 + @drawable/xiaozhi_normal_0033 + @drawable/xiaozhi_normal_0034 + @drawable/xiaozhi_normal_0035 + @drawable/xiaozhi_normal_0036 + @drawable/xiaozhi_normal_0037 + @drawable/xiaozhi_normal_0038 + @drawable/xiaozhi_normal_0039 + @drawable/xiaozhi_normal_0040 + @drawable/xiaozhi_normal_0041 + @drawable/xiaozhi_normal_0042 + @drawable/xiaozhi_normal_0043 + @drawable/xiaozhi_normal_0044 + @drawable/xiaozhi_normal_0045 + @drawable/xiaozhi_normal_0046 + @drawable/xiaozhi_normal_0047 + @drawable/xiaozhi_normal_0048 diff --git a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index 97df6692c2..d914d4a1b7 100644 --- a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateTransform import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager +import com.mogo.och.common.module.utils.DateTimeUtil import com.zhidao.thirdlogin.utils.Aes import org.junit.Assert.* import org.junit.Test @@ -27,6 +28,16 @@ class ExampleUnitTest { val encrypt: String = Aes.encrypt(json, KEY, IVS, "UTF-8") println(encrypt) } + @Test + fun testData() { + for(time in 0 until 7200){ + val second2Time = DateTimeUtil.second2Time(time.toLong()) + + val listSplit = second2Time.split(":") + + println("${listSplit[0]}时:${listSplit[1]}分") + } + } @Test fun resetDataOnlyOne(){ diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 13bf62b158..19e5310c91 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -6,6 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; +import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager; import com.mogo.och.data.bean.BusRoutesResult; import com.mogo.och.bus.constant.BusConst; import com.mogo.och.bus.model.OrderModel; @@ -71,30 +72,36 @@ public class BusTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹开始下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地无对应轨迹", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地有对应轨迹，认为成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载超时", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 再次发起下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); syncTrajectoryInfo(); } } @@ -185,7 +192,7 @@ public class BusTrajectoryManager { CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } - + OchChainLogManager.writeChainLog("轨迹监控","sendTrajectoryReq() 下发轨迹 轨迹id"+mAutoPilotLine.getLineId(), true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml index c1a974d194..54c8669265 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml @@ -141,7 +141,7 @@ android:id="@+id/zv_msg_pop_bottom" android:layout_width="@dimen/dp_240" android:layout_height="@dimen/dp_240" - android:src="@drawable/charter_p_xiaozhi_normal_00" + android:src="@drawable/xiaozhi_normal_0000" android:layout_marginBottom="-70dp" app:layout_constraintBottom_toTopOf="@+id/video_fragment" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index 18ae00b5df..a2beb5cfec 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -6,6 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; +import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager; import com.mogo.och.taxi.bean.OrderQueryRespBean; import com.mogo.och.taxi.constant.TaxiConst; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; @@ -74,30 +75,36 @@ public class TaxiTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹开始下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地无对应轨迹", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地有对应轨迹，认为成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载超时", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 再次发起下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); syncTrajectoryInfo(); } } @@ -186,7 +193,7 @@ public class TaxiTrajectoryManager { CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } - + OchChainLogManager.writeChainLog("轨迹监控","sendTrajectoryReq() 下发轨迹 轨迹id"+mAutoPilotLine.getLineId(), true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); CallerLogger.d(M_TAXI + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index a56f90b4ab..c4c8e3cb1c 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -84,10 +84,10 @@ class TaxiPassengerBaseFragment() : presenter?.setItineraryVisibility() ck_setting.visibility = View.VISIBLE if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) { - romaPView.visibility = View.VISIBLE + romaPView.updateVisible(true) romaDistanceView.visibility = View.VISIBLE } else { - romaPView.visibility = View.GONE + romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE } rv_location_center.visibility = View.VISIBLE @@ -101,7 +101,7 @@ class TaxiPassengerBaseFragment() : mapBizView.visibility = View.GONE presenter?.setItineraryVisibility() ck_setting.visibility = View.VISIBLE - romaPView.visibility = View.GONE + romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rv_location_center.visibility = View.VISIBLE pcnActionView.visibility = View.VISIBLE @@ -115,7 +115,7 @@ class TaxiPassengerBaseFragment() : presenter?.setItineraryVisibility() ck_setting.visibility = View.GONE ck_setting.isChecked = false - romaPView.visibility = View.GONE + romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rv_location_center.visibility = View.GONE pcnActionView.visibility = View.GONE diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index b1cd265813..f86355c8b9 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -65,7 +65,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { OverlayViewUtils.dismissOverlayView(this) } - taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 20,iv_xiaozhi_belt) + taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 48,iv_xiaozhi_belt) taxiPxiaozhiLove?.setOnAnimStopListener(object :FrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt index ba7274a282..a7f4aff444 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt @@ -11,12 +11,16 @@ import android.view.View import android.widget.RelativeLayout import android.widget.TextView import com.mogo.commons.voice.AIAssist +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.utils.FrameAnimatorContainer import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonValueCallback +import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView +import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.iv_zhi_normal import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_count import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_end import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_start @@ -60,6 +64,8 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener { private val numSelect = arrayOfNulls(4) private val numSelectTextView = arrayOfNulls(4) + private var taxiPxiaozhiCheck: FrameAnimatorContainer?=null + private fun initView(context: Context) { d(SceneConstant.M_TAXI_P + TAG, "initView") LayoutInflater.from(context).inflate(R.layout.taxi_p_passenger_check_panel, this, true) @@ -68,6 +74,23 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener { numSelectTextView[1] = tv_taxi_passenger_number_second numSelectTextView[2] = tv_taxi_passenger_number_third numSelectTextView[3] = tv_taxi_passenger_number_fourth + + taxiPxiaozhiCheck = FrameAnimatorContainer(R.array.xiaozhi_normal, 12,iv_zhi_normal) + taxiPxiaozhiCheck?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + CallerLogger.d(SceneConstant.M_TAXI_P + ArrivedView.TAG, "动画暂停") + } + }) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + taxiPxiaozhiCheck?.start() + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + taxiPxiaozhiCheck?.stop() } private fun keyBoardLogic() { diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index 75898fbfb0..89b9c51489 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -92,7 +92,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") } }) - taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 15, iv_xiaozhi_belt) + taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 24, iv_xiaozhi_belt) taxiPXiaozhiBelt?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener { override fun AnimationStopped() { diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png index df003922ad..59cdbafe53 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png index a377c9fa22..a2efcd5479 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png index 6b3c113399..f21e4908d8 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png index 85007f7bf5..795ec65151 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png index 48b1275205..c7d6d77d41 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png index 976996147a..77a4aeeaad 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png index 8b8b34b1d9..b3ca7beeb2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png index 93a8766cb0..9836200d64 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png index b099132acc..4b9f5e7ea9 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png index 07c4391aad..e0870a2a30 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png index bf1890980e..b267279bc2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png index 7c92f9092a..a4284e2dd0 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png index 4492a095d8..6d816c4faa 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png index ad2c2d5491..0a8ea33df6 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png index 0d982f3806..8866597ef7 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png index fc97c2dd42..51f06b09aa 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png index c0203d8e49..bf46af12b2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png index 9b140ae8dc..77c8255d71 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png index bb936b738a..9a57e37bfc 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png index 89726692a1..dede5a4856 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png index 4aa0ba307d..a0ea531950 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png index cede039453..f4b15b6661 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png index 379641c7d0..b1f2067c24 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png index c7ca4be6e7..9c279818ec 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png index 94ba1a3577..3e28efd6cd 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png index 41521743ea..a7f8bf86ea 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png index 63584b72af..7b51471ac9 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png index 49555422b0..1f3e439184 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png index 63fb714d40..5b90ae5f30 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png index 5abe8a6ebb..6d00d8830c 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png index 124e72733f..32df235f4b 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png index e48f57fdc0..17038d1417 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png index bf2436db6f..f6b562b266 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png index ca84961ca3..77c017b63d 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png index e6b47d3107..78f31890d7 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png index 25286cba05..7b10b0e4bf 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png index 30b7996676..b7544a69f2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png index 0ffdaf7820..60a883256c 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png index bdf5ce5f1f..bf9b431711 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png index adbf77522f..c7339d4ca4 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png index 1d30b1e3e3..18c4a23f80 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png index d5edec929e..53d4fe40ee 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png index 5fe8371d2d..daac0b3e83 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png index ad3bcbad5d..c56f4b2183 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png index 7d07ff5571..dabe1119d0 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png index 2d3747ed6c..493df9d1b3 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png index 1ee3cbd54c..f8a2b4379e 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png index 5f69e5ac69..4b3a022ebc 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png index cda6024b03..59cdbafe53 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_049.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_049.png deleted file mode 100755 index b983e8e0f1..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_049.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_050.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_050.png deleted file mode 100755 index 93ba6fbe9a..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_050.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_051.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_051.png deleted file mode 100755 index 5623db4587..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_051.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_052.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_052.png deleted file mode 100755 index 34560dd9d2..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_052.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_053.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_053.png deleted file mode 100755 index f689722fcd..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_053.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_054.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_054.png deleted file mode 100755 index 6cf43054fc..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_054.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_055.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_055.png deleted file mode 100755 index 9e9ff1ae67..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_055.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_056.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_056.png deleted file mode 100755 index d5864d255f..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_056.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_057.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_057.png deleted file mode 100755 index 14c3e2d00e..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_057.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_058.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_058.png deleted file mode 100755 index 704667b20d..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_058.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_059.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_059.png deleted file mode 100755 index 5f01473637..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_059.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_060.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_060.png deleted file mode 100644 index 2c0e9e91e3..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_060.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_061.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_061.png deleted file mode 100644 index a90b91a899..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_061.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_062.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_062.png deleted file mode 100644 index 4f0eece63d..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_062.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_063.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_063.png deleted file mode 100644 index fa48df388b..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_063.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_064.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_064.png deleted file mode 100644 index b92191b853..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_064.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_065.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_065.png deleted file mode 100644 index c00bf40018..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_065.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_066.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_066.png deleted file mode 100644 index 28f7b191d4..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_066.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_067.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_067.png deleted file mode 100644 index e8ab94541a..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_067.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_068.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_068.png deleted file mode 100644 index 8f905f5196..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_068.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_069.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_069.png deleted file mode 100644 index a190a62959..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_069.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_070.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_070.png deleted file mode 100644 index d33b1e83e5..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_070.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_071.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_071.png deleted file mode 100644 index dff7f32927..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_071.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_072.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_072.png deleted file mode 100644 index da70b6071c..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_072.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index 45255a8308..61475df24a 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -159,7 +159,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_50" app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal" - android:layout_marginBottom="-50dp" + android:layout_marginBottom="-80dp" app:layout_constraintEnd_toEndOf="parent" /> + android:layout_width="@dimen/dp_360" + android:layout_height="@dimen/dp_360"/> diff --git a/OCH/taxi/passenger/src/main/res/values/arrays.xml b/OCH/taxi/passenger/src/main/res/values/arrays.xml index 2d5f5a2d76..d17614ba84 100644 --- a/OCH/taxi/passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/passenger/src/main/res/values/arrays.xml @@ -223,33 +223,6 @@ @drawable/xiaozhi_belt_046 @drawable/xiaozhi_belt_047 @drawable/xiaozhi_belt_048 - @drawable/xiaozhi_belt_049 - - @drawable/xiaozhi_belt_050 - @drawable/xiaozhi_belt_051 - @drawable/xiaozhi_belt_052 - @drawable/xiaozhi_belt_053 - @drawable/xiaozhi_belt_054 - @drawable/xiaozhi_belt_055 - @drawable/xiaozhi_belt_056 - @drawable/xiaozhi_belt_057 - @drawable/xiaozhi_belt_058 - @drawable/xiaozhi_belt_059 - - @drawable/xiaozhi_belt_060 - @drawable/xiaozhi_belt_061 - @drawable/xiaozhi_belt_062 - @drawable/xiaozhi_belt_063 - @drawable/xiaozhi_belt_064 - @drawable/xiaozhi_belt_065 - @drawable/xiaozhi_belt_066 - @drawable/xiaozhi_belt_067 - @drawable/xiaozhi_belt_068 - @drawable/xiaozhi_belt_069 - - @drawable/xiaozhi_belt_070 - @drawable/xiaozhi_belt_071 - @drawable/xiaozhi_belt_072 \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDataViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDataViewModel.kt index ac0bb3b657..48f01d9bca 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDataViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDataViewModel.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.biz.network.OchCommonServiceCallback +import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager import com.mogo.och.taxi.R import com.mogo.och.taxi.base.BaseViewModel import com.mogo.och.taxi.base.IUiIntent @@ -90,7 +91,9 @@ class TaxiOperationalDataViewModel : BaseViewModel{ override fun onSuccess(data: QueryServingDurationRespBean) { //服务时长返回 秒 - CallerLogger.d(TAG, "queryServingDuration" + GsonUtils.toJson(data)) + val toJson = GsonUtils.toJson(data) + CallerLogger.d(TAG, "queryServingDuration$toJson") + OchChainLogManager.writeChainLog("今日服务时长",toJson) sendUiState { copy( operationalDataUIState = diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index 98a14737f1..7c92f57c11 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; +import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager; import com.mogo.och.taxi.bean.OrderDetail; import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean; import com.mogo.och.taxi.bean.TrajectoryListRespBean; @@ -93,26 +94,31 @@ public class TaxiTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹开始下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地无对应轨迹", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地有对应轨迹，认为成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); + OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载超时", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); // ToastUtils.showShort("轨迹下载超时"); } } @@ -281,6 +287,7 @@ public class TaxiTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine != null) { DebugView.Companion.printInfoMsg("[下发轨迹] sendTrajectoryDownloadReq, lindId=" + mAutoPilotLine.getLineId() + ", lineName=" + mAutoPilotLine.getLineName()); + OchChainLogManager.writeChainLog("轨迹监控","sendTrajectoryReq() 下发轨迹 轨迹id"+mAutoPilotLine.getLineId(), true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY); CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine,COMMON_LOADING); }else { CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 152d2ae6a7..f746767108 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -94,10 +94,10 @@ class TaxiPassengerBaseFragment() : presenter?.setItineraryVisibility() ck_setting.visibility = View.VISIBLE if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) { - romaPView.visibility = View.VISIBLE + romaPView.updateVisible(true) romaDistanceView.visibility = View.VISIBLE } else { - romaPView.visibility = View.GONE + romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE } rv_location_center.visibility = View.VISIBLE @@ -111,7 +111,7 @@ class TaxiPassengerBaseFragment() : mapBizView.visibility = View.GONE presenter?.setItineraryVisibility() ck_setting.visibility = View.VISIBLE - romaPView.visibility = View.GONE + romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rv_location_center.visibility = View.VISIBLE pcnActionView.visibility = View.VISIBLE @@ -125,7 +125,7 @@ class TaxiPassengerBaseFragment() : presenter?.setItineraryVisibility() ck_setting.visibility = View.GONE ck_setting.isChecked = false - romaPView.visibility = View.GONE + romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rv_location_center.visibility = View.GONE pcnActionView.visibility = View.GONE diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 29da8db5fc..96f1b8918a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -64,7 +64,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { OverlayViewUtils.dismissOverlayView(this) } - taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 20,iv_xiaozhi_belt) + taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 48,iv_xiaozhi_belt) taxiPxiaozhiLove?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { d(SceneConstant.M_TAXI_P + TAG, "动画暂停") @@ -76,7 +76,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { super.onAttachedToWindow() val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) - taxiPxiaozhiLove?.start() + taxiPxiaozhiLove?.reStart() v_video_right_rear_view.resetView() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt index fd439578db..dad6f5f563 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt @@ -12,13 +12,17 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider import com.mogo.commons.voice.AIAssist +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.utils.FrameAnimatorContainer import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.iv_zhi_normal import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_count import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_end import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_start @@ -61,6 +65,8 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, private val numSelectTextView = arrayOfNulls(4) private lateinit var viewModel:ChekViewModel + private var taxiPxiaozhiCheck: FrameAnimatorContainer?=null + private fun initView(context: Context) { d(SceneConstant.M_TAXI_P + TAG, "initView") @@ -70,6 +76,13 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, numSelectTextView[1] = tv_taxi_passenger_number_second numSelectTextView[2] = tv_taxi_passenger_number_third numSelectTextView[3] = tv_taxi_passenger_number_fourth + + taxiPxiaozhiCheck = FrameAnimatorContainer(R.array.xiaozhi_normal, 12,iv_zhi_normal) + taxiPxiaozhiCheck?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + CallerLogger.d(SceneConstant.M_TAXI_P + ArrivedView.TAG, "动画暂停") + } + }) } private fun keyBoardLogic() { @@ -129,6 +142,12 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, super.onAttachedToWindow() viewModel = ViewModelProvider(this).get(ChekViewModel::class.java) viewModel.setStartAutopilotCallback(this) + taxiPxiaozhiCheck?.start() + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + taxiPxiaozhiCheck?.stop() } private fun selectIndex(i: Int) { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index e2fcf09d52..732172250c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -100,7 +100,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "可以启动自驾动画暂停") } }) - taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 15, iv_xiaozhi_belt) + taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 20, iv_xiaozhi_belt) taxiPXiaozhiBelt?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener { override fun AnimationStopped() { diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png index df003922ad..59cdbafe53 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png index a377c9fa22..a2efcd5479 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png index 6b3c113399..f21e4908d8 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png index 85007f7bf5..795ec65151 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png index 48b1275205..c7d6d77d41 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png index 976996147a..77a4aeeaad 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png index 8b8b34b1d9..b3ca7beeb2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png index 93a8766cb0..9836200d64 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png index b099132acc..4b9f5e7ea9 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png index 07c4391aad..e0870a2a30 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png index bf1890980e..b267279bc2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png index 7c92f9092a..a4284e2dd0 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png index 4492a095d8..6d816c4faa 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png index ad2c2d5491..0a8ea33df6 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png index 0d982f3806..8866597ef7 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png index fc97c2dd42..51f06b09aa 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png index c0203d8e49..bf46af12b2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png index 9b140ae8dc..77c8255d71 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png index bb936b738a..9a57e37bfc 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png index 89726692a1..dede5a4856 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png index 4aa0ba307d..a0ea531950 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png index cede039453..f4b15b6661 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png index 379641c7d0..b1f2067c24 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png index c7ca4be6e7..9c279818ec 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png index 94ba1a3577..3e28efd6cd 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png index 41521743ea..a7f8bf86ea 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png index 63584b72af..7b51471ac9 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png index 49555422b0..1f3e439184 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png index 63fb714d40..5b90ae5f30 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png index 5abe8a6ebb..6d00d8830c 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png index 124e72733f..32df235f4b 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png index e48f57fdc0..17038d1417 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png index bf2436db6f..f6b562b266 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png index ca84961ca3..77c017b63d 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png index e6b47d3107..78f31890d7 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png index 25286cba05..7b10b0e4bf 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png index 30b7996676..b7544a69f2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png index 0ffdaf7820..60a883256c 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png index bdf5ce5f1f..bf9b431711 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png index adbf77522f..c7339d4ca4 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png index 1d30b1e3e3..18c4a23f80 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png index d5edec929e..53d4fe40ee 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png index 5fe8371d2d..daac0b3e83 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png index ad3bcbad5d..c56f4b2183 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png index 7d07ff5571..dabe1119d0 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png index 2d3747ed6c..493df9d1b3 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png index 1ee3cbd54c..f8a2b4379e 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png index 5f69e5ac69..4b3a022ebc 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png index cda6024b03..59cdbafe53 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_049.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_049.png deleted file mode 100755 index b983e8e0f1..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_049.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_050.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_050.png deleted file mode 100755 index 93ba6fbe9a..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_050.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_051.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_051.png deleted file mode 100755 index 5623db4587..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_051.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_052.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_052.png deleted file mode 100755 index 34560dd9d2..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_052.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_053.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_053.png deleted file mode 100755 index f689722fcd..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_053.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_054.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_054.png deleted file mode 100755 index 6cf43054fc..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_054.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_055.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_055.png deleted file mode 100755 index 9e9ff1ae67..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_055.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_056.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_056.png deleted file mode 100755 index d5864d255f..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_056.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_057.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_057.png deleted file mode 100755 index 14c3e2d00e..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_057.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_058.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_058.png deleted file mode 100755 index 704667b20d..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_058.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_059.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_059.png deleted file mode 100755 index 5f01473637..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_059.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_060.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_060.png deleted file mode 100644 index 2c0e9e91e3..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_060.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_061.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_061.png deleted file mode 100644 index a90b91a899..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_061.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_062.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_062.png deleted file mode 100644 index 4f0eece63d..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_062.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_063.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_063.png deleted file mode 100644 index fa48df388b..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_063.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_064.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_064.png deleted file mode 100644 index b92191b853..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_064.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_065.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_065.png deleted file mode 100644 index c00bf40018..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_065.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_066.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_066.png deleted file mode 100644 index 28f7b191d4..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_066.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_067.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_067.png deleted file mode 100644 index e8ab94541a..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_067.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_068.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_068.png deleted file mode 100644 index 8f905f5196..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_068.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_069.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_069.png deleted file mode 100644 index a190a62959..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_069.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_070.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_070.png deleted file mode 100644 index d33b1e83e5..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_070.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_071.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_071.png deleted file mode 100644 index dff7f32927..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_071.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_072.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_072.png deleted file mode 100644 index da70b6071c..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_072.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 642ce95de1..ff44f994ee 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -162,7 +162,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_50" app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal" - android:layout_marginBottom="-50dp" + android:layout_marginBottom="-80dp" app:layout_constraintEnd_toEndOf="parent" /> + android:layout_width="@dimen/dp_360" + android:layout_height="@dimen/dp_360"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml index 2d5f5a2d76..d17614ba84 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml @@ -223,33 +223,6 @@ @drawable/xiaozhi_belt_046 @drawable/xiaozhi_belt_047 @drawable/xiaozhi_belt_048 - @drawable/xiaozhi_belt_049 - - @drawable/xiaozhi_belt_050 - @drawable/xiaozhi_belt_051 - @drawable/xiaozhi_belt_052 - @drawable/xiaozhi_belt_053 - @drawable/xiaozhi_belt_054 - @drawable/xiaozhi_belt_055 - @drawable/xiaozhi_belt_056 - @drawable/xiaozhi_belt_057 - @drawable/xiaozhi_belt_058 - @drawable/xiaozhi_belt_059 - - @drawable/xiaozhi_belt_060 - @drawable/xiaozhi_belt_061 - @drawable/xiaozhi_belt_062 - @drawable/xiaozhi_belt_063 - @drawable/xiaozhi_belt_064 - @drawable/xiaozhi_belt_065 - @drawable/xiaozhi_belt_066 - @drawable/xiaozhi_belt_067 - @drawable/xiaozhi_belt_068 - @drawable/xiaozhi_belt_069 - - @drawable/xiaozhi_belt_070 - @drawable/xiaozhi_belt_071 - @drawable/xiaozhi_belt_072 \ No newline at end of file diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java b/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java index a95ffe309a..fd67f0e4cc 100644 --- a/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java +++ b/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java @@ -9,6 +9,7 @@ import android.content.BroadcastReceiver; import android.content.ContentProvider; import android.content.pm.PackageManager; import android.graphics.BitmapFactory; +import android.net.ConnectivityManager; import android.opengl.GLSurfaceView; import android.os.SystemClock; import android.view.View; @@ -42,6 +43,13 @@ class JankPointAutoGenerator { ) private PackageManager pm; + @LancetXGenerator( + group = "main_block_check", + type = Type.IPC, + hookAllPublicMethods = true + ) + private ConnectivityManager cm; + @LancetXGenerator( group = "main_block_check", type = Type.ACTIVITY, diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java index 14c0adcd81..fd8142f40b 100644 --- a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java +++ b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java @@ -167,8 +167,9 @@ public class HookInvokerImpl implements IHookInvoker { } builder.setLength(builder.length() - 1); } + VLog.w("HookHandler", "Junk Detected:" + builder); - linkedLog(type, builder.toString()); + // linkedLog(type, builder.toString()); if (flag) { extra.setLength(0); } @@ -284,19 +285,19 @@ public class HookInvokerImpl implements IHookInvoker { } } - private void linkedLog(Type type, String msg) { - try { - linkedLogInternal(type,msg); - } catch (Throwable t) { - t.printStackTrace(); - } - } - - @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_ANR_LEAK, - linkCode = ChainConstant.CHAIN_SOURCE_HMI, - nodeAliasCode = ChainConstant.CHAIN_CODE_MAIN_BLOCK, - paramIndexes = { 0, 1 } - ) - private void linkedLogInternal(Type type, String msg) {} +// private void linkedLog(Type type, String msg) { +// try { +// linkedLogInternal(type,msg); +// } catch (Throwable t) { +// t.printStackTrace(); +// } +// } +// +// @ChainLog( +// linkChainLog = ChainConstant.CHAIN_TYPE_ANR_LEAK, +// linkCode = ChainConstant.CHAIN_SOURCE_HMI, +// nodeAliasCode = ChainConstant.CHAIN_CODE_MAIN_BLOCK, +// paramIndexes = { 0, 1 } +// ) +// private void linkedLogInternal(Type type, String msg) {} } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 071f934a57..3606bd8045 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -380,14 +380,21 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,DebugConfig.isDebug(), TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath, object : OnUploadListener { - override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String) { - CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") - if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){ - CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl) - //将语音文件上传Cos监听移除 - removeUploadListener(singlePath) - if(key == TAG){ - FileUtil.deleteFile(File(filePath)) + override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) { + if(downloadUrl == null){ + ToastUtils.showShort("上传语音文件失败，请检查网络") + ThreadUtils.runOnUiThread { + tvInitiativeReport.text = "上报" + } + }else{ + CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") + if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){ + CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl) + //将语音文件上传Cos监听移除 + removeUploadListener(singlePath) + if(key == TAG){ + FileUtil.deleteFile(File(filePath)) + } } } } @@ -446,6 +453,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList }) if (uploadResult == null || uploadResult.code != 200) { TipToast.shortTip("上报失败") + ThreadUtils.runOnUiThread { + tvInitiativeReport.text = "上报" + } } else { TipToast.shortTip("上报成功") //将上报BI的结果同步给工控机记录保存 @@ -562,8 +572,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList ThreadUtils.runOnUiThread { if(recordKey==null){ recordKey = recordPanel.key - BadCaseConfig.recordKeyList.add(recordPanel.key) } + BadCaseConfig.recordKeyList.add(recordPanel.key) if(recordFileName==null){ recordFileName = recordPanel.filename } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 7571186f0d..8b982a16a1 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -63,6 +63,7 @@ import org.json.JSONArray import org.json.JSONException import org.json.JSONObject import java.io.File +import java.lang.Exception import java.lang.StringBuilder /** @@ -379,14 +380,21 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext, DebugConfig.isDebug(), TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath, object : OnUploadListener { - override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String) { - CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") - if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){ - CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl) - //将语音文件上传Cos监听移除 - removeUploadListener(singlePath) - if(key == TAG){ - FileUtil.deleteFile(File(filePath)) + override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) { + if(downloadUrl == null){ + ToastUtils.showShort("上传语音文件失败，请检查网络") + ThreadUtils.runOnUiThread { + tvPassiveReport.text = "上报" + } + }else{ + CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") + if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){ + CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl) + //将语音文件上传Cos监听移除 + removeUploadListener(singlePath) + if(key == TAG){ + FileUtil.deleteFile(File(filePath)) + } } } } @@ -446,6 +454,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene }) if (uploadResult == null || uploadResult.code != 200) { TipToast.shortTip("上报失败") + ThreadUtils.runOnUiThread{ + tvPassiveReport.text = "上报" + } } else { TipToast.shortTip("上报成功") //将上报BI的结果同步给工控机记录保存 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt index 0f3340cf49..0531d0698c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt @@ -25,7 +25,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { @Volatile private var hasInit = false - private val linkedLog by lazy { MainBlockLinkedLog() } +// private val linkedLog by lazy { MainBlockLinkedLog() } override fun init(ctx: Context) { BlockDetector.init(BlockMetrics.Builder() @@ -75,7 +75,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { } catch (t: Throwable) { Log.e(TAG, "onDumped error", t) } - linkedLog.record(msg) +// linkedLog.record(msg) } }) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt index fd87bac403..6dbe5d527d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt @@ -104,7 +104,7 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider, } }) .crashConfig(CrashConfig.Builder() - .enabled(true) + .enabled(false) .crashDir(File(context.getExternalFilesDir(null), "logcat/crash")) .javaCrash(true) .anr(true) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt index 9a99c41274..418fce2a40 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt @@ -43,6 +43,7 @@ internal class MoFangAnalyticUtils { const val EVENT_EXECUTE_PARAMS_ACC = "acc" // 执行时自车加速度 const val EVENT_EXECUTE_PARAMS_HEADING = "head" // 执行时自车航向角 const val EVENT_EXECUTE_PARAMS_LINE_ID = "line_id" // 执行时的路线id + const val EVENT_EXECUTE_PARAMS_DOCKER_VERSION = "docker" // docker版本 // 魔方按键指令回执-工控机收到 @@ -56,6 +57,7 @@ internal class MoFangAnalyticUtils { const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_ACC = "acc" // 执行时自车加速度 const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING = "head" // 执行时自车航向角 const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID = "line_id" // 执行时的路线id + const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION = "docker" // docker版本 // 魔方按键指令回执-工控机执行 const val EVENT_EXECUTE_FEEDBACK_EXECUTE = "event_mofang_fb_execute" @@ -68,6 +70,7 @@ internal class MoFangAnalyticUtils { const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_ACC = "acc" // 执行时自车加速度 const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING = "head" // 执行时自车航向角 const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID = "line_id" // 执行时的路线id + const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION = "docker" // docker版本 private val handler by lazy { HandlerThread("mofang-analytic-worker", Process.THREAD_PRIORITY_BACKGROUND).let { it.start(); Handler(it.looper) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt index 1c6886ccd8..fd9b3442a6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt @@ -14,6 +14,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_ACC import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_CODE +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LAT import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID @@ -24,6 +25,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_ACC import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_CODE +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LAT import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID @@ -32,6 +34,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_NODE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_ACC +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_DOCKER_VERSION import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_HEADING import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_KEYCODE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_LAT @@ -123,7 +126,8 @@ internal class MoFangCommandExecutor { EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed, EVENT_EXECUTE_PARAMS_ACC to location.acceleration, EVENT_EXECUTE_PARAMS_HEADING to location.heading, - EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId() + EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(), + EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "") )) linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $acc")) CallerAutoPilotControlManager.sendOperatorSetAcceleratedSpeed(acc) @@ -151,7 +155,8 @@ internal class MoFangCommandExecutor { EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed, EVENT_EXECUTE_PARAMS_ACC to location.acceleration, EVENT_EXECUTE_PARAMS_HEADING to location.heading, - EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId() + EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(), + EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "") )) if (isLeft) { linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message")) @@ -180,7 +185,8 @@ internal class MoFangCommandExecutor { EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed, EVENT_EXECUTE_PARAMS_ACC to location.acceleration, EVENT_EXECUTE_PARAMS_HEADING to location.heading, - EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId() + EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(), + EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "") )) linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $json")) Log.d(TAG, "--- 启动自驾 ----入参:$json") @@ -211,7 +217,8 @@ internal class MoFangCommandExecutor { EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed, EVENT_EXECUTE_PARAMS_ACC to location.acceleration, EVENT_EXECUTE_PARAMS_HEADING to location.heading, - EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId() + EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(), + EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "") )) linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $value")) CallerAutoPilotControlManager.sendOperatorSetHorn(value) @@ -425,6 +432,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } @@ -441,6 +449,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } } @@ -456,6 +465,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } @@ -478,6 +488,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } } @@ -503,6 +514,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } @@ -519,6 +531,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } } @@ -534,6 +547,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } IMF.SPEED_CHANGE_EXECUTE -> { @@ -555,6 +569,7 @@ internal class MoFangCommandExecutor { it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId() + it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "" }) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt index 927566109c..01b3a2a77f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt @@ -20,6 +20,7 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat +import com.mogo.eagle.core.widget.AlignTextView import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout /** @@ -209,7 +210,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView //小智语音消息 class BubbleVoiceHolder(itemView: View): RecyclerView.ViewHolder(itemView){ - var tvPassengerVoiceContent: TextView = itemView.findViewById(R.id.tvPassengerVoiceContent) + var tvPassengerVoiceContent: AlignTextView = itemView.findViewById(R.id.tvPassengerVoiceContent) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 34d7806abe..fa9831f93b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig import com.mogo.eagle.core.data.temp.EventLogout import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager @@ -251,6 +252,12 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( private fun initOchView() { actvLoginout.onClick { + if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING + || CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING + ) { + ToastUtils.showShort("请稍后退出") + return@onClick + } EventBus.getDefault().post(EventLogout(EventLogout.LOGOUT_TYPE)) //将消息盒子操作记录还原 MsgBoxConfig.setUserRecord(0) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt index 5b2c84060c..bcf61a42a9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt @@ -78,6 +78,19 @@ class RomaPassengerView @JvmOverloads constructor( } } + /** + * 外部调用visible时进行判断 + */ + fun updateVisible(visible: Boolean){ + if(visible){ + if(CallerMapRomaListener.isRange()){ + this.visibility = View.VISIBLE + } + }else{ + this.visibility = View.GONE + } + } + override fun romaStatus(status: Boolean) { ThreadUtils.runOnUiThread { click = true diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_voice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_voice.xml index 98d9fdc552..1e01f4181e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_voice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_voice.xml @@ -4,7 +4,7 @@ android:layout_width="@dimen/dp_600" android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="#FFCEDCF7" + android:background="#8CF5FAFF" app:roundLayoutRadius="24dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" @@ -12,13 +12,16 @@ android:paddingEnd="@dimen/dp_20" > - () { } } + fun isRange():Boolean{ + return romaRange + } + } \ No newline at end of file diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/AlignTextView.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/AlignTextView.java new file mode 100644 index 0000000000..721e05502f --- /dev/null +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/AlignTextView.java @@ -0,0 +1,93 @@ +package com.mogo.eagle.core.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.text.Layout; +import android.text.StaticLayout; +import android.text.TextPaint; +import android.util.AttributeSet; + +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatTextView; + +public class AlignTextView extends AppCompatTextView { + private boolean alignOnlyOneLine; + + public AlignTextView(Context context) { + this(context, null); + } + + public AlignTextView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public AlignTextView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context, attrs); + } + + private void init(Context context, AttributeSet attrs) { + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.AlignTextView); + alignOnlyOneLine = typedArray.getBoolean(R.styleable.AlignTextView_alignOnlyOneLine, false); + typedArray.recycle(); + } + + protected void onDraw(Canvas canvas) { + + TextPaint paint = getPaint(); + paint.setColor(getCurrentTextColor()); + paint.drawableState = getDrawableState(); + + CharSequence content = getText(); + if (!(content instanceof String)) { + super.onDraw(canvas); + return; + } + String text = (String) content; + Layout layout = getLayout(); + + for (int i = 0; i < layout.getLineCount(); ++i) { + int lineBaseline = layout.getLineBaseline(i) + getPaddingTop(); + int lineStart = layout.getLineStart(i); + int lineEnd = layout.getLineEnd(i); + if (alignOnlyOneLine && layout.getLineCount() == 1) {//只有一行 + String line = text.substring(lineStart, lineEnd); + float width = StaticLayout.getDesiredWidth(text, lineStart, lineEnd, paint); + this.drawScaledText(canvas, line, lineBaseline, width, paint); + } else if (i == layout.getLineCount() - 1) {//最后一行 + canvas.drawText(text.substring(lineStart), getPaddingLeft(), lineBaseline, paint); + break; + } else {//中间行 + String line = text.substring(lineStart, lineEnd); + float width = StaticLayout.getDesiredWidth(text, lineStart, lineEnd, paint); + this.drawScaledText(canvas, line, lineBaseline, width, paint); + } + } + + } + + private void drawScaledText(Canvas canvas, String line, float baseLineY, float lineWidth, TextPaint paint) { + + if (line.length() < 1) { + return; + } + float x = getPaddingLeft(); + boolean forceNextLine = line.charAt(line.length() - 1) == 10; + int length = line.length() - 1; + if (forceNextLine || length == 0) { + canvas.drawText(line, x, baseLineY, paint); + return; + } + + float d = (getMeasuredWidth() - lineWidth - getPaddingLeft() - getPaddingRight()) / length; + + for (int i = 0; i < line.length(); ++i) { + String c = String.valueOf(line.charAt(i)); + float cw = StaticLayout.getDesiredWidth(c, paint); + canvas.drawText(c, x, baseLineY, paint); + x += cw + d; + } + } + +} diff --git a/core/mogo-core-res/src/main/res/values/attrs.xml b/core/mogo-core-res/src/main/res/values/attrs.xml index d77953e0a1..6f2260f09a 100644 --- a/core/mogo-core-res/src/main/res/values/attrs.xml +++ b/core/mogo-core-res/src/main/res/values/attrs.xml @@ -28,4 +28,9 @@ + + + + + \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png index 1fd3c9f330..ec5054b5ce 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png index 5e50920596..558bc23266 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png index 0400f30a9d..c33000b391 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png index 4d044f127e..3781dd6740 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png index f62406b25c..15b1b42d40 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png index 53dc75a8ee..d3e41b6ccd 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png index 606e43065e..9c088de47b 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png index 911786b709..5c4425af71 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png index 7c64d0a127..4895fc30ce 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png index 0241761507..248e737821 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png index ca096832b3..bb0a246575 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png index 535ae318af..6bdd37f989 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png index 5a918bf8ba..1119936e5a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png index 74ad75864f..91100d8ec2 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png index d2029b049a..b210f0a54a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png index 81d619019f..1416657c66 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png index bf7c679a28..2ac13d6028 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png index 260705aac1..6f49d09568 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png index 9290ca01aa..619a89fe7c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png index c946836c79..1e771e45de 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png index f5f0cb19ac..c0c1698851 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png index 7e70040803..c72e383182 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png index da18e38eb8..8469614925 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png index 63ce8a3a77..f764ae51d6 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png index 87eb4fc538..e11daa89be 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png index fe875320b2..adf58d144a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png index 04447381b3..cb65fa5828 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png index e2f2a92483..028fd4f105 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png index 27f445ac45..b4e5bbb09e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png index 1c5cc64aa0..7416165e3d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png index 5208543c33..10aee51edb 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png index ed94fe9a6f..3b9cd2432b 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png index 04bfa62d02..10b1981c47 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png index a044ad9433..a413245d89 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png index 569fe3ae25..e86d4702a8 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png index af6dbf4c2c..8eb59e4286 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png index 5a73e24cf2..639c5503a1 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png index 0ea9262d51..970a9b97fd 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png index d43e23fd0e..471ad03b6e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png index 8451237091..a340429b36 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png index f1cee41f04..f9c2ffeb99 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png index 5f20b6a8da..9fd95da302 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png index 3cc073dabd..fee7cf6166 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png index fc2270ea91..55e8fe663a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png index e250587648..752f41eeb9 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png index 651a76806c..b558db79da 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png index 555c991250..3d59690706 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png index d58e6d164b..ad5aa7c5ce 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png index 6d0c11f2c8..780fe3edbd 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png index bcf978f155..0900c8e46f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png index 6fc527ea32..19d58e3bb7 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png index 7c53c387ac..26540f589f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png index b53564c0ce..369ad00b66 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png index a08b371913..2eaffd3e21 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png index 74167571c2..057c835059 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png index 9e945dc79f..4910f0e515 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png index 2d1ef43055..bcd0be6bf5 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png index 37359f300c..dedb2a8b81 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png index 4a12b27854..da9591f15d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png index 8837b6499d..feda70ed7d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png index 063cc71ee5..70f8f5aa61 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png index c0f27d8068..792a4e7e8c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png index 3d1f394ba0..85552e04e0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png index 15310a0b17..71845fb3aa 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png index a7b290422a..53dcf20baf 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png index be61174e4c..0bece0e9ba 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png index d55a5c2564..1440d94f9f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png index ff5ebd1413..16b5b21bae 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png index 575f2290f8..185407aa47 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png index 2c54317a64..2163faa775 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png index 001ce5b514..804a18b616 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png index fd29f99c8e..adc906ced7 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png index 4a8df3c400..1f1a172071 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png index 71417e0ebd..55ada63c09 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png index b60b511792..6300f3af11 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png index dca55e8210..366c7f38c6 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png index 0686b377bf..dc545cf304 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png index b0431009df..8176386662 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png index c591fc0c55..efc25574af 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png index 560b1be926..7ae2cb3d64 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png index f25a1ebd15..702d22ba8c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png index 729f2fa9fa..fc851ceb4d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png index cf5865ca74..4d00789ad6 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png index 067e1e375a..a4f1ccbb3c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png index a77f811fec..03d5b0fa79 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png index 44e6a74cd0..061d909dbe 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png index 6cac49cefb..a2883290dc 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png index 5fe9cd25c4..f4c9b68ac0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png index 94ff2048d4..a69defc03c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png index b98f961eb4..26d8002ddb 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png index eb705a71cc..5f18e4c678 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png index fa143c3896..e47c770a7e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png index 87a76d7904..e76913f9fd 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png index 80ef043cc5..ce81a74093 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png index 69dbc91545..fdfa403376 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png index 167ef816d0..5536c5297b 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png index 022044ae62..ddc069fdb0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png index 9daf485e4e..9557865592 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png index 299d6b9a95..122a006c85 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png index 52b8a360df..d4b5a24ac9 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png index 87db9a4e2f..95b4536dfc 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png index d1666de043..45613cece0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png index 699fffc733..67dd20451f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png index aa812adf18..380c6b1815 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png index f8d2cfa9c3..e7e6798085 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png index c9e074222c..739b43768c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png index a011c3bc51..4f4794b68d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png index 698a9641c5..b63d967ce5 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png index d3931d8c86..b0fbb66ce1 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png index ef0f9b5760..18b6616da2 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png index c15499af04..a04ff59982 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png index c427571f0a..228546513d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png index 9609e214c8..07d5c7699d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png index 6d1746ea0a..5c2e751ddf 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png index ecb4ad75bc..27be89f406 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png index 7e591c2002..10b1981c47 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png index 7f25f23219..398b418e05 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png index add8223248..5705cf6c46 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png index efeab068f2..6926910472 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png index 0ef9187b90..744374c5c6 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png index 3e83e0793a..dbb2c139dd 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png differ diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg index 7592f56c0a..94726723a3 100644 --- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg @@ -1,14 +1,14 @@ -backGround=D9E9FF //背景色 -road=C4D8F5 //路面颜色 +backGround=B0BED1 //背景色 +road=80,92,112 //路面颜色 arrow.color.fac=0.95 //箭头颜色因子 alphaNumeric.color.fac=1.0 //地标颜色因子 zebra.color.fac=0.98 //斑马线颜色因子 -spotLight=2.5;0;1 //聚光灯 半径;亮度;偏移 -shadow=4C7793AB //阴影颜色 -greenBelt=D0E6EC;D9EAF4 //绿化带 底部颜色;顶部颜色 -dividerLine=E3F2FF;E1E2C4;1.0 //白色;黄色;颜色因子 -pole=9FB6D6;9FB6D6 //灯杆渐变颜色 -guardBar=CCE0FA;C4D9F7;CEE1FB //隔离带颜色 底，中， 顶 +spotLight=2.5;0.5;1 //聚光灯 半径;亮度;偏移 +shadow=70,85,107,200 //阴影颜色 +greenBelt=6C8C86;9EBDB4 //绿化带 底部颜色;顶部颜色 +dividerLine=228,233,250;228,233,250;1.0 //白色;黄色;颜色因子 +pole=8999B0;4E617E //灯杆渐变颜色 +guardBar=9FB4C8;7C8EA5;B8C8E1 //隔离带颜色 roadPile=1.0,0.84,0.23;0.18,0.18,0.18;0.25,0.25,0.25 //路桩颜色 bridgePier=d2d6e4;979aa4 //桥墩颜色 cable=D2E3FC;D2E3FC;D2E3FC;D2E3FC //电缆颜色1;电缆颜色2;光缆颜色1;光缆颜色2 @@ -16,18 +16,18 @@ area.type.2=D0E7DD //绿地颜色 area.type.3.color.pure=99C0E7 //水系颜色 area.type.3.color.gradient=C5E5FE;7CB0E2 //水系颜色,渐变 area.type.3.ring.width=50 //水系环宽度 -area.type.4=D1E1F8 //路面铺装颜色 -area.type.101=D9E9FF //区域块颜色 -regional=D1E1F8 //人行步道颜色 -building=BBCEE9;E0EDFC //建筑物底部颜色;顶部颜色 -camera=9FB6D6 //摄像头颜色 -trafficLight=9FB6D6 //交通灯颜色 -rsu.type.1=9FB6D6 //雷达颜色 -rsu.type.2=9FB6D6 //mec颜色 -rsu.type.3=9FB6D6 //rsu颜色 +area.type.4=37485E //路面铺装颜色 +area.type.101=B0BED1 //区域块颜色 +regional=889DB5 //人行步道颜色 +building=7fA3B7D0;D0E3FB //建筑物底部颜色;顶部颜色 +camera=BCC3D0 //摄像头颜色 +trafficLight=BCC3D0 //交通灯颜色 +rsu.type.1=BCC3D0 //雷达颜色 +rsu.type.2=BCC3D0 //mec颜色 +rsu.type.3=BCC3D0 //rsu颜色 //光照 环境光;漫反射;高光;高光的光泽度 selfCar.light=0.8,0.8,0.8;0.2,0.2,0.2;0.8,0.8,0.8;100.0 //自车 -otherCar.light=0.7,0.7,0.7;0.02,0.02,0.02;0.15,0.15,0.15;11.0 //他车 +otherCar.light=0.7,0.7,0.7;0.1,0.1,0.1;0.3,0.3,0.3;11.0 //他车 others.light=0.7,0.7,0.7;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点 fog=BFD9FD;30;70;0.8 //雾颜色,起始距离，结束距离，密度 skybox.lookat=0;-13;10; 0;0;5; 0;1;0 //天空盒lookat参数 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt index b20f626d9e..e4acdb6776 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt @@ -474,4 +474,6 @@ interface IMapController { fun setMapCenterBlur(isEnable: Boolean, color: String?, starDis: Float?, endDis: Float?, density: Float?) fun setStreetLightEffectIsEnable(isEnable: Boolean) + + fun setHDTypeVisible(type: IntArray?) } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt index 28bd02a954..bf85e7c9dc 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt @@ -2218,4 +2218,8 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } } + override fun setHDTypeVisible(type: IntArray?){ + mMapView.getMapEngine().setHDTypeVisibile(type) + } + } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt index e0d6331781..7fc22d1a00 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt @@ -19,7 +19,7 @@ object MapStyleHelper { private val TAG = javaClass.simpleName //更新样式时版本+1 - val currentStyleVersion = 66 + val currentStyleVersion = 67 private var copyJob:Job? = null diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt index 4e939c21a9..f0aefc0cd2 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt @@ -1523,5 +1523,9 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { mMapAutoView.getMapStyleParams()?.setVrAngleDefaultMode(mode) } + //设置显示高精元素 + fun setHDTypeVisible(type: IntArray?){ + mMapAutoView.getMapController()?.setHDTypeVisible(type) + } } \ No newline at end of file diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt index 3b242d4f9b..16342b6969 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt @@ -35,6 +35,7 @@ import com.mogo.map.utils.ObjectUtils import com.zhidaoauto.map.data.point.LonLatPoint import com.zhidaoauto.map.data.road.RoadCross import com.zhidaoauto.map.data.road.StopLine +import com.zhidaoauto.map.sdk.open.HDTypes import com.zhidaoauto.map.sdk.open.MapAutoApi import com.zhidaoauto.map.sdk.open.MapAutoApi.registerLogListener import com.zhidaoauto.map.sdk.open.MapAutoApi.unregisterLogListener @@ -192,6 +193,27 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle override fun onMapLoaded() { i(M_MAP + TAG, "onMapLoaded: ") if (checkAMapView()) { + val hdVisibleArray = intArrayOf( + HDTypes.DIVIDER.type, + HDTypes.ROAD_AREA.type, + HDTypes.STOP_LINE.type, + HDTypes.ARROW.type, + HDTypes.STATION_BRIDGE.type, + HDTypes.ZEBRA_LINE.type, + HDTypes.GREEN_BELT.type, + HDTypes.DIVERSION.type, + HDTypes.SAFE_ISLAND.type, + HDTypes.ALPHANUMERIC.type, + HDTypes.GUARDBAR.type, + HDTypes.TRAFFIC_DEVICE.type, + HDTypes.building.type, + HDTypes.streetLight.type, + HDTypes.area.type, + HDTypes.regional.type, + HDTypes.geometricLinear.type, + HDTypes.geometricSurface.type, + HDTypes.poi.type) + mMapView.getMapAutoViewHelper()!!.setHDTypeVisible(hdVisibleArray) loadPreVehicleModel() } } diff --git a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java index a59d950da2..64a87e0974 100644 --- a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java +++ b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java @@ -60,7 +60,7 @@ public class ZhiAvatarWindow implements RecordWinUi { public void onStatusChange(RecordStatus status) { Log.d(TAG, "onStatusChange status = " + status); if (status== RecordStatus.STATUS_SILENCE) { - AvatarManager.INSTANCE.dispatchStatusChangeEvent(ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTANDING); + AvatarManager.INSTANCE.dispatchStatusChangeEvent(ZhiRecordWinUi.RecordStatus.STATUS_SILENCE); }else if(status== RecordStatus.STATUS_LISTENING) { AvatarManager.INSTANCE.dispatchStatusChangeEvent(ZhiRecordWinUi.RecordStatus.STATUS_LISTENING); }else if(status== RecordStatus.STATUS_UNDERSTANDING) {