diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
index dd555fd941..9c18485084 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
@@ -63,8 +63,7 @@
android:id="@+id/zv_msg_pop_bottom"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_240"
- android:layout_marginBottom="-20dp"
- app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
diff --git a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
index c9970599ec..c7b2f4fc8a 100644
--- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
+++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
@@ -9,7 +9,10 @@ import chassis.VehicleStateOuterClass
import com.amap.api.maps.model.LatLng
import com.google.gson.reflect.TypeToken
import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.V2N
+import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListenerManager
@@ -18,6 +21,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListene
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.ActivityUtils
@@ -50,6 +54,7 @@ object DebugDataDispatch {
const val stateAutopilot = "stateAutopilot"
const val stateAutopilotFail = "stateAutopilotFail"
const val stopSite = "stopSite"
+ const val v2N = "xiaozhiV2N"
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "1111/11111"
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json"
@@ -60,6 +65,7 @@ object DebugDataDispatch {
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "stateAutopilotFail"
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "trajectoryStation" --ef startLon 116.74053643938474 --ef startLat 40.200487993233246 --ef endLon 116.73876977409685 --ef endLat 40.20179054129441 --el lineID 8
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "stopSite" --ei state 6 --ei action 1
+// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "xiaozhiV2N" --es poiType "10002" --ei state 0
val ROOT_PATH =
@@ -161,6 +167,17 @@ object DebugDataDispatch {
pncAction.parkScenarioAction = planningaction.build()
CallerPlanningActionsListenerManager.invokePNCActions(pncAction.build())
}
+ v2N ->{
+ val state = intent.getIntExtra("state", 0)
+ val poiType = intent.getStringExtra("poiType")
+ poiType?.let {
+ if(state==0){
+ CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.valueOf(poiType)), State.START)
+ }else{
+ CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.valueOf(poiType)), State.STOP)
+ }
+ }
+ }
else -> {}
}
}
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiV2NManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiV2NManager.kt
new file mode 100644
index 0000000000..03a507408f
--- /dev/null
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiV2NManager.kt
@@ -0,0 +1,338 @@
+package com.mogo.och.common.module.manager.xiaozhimanager
+
+import com.mogo.eagle.core.data.enums.EventTypeEnumNew
+import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.Event
+import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.V2N
+import com.mogo.eagle.core.function.api.hmi.xiaozhi.listener.OnXiaoZhiStateChangeListener
+import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.och.common.module.R
+
+object ZhiV2NManager : OnXiaoZhiStateChangeListener {
+ init {
+ CallerHmiManager.registerXiaoZhiStatusChangeListener(this)
+ }
+
+ override fun onChanged(event: Event, state: State) {
+ if (event is V2N) {
+ var drawable: Int? = null
+ when (event.type) {
+ EventTypeEnumNew.TRAFFIC_CHECK -> {
+ drawable = R.drawable.xiaozhi_event_qfjtjc
+ }
+
+ EventTypeEnumNew.ROAD_CLOSED -> {
+ drawable = R.drawable.xiaozhi_event_qffl
+ }
+
+ EventTypeEnumNew.FOURS_ROAD_WORK -> {
+ drawable = R.drawable.xiaozhi_event_qfsg
+ }
+
+ EventTypeEnumNew.FOURS_BLOCK_UP -> {
+ drawable = R.drawable.xiaozhi_event_qfdlyd
+ }
+
+ EventTypeEnumNew.FOURS_PONDING -> {
+ drawable = R.drawable.xiaozhi_event_xxxr
+ }
+
+ EventTypeEnumNew.FOURS_ICE -> {
+ drawable = R.drawable.xiaozhi_event_dljb
+ }
+
+ EventTypeEnumNew.FOURS_ACCIDENT -> {
+ drawable = R.drawable.xiaozhi_event_jtsg
+ }
+
+ EventTypeEnumNew.FOURS_ACCIDENT_01 -> {
+ drawable = R.drawable.xiaozhi_event_jtsg
+ }
+
+ EventTypeEnumNew.FOURS_ACCIDENT_02 -> {
+ drawable = R.drawable.xiaozhi_event_jtsg
+ }
+
+ EventTypeEnumNew.FOURS_ACCIDENT_03 -> {
+ drawable = R.drawable.xiaozhi_event_jtsg
+ }
+
+ EventTypeEnumNew.FOURS_ACCIDENT_04 -> {
+ drawable = R.drawable.xiaozhi_event_jtsg
+ }
+
+ EventTypeEnumNew.FOURS_ACCIDENT_05 -> {
+ drawable = R.drawable.xiaozhi_event_jtsg
+ }
+
+ EventTypeEnumNew.FOURS_LIVING -> {
+ //实时路况
+ }
+
+ EventTypeEnumNew.ILLEGAL_PARK_LIVING -> {
+ //违章停车
+ }
+
+ EventTypeEnumNew.ROAD_SLIPPERY -> {
+ //路面湿滑
+ }
+
+ EventTypeEnumNew.GHOST_PROBE -> {
+ drawable = R.drawable.xiaozhi_event_rxhd
+ }
+
+ EventTypeEnumNew.TAKE_OVER_EVENT -> {
+ drawable = R.drawable.xiaozhi_event_yccltx
+ }
+
+ EventTypeEnumNew.NETWORK_WEAK_EVENT -> {
+ drawable = R.drawable.xiaozhi_event_yccltx
+ }
+
+ EventTypeEnumNew.ALERT_FRONT_CAR -> {
+ //前方预警
+ }
+
+ EventTypeEnumNew.ALERT_TRAFFIC_CONTROL -> {
+ //限行管理
+ }
+
+ EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_SUGGEST -> {
+
+ }
+
+ EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_WARNING -> {
+ //红绿灯
+ }
+
+ EventTypeEnumNew.ALERT_CAR_TROUBLE_WARNING -> {
+ //故障车辆
+ }
+
+ EventTypeEnumNew.ALERT_FATIGUE_DRIVING -> {
+ //疲劳驾驶
+ }
+
+ EventTypeEnumNew.ALERT_ILLEGAL_PARK -> {
+ //违章停车
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_OPTIMAL_LANE -> {
+
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_FCW -> {
+
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ICW -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_LTA -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_BSW -> {
+ drawable = R.drawable.xiaozhi_event_mqpzyj
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_LCW -> {
+ drawable = R.drawable.xiaozhi_event_bdpzyj
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_DNPW -> {
+ drawable = R.drawable.xiaozhi_event_nxccyj
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_EBW -> {
+ drawable = R.drawable.xiaozhi_event_qxjs
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_AVW -> {
+ drawable = R.drawable.xiaozhi_event_yccltx
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_CLW -> {
+ drawable = R.drawable.xiaozhi_event_clskyj
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_EVW -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES -> {
+ drawable = R.drawable.xiaozhi_event_mtcpzyj
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON -> {
+ drawable = R.drawable.xiaozhi_event_rxhd
+ }
+
+ EventTypeEnumNew.TYPE_ERROR_WEAKNESS -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED -> {
+ drawable = R.drawable.xiaozhi_event_chdyj
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN -> {
+ drawable = R.drawable.xiaozhi_event_chdyj
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_BREAKDOWN_WARNING -> {
+ drawable = R.drawable.xiaozhi_event_clskyj
+ }
+
+ EventTypeEnumNew.TYPE_FOURS_PONDING -> {
+ drawable = R.drawable.xiaozhi_event_dljs
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PARKING -> {
+ drawable = R.drawable.xiaozhi_event_jztc
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_TJW -> {
+ drawable = R.drawable.xiaozhi_event_qfdlyd
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_SLW -> {
+ drawable = R.drawable.xiaozhi_event_clcs
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT -> {
+ drawable = R.drawable.xiaozhi_event_clcs
+ }
+
+ EventTypeEnumNew.TYPE_ID_SHAPR_TURNS -> {
+ drawable = R.drawable.xiaozhi_event_zzjw
+ }
+
+ EventTypeEnumNew.TYPE_ID_BRIDGE -> {
+ drawable = R.drawable.xiaozhi_event_tfq
+ }
+
+ EventTypeEnumNew.TYPE_ID_PEDESTRIAN -> {
+ drawable = R.drawable.xiaozhi_event_rxhd
+ }
+
+ EventTypeEnumNew.TYPE_ID_SLIPPERY_ROAD -> {
+ drawable = R.drawable.xiaozhi_event_dljb
+ }
+
+ EventTypeEnumNew.TYPE_ID_TUNNEL -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_ID_FERRY -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_ID_UNEVEN_ROAD -> {
+ drawable = R.drawable.xiaozhi_event_dlkw
+ }
+
+ EventTypeEnumNew.TYPE_ID_NON_MOTOR_VEHICLE -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_ID_OBSTACLE -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_FOURS_ROAD_WORK -> {
+ drawable = R.drawable.xiaozhi_event_qfsg
+ }
+
+ EventTypeEnumNew.TYPE_VEHICLE_QUEUE -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_NO_PASSING -> {
+ drawable = R.drawable.xiaozhi_event_qffl
+ }
+
+ EventTypeEnumNew.TYPE_NO_TURNING_AROUND -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_PARKING -> {
+ drawable = R.drawable.xiaozhi_event_jztc
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_TOOTING -> {
+ drawable = R.drawable.xiaozhi_event_jzmd
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_BUS_WARNING -> {
+ drawable = R.drawable.xiaozhi_event_ygdc
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_NARROW_RIGHT -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_GAS_STATION -> {
+ drawable = R.drawable.xiaozhi_event_qfjyz
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL -> {
+ drawable = R.drawable.xiaozhi_event_qfxx
+ }
+
+ EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT -> {
+ drawable = R.drawable.xiaozhi_event_jtsg
+ }
+
+ EventTypeEnumNew.TYPE_ATTENTION_CONFLUENCE -> {
+ //R.drawable.xiaozhi_event_
+ }
+
+ EventTypeEnumNew.TYPE_PEDESTRIAN_CROSSING -> {
+ drawable = R.drawable.xiaozhi_event_rxhd
+ }
+
+ EventTypeEnumNew.TYPE_SOCKET_ROAD_CONGESTION -> {
+ drawable = R.drawable.xiaozhi_event_qfdlyd
+ }
+
+ EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI -> {
+ drawable = R.drawable.xiaozhi_event_clskyj
+ }
+
+ EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU -> {
+ drawable = R.drawable.xiaozhi_event_yccltx
+ }
+
+ EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG -> {
+ drawable = R.drawable.xiaozhi_event_qfsg
+ }
+
+ else -> {
+
+ }
+ }
+ if (drawable != null) {
+ if(state==State.START){
+ ZhiViewmanager.warnAni.drawable = drawable
+ ZhiViewmanager.showListeningAni(ZhiViewmanager.warnAni,true)
+ }else if(state==State.STOP){
+ ZhiViewmanager.stopWarnAni()
+ }
+ }
+ }
+ }
+
+ fun load() {
+
+ }
+}
\ No newline at end of file
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiView.kt
index 39baa196b7..20783d5640 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiView.kt
@@ -1,20 +1,34 @@
package com.mogo.och.common.module.manager.xiaozhimanager
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
import android.content.Context
import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.animation.LinearInterpolator
import androidx.appcompat.widget.AppCompatImageView
+import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.och.common.module.R
import com.mogo.och.common.module.utils.FrameAnimatorContainer
import com.mogo.tts.base.zhi.CallbackWidget
import com.mogo.tts.base.zhi.ZhiRecordWinUi
+import kotlinx.android.synthetic.main.common_xiaozhi.view.aciv_v2n_event
+import kotlinx.android.synthetic.main.common_xiaozhi.view.aciv_xiaozhi
import java.util.concurrent.ArrayBlockingQueue
import java.util.concurrent.atomic.AtomicBoolean
-class ZhiView @JvmOverloads constructor(
- context: Context,
- attrs: AttributeSet? = null,
- defStyleAttr: Int = 0
-) : AppCompatImageView(context, attrs, defStyleAttr), ZhiViewmanager.IViewCallback {
+class ZhiView : ConstraintLayout, ZhiViewmanager.IViewCallback {
+
+ constructor(context: Context) : super(context)
+
+ constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
+
+ constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
+
+ constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
+
companion object {
const val TAG = "ZhiView"
}
@@ -25,14 +39,19 @@ class ZhiView @JvmOverloads constructor(
private var currentAnim:FrameAnimatorContainer? = null
- init {
+ private var animator:ObjectAnimator?=null
+
+
+ private fun initView() {
+ LayoutInflater.from(context).inflate(R.layout.common_xiaozhi, this, true)
setOnClickListener {
ZhiStateManager.weakUpXiaoZhi()
}
}
+
override fun setFirstPlayAni(initAni: ZhiViewmanager.AniData,aniListener:FrameAnimatorContainer.OnAnimationStoppedListener){
- currentAnim = FrameAnimatorContainer(initAni.aniArrayId, 12,this)
+ currentAnim = FrameAnimatorContainer(initAni.aniArrayId, 12,aciv_xiaozhi)
currentAnim?.isOnce = initAni.isOnce
currentAnim?.sequence = initAni.sequence
currentAnim?.setFtp(initAni.fps)
@@ -41,6 +60,7 @@ class ZhiView @JvmOverloads constructor(
}
override fun setNewPlayData(currentPalyingAni: ZhiViewmanager.AniData) {
+ handleV2NEvent(currentPalyingAni)
currentAnim?.setData(currentPalyingAni.aniList)
currentAnim?.isOnce = currentPalyingAni.isOnce
currentAnim?.sequence = currentPalyingAni.sequence
@@ -48,6 +68,7 @@ class ZhiView @JvmOverloads constructor(
}
override fun changeAniImmediately(currentPalyingAni: ZhiViewmanager.AniData) {
+ handleV2NEvent(currentPalyingAni)
currentAnim?.setData(currentPalyingAni.aniList)
currentAnim?.isOnce = currentPalyingAni.isOnce
currentAnim?.sequence = currentPalyingAni.sequence
@@ -55,6 +76,30 @@ class ZhiView @JvmOverloads constructor(
currentAnim?.reStart()
}
+ fun handleV2NEvent(currentPalyingAni: ZhiViewmanager.AniData){
+ if(currentPalyingAni==ZhiViewmanager.warnAni||currentPalyingAni==ZhiViewmanager.normal2warnAni){
+ currentPalyingAni.drawable?.let {
+ aciv_v2n_event.setImageResource(it)
+ if(animator!=null){
+ animator?.cancel()
+ animator = null
+ }
+ animator = ObjectAnimator.ofFloat(aciv_v2n_event, "alpha", 0f, 1f,0f)
+ animator?.duration = 2000
+ animator?.repeatCount = -1
+ animator?.repeatMode = ValueAnimator.RESTART
+ animator?.interpolator = LinearInterpolator()
+ animator?.start()
+ }
+ }else{
+ if(animator!=null){
+ animator?.cancel()
+ aciv_v2n_event.alpha = 0f
+ animator = null
+ }
+ }
+ }
+
override fun restartAni() {
currentAnim?.reStart()
@@ -70,4 +115,12 @@ class ZhiView @JvmOverloads constructor(
ZhiViewmanager.removeListener()
}
+ init {
+ try {
+ initView()
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+
}
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt
index a5cd6fd389..e7d7e57134 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt
@@ -11,14 +11,23 @@ object ZhiViewmanager {
private var iViewCallbacks: IViewCallback? = null
- val normalAni = AniData(1, R.array.xiaozhi_normal, false, true,12)
- val listenerAni = AniData(2,R.array.xiaozhi_think,false,true,12)
+ val normalAni = AniData(AniType.normal, R.array.xiaozhi_normal, false, true,12)
+ val listenerAni = AniData(AniType.listener,R.array.xiaozhi_think,false,true,12)
- val listener2Normal = AniData(3, R.array.xiaozhi_think_normal, true, false,24)
- val normal2Listener = AniData(4, R.array.xiaozhi_think_normal, true, true,24)
+ val listener2Normal = AniData(AniType.listener2Normal, R.array.xiaozhi_think_normal, true, false,24)
+ val normal2Listener = AniData(AniType.normal2Listener, R.array.xiaozhi_think_normal, true, true,24)
- val beltAni = AniData(5, R.array.xiaozhi_belt, false, true,12)
- val loveAni = AniData(6, R.array.xiaozhi_love, false, true,12)
+ val beltAni = AniData(AniType.beltAni, R.array.xiaozhi_belt, false, true,12)
+ val loveAni = AniData(AniType.loveAni, R.array.xiaozhi_love, false, true,12)
+
+ val warnAni = AniData(AniType.warnAni, R.array.xiaozhi_warn, false, true,12)
+ val normal2warnAni = AniData(AniType.normal2warnAni, R.array.xiaozhi_normal_warn, false, true,12)
+ val warn2normalAni = AniData(AniType.warn2normalAni, R.array.xiaozhi_normal_warn, false, false,12)
+
+
+ enum class AniType{
+ normal,listener,listener2Normal,normal2Listener,beltAni,loveAni,warnAni,normal2warnAni,warn2normalAni
+ }
private var initAni = normalAni
private var currentAni: AniData? = null
@@ -27,6 +36,7 @@ object ZhiViewmanager {
fun addDistanceListener(listener: IViewCallback) {
+ ZhiV2NManager.load()
this.iViewCallbacks = listener
this.currentAni = initAni
listener.setFirstPlayAni(initAni,
@@ -34,7 +44,7 @@ object ZhiViewmanager {
override fun playOnce() {
CallerLogger.d(TAG, "播放完一遍动画")
var nextPlay = readQueue.poll()
- CallerLogger.d(TAG, "获取下一个动画${Thread.currentThread().name}--${nextPlay?.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "获取下一个动画${Thread.currentThread().name}--${nextPlay?.aniType}-${readQueue.size}")
if(nextPlay == currentAni){
return
}
@@ -50,7 +60,7 @@ object ZhiViewmanager {
}else{
// 有设置新的动画
currentAni = nextPlay
- CallerLogger.d(TAG, "切换动画${nextPlay.id}")
+ CallerLogger.d(TAG, "切换动画${nextPlay.aniType}")
iViewCallbacks?.setNewPlayData(nextPlay)
}
}
@@ -71,61 +81,90 @@ object ZhiViewmanager {
if(lastAni==null){
lastAni = currentAni
}
- if(lastAni?.id==aniData.id){
+ if(lastAni?.aniType==aniData.aniType){
return
}
- when (lastAni?.id) {
- 1 -> {//正在播放默认动画
- if(aniData.id==2){
+ when (lastAni?.aniType) {
+ AniType.normal -> {//正在播放默认动画
+ if(aniData.aniType==AniType.listener) {// 要播放倾听中动画
iViewCallbacks?.changeAniImmediately(normal2Listener)
currentAni = normal2Listener
- CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${normal2Listener.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${normal2Listener.aniType}-${readQueue.size}")
readQueue.offer(aniData)
- CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
+ }else if (aniData.aniType==AniType.warnAni){
+ iViewCallbacks?.changeAniImmediately(normal2warnAni)
+ currentAni = normal2warnAni
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${normal2warnAni.aniType}-${readQueue.size}")
+ readQueue.offer(aniData)
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
}else{
if(immediately){
iViewCallbacks?.changeAniImmediately(aniData)
currentAni = aniData
- CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
}else{
readQueue.offer(aniData)
- CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
}
}
}
- 2 -> {// 正在播放倾听中动画
- if(aniData.id==1){
+ AniType.listener -> {// 正在播放倾听中动画
+ if(aniData.aniType==AniType.normal){
iViewCallbacks?.changeAniImmediately(listener2Normal)
currentAni = listener2Normal
- CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${listener2Normal.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${listener2Normal.aniType}-${readQueue.size}")
readQueue.offer(aniData)
- CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
}else{
if(immediately){
iViewCallbacks?.changeAniImmediately(aniData)
currentAni = aniData
- CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
}else{
readQueue.offer(aniData)
- CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
+ }
+ }
+ }
+ AniType.warnAni -> {
+ if(aniData.aniType==AniType.normal){
+ iViewCallbacks?.changeAniImmediately(warn2normalAni)
+ currentAni = warn2normalAni
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${warn2normalAni.aniType}-${readQueue.size}")
+ readQueue.offer(aniData)
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
+ }else{
+ if(immediately){
+ iViewCallbacks?.changeAniImmediately(aniData)
+ currentAni = aniData
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
+ }else{
+ readQueue.offer(aniData)
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
}
}
}
-
else -> {
if(immediately){
iViewCallbacks?.changeAniImmediately(aniData)
currentAni = aniData
- CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
} else {
readQueue.offer(aniData)
- CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}")
+ CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.aniType}-${readQueue.size}")
}
}
}
}
+ fun stopWarnAni() {
+ if (currentAni == warnAni) {
+ showListeningAni(normalAni)
+ }
+ }
+
interface IViewCallback {
fun setFirstPlayAni(
@@ -139,11 +178,12 @@ object ZhiViewmanager {
}
data class AniData(
- val id: Int,// 动画ID
+ val aniType: AniType,// 动画ID
val aniArrayId: Int,// 动画序列号
val isOnce: Boolean,// true 只播一次 false 循环播放
val sequence: Boolean,// true 正向播放 false 倒着播放
- val fps:Int
+ val fps:Int,
+ var drawable:Int?=null
) {
var aniList = FrameAnimatorContainer.getData(aniArrayId)
}
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_bdpzyj.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_bdpzyj.png
new file mode 100755
index 0000000000..92419e8925
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_bdpzyj.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_chdyj.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_chdyj.png
new file mode 100755
index 0000000000..575f1d3bac
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_chdyj.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clcs.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clcs.png
new file mode 100755
index 0000000000..b8707155ab
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clcs.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clskyj.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clskyj.png
new file mode 100755
index 0000000000..056b8a9161
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clskyj.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clyk.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clyk.png
new file mode 100755
index 0000000000..0afaa86d37
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_clyk.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dljb.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dljb.png
new file mode 100755
index 0000000000..dc8e9837e2
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dljb.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dljs.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dljs.png
new file mode 100755
index 0000000000..652bcf6df9
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dljs.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dlkw.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dlkw.png
new file mode 100755
index 0000000000..2bbe290fba
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_dlkw.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_hd.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_hd.png
new file mode 100755
index 0000000000..63306810ec
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_hd.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jsrx.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jsrx.png
new file mode 100755
index 0000000000..532c6a6134
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jsrx.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jtsg.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jtsg.png
new file mode 100755
index 0000000000..a81b87a5fb
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jtsg.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jzmd.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jzmd.png
new file mode 100755
index 0000000000..370b6cdf80
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jzmd.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jztc.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jztc.png
new file mode 100755
index 0000000000..0ce21d08d1
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_jztc.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_ksld.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_ksld.png
new file mode 100755
index 0000000000..c547e61c87
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_ksld.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_mqpzyj.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_mqpzyj.png
new file mode 100755
index 0000000000..f8a36b432b
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_mqpzyj.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_mtcpzyj.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_mtcpzyj.png
new file mode 100755
index 0000000000..8cef23c117
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_mtcpzyj.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_nxccyj.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_nxccyj.png
new file mode 100755
index 0000000000..f131838836
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_nxccyj.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfdlyd.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfdlyd.png
new file mode 100755
index 0000000000..ee11759a06
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfdlyd.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qffl.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qffl.png
new file mode 100755
index 0000000000..6da384e3d0
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qffl.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfjtjc.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfjtjc.png
new file mode 100755
index 0000000000..f6f299995f
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfjtjc.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfjyz.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfjyz.png
new file mode 100755
index 0000000000..21a913994f
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfjyz.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfsg.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfsg.png
new file mode 100755
index 0000000000..27b7c15f1c
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfsg.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfxx.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfxx.png
new file mode 100755
index 0000000000..8805794dee
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qfxx.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qxjs.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qxjs.png
new file mode 100755
index 0000000000..54ae65e1ab
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qxjs.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qxpzyj.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qxpzyj.png
new file mode 100755
index 0000000000..b1bff79d55
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_qxpzyj.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_rxhd.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_rxhd.png
new file mode 100755
index 0000000000..e3ad6128d0
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_rxhd.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tfq.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tfq.png
new file mode 100755
index 0000000000..b0734696b9
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tfq.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tsclyxtx.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tsclyxtx.png
new file mode 100755
index 0000000000..b2222db414
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tsclyxtx.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tzclyxtx.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tzclyxtx.png
new file mode 100755
index 0000000000..cdc06fd568
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_tzclyxtx.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_xxls.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_xxls.png
new file mode 100755
index 0000000000..f8957f08b5
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_xxls.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_xxxr.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_xxxr.png
new file mode 100755
index 0000000000..652bcf6df9
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_xxxr.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_yccltx.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_yccltx.png
new file mode 100755
index 0000000000..09b586763b
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_yccltx.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_ygdc.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_ygdc.png
new file mode 100755
index 0000000000..9e3da47158
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_ygdc.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_yzjw.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_yzjw.png
new file mode 100755
index 0000000000..75db50f07f
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_yzjw.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_zzjw.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_zzjw.png
new file mode 100755
index 0000000000..5c0258f652
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_event_zzjw.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_000.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_000.png
new file mode 100755
index 0000000000..9b650832f5
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_000.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_001.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_001.png
new file mode 100755
index 0000000000..83eb2461e7
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_001.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_002.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_002.png
new file mode 100755
index 0000000000..30f139dcf1
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_002.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_003.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_003.png
new file mode 100755
index 0000000000..7ffc332bab
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_003.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_004.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_004.png
new file mode 100755
index 0000000000..eeec23d083
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_004.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_005.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_005.png
new file mode 100755
index 0000000000..bd7092544d
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_005.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_006.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_006.png
new file mode 100755
index 0000000000..9fef8dc66b
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_006.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_007.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_007.png
new file mode 100755
index 0000000000..336542645f
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_007.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_008.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_008.png
new file mode 100755
index 0000000000..3be26e3db1
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_008.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_009.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_009.png
new file mode 100755
index 0000000000..172e8fc588
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_009.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_010.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_010.png
new file mode 100755
index 0000000000..3828f0bf16
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_010.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_011.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_011.png
new file mode 100755
index 0000000000..4d778d7fe6
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_011.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_012.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_012.png
new file mode 100755
index 0000000000..3fbe20304c
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_012.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_013.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_013.png
new file mode 100755
index 0000000000..6e9e901571
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_013.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_014.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_014.png
new file mode 100755
index 0000000000..9213219bd0
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_014.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_015.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_015.png
new file mode 100755
index 0000000000..dbb511deff
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_015.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_016.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_016.png
new file mode 100755
index 0000000000..2caf5ee7c9
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_016.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_017.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_017.png
new file mode 100755
index 0000000000..95a8990d70
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_warn_017.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_00.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_00.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_00.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_00.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_01.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_01.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_01.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_01.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_02.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_02.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_02.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_02.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_03.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_03.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_03.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_03.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_04.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_04.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_04.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_04.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_05.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_05.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_05.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_05.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_06.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_06.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_06.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_06.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_07.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_07.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_07.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_07.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_08.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_08.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_08.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_08.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_09.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_09.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_09.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_09.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_10.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_10.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_10.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_10.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_11.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_11.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_11.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_11.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_12.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_12.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_12.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_12.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_13.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_13.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_13.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_13.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_14.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_14.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_14.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_14.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_15.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_15.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_15.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_15.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_16.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_16.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_16.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_16.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_17.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_17.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_17.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_17.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_18.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_18.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_18.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_18.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_19.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_19.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_19.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_19.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_20.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_20.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_20.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_20.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_21.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_21.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_21.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_21.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_22.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_22.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_22.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_22.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_23.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_23.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_23.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_23.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_24.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_24.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_24.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_24.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_25.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_25.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_25.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_25.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_26.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_26.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_26.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_26.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_27.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_27.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_27.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_27.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_28.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_28.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_28.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_28.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_29.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_29.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_29.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_29.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_30.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_30.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_30.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_30.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_31.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_31.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_31.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_31.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_34.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_34.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_34.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_34.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_35.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_35.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_35.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_35.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_36.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_36.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_36.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_36.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_37.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_37.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_37.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_37.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_38.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_38.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_38.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_38.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_39.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_39.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_39.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_39.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_40.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_40.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_40.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_40.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_41.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_41.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_41.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_41.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_42.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_42.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_42.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_42.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_43.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_43.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_43.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_43.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_44.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_44.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_44.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_44.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_45.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_45.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_45.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_45.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_46.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_46.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_46.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_46.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_47.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_47.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_47.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_47.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_48.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_48.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_48.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_48.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_49.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_49.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_49.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_49.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_50.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_50.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_50.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_50.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_51.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_51.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_51.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_51.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_52.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_52.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_52.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_52.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_53.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_53.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_53.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_53.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_54.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_54.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_54.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_54.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_55.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_55.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_55.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_55.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_56.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_56.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_56.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_56.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_57.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_57.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_57.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_57.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_58.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_58.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_58.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_58.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_59.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_59.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_59.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_59.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_60.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_60.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_60.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_60.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_61.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_61.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_61.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_61.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_62.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_62.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_62.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_62.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_63.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_63.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_63.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_63.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_64.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_64.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_64.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_64.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_65.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_65.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_65.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_65.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_66.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_66.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_66.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_66.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_67.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_67.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_67.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_67.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_68.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_68.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_68.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_68.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_69.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_69.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_69.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_69.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_70.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_70.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_70.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_70.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_71.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_71.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_71.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_71.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_01.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_01.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_02.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_02.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_03.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_03.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_04.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_04.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_05.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_05.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_06.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_06.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_07.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_07.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_08.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_08.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_09.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_09.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_10.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_10.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_11.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_11.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_12.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_12.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_13.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_13.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_14.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_14.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_15.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_15.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_16.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_16.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_17.webp
similarity index 100%
rename from OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp
rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_think_normal_17.webp
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_000.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_000.png
new file mode 100755
index 0000000000..9c2e0eb7f9
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_000.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_001.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_001.png
new file mode 100755
index 0000000000..232cb0dd73
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_001.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_002.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_002.png
new file mode 100755
index 0000000000..bc0d8d7411
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_002.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_003.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_003.png
new file mode 100755
index 0000000000..eca945c4b0
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_003.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_004.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_004.png
new file mode 100755
index 0000000000..34a50c5861
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_004.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_005.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_005.png
new file mode 100755
index 0000000000..fff2787c6b
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_005.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_006.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_006.png
new file mode 100755
index 0000000000..8209bee269
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_006.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_007.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_007.png
new file mode 100755
index 0000000000..406b2c3e10
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_007.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_008.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_008.png
new file mode 100755
index 0000000000..cf2ab01126
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_008.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_009.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_009.png
new file mode 100755
index 0000000000..fd020e0a69
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_009.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_010.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_010.png
new file mode 100755
index 0000000000..9be2c2afb0
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_010.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_011.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_011.png
new file mode 100755
index 0000000000..b1b81f2024
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_011.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_012.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_012.png
new file mode 100755
index 0000000000..10232960e8
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_012.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_013.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_013.png
new file mode 100755
index 0000000000..ead62b6ac9
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_013.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_014.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_014.png
new file mode 100755
index 0000000000..31ce4a8233
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_014.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_015.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_015.png
new file mode 100755
index 0000000000..c15eb532bc
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_015.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_016.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_016.png
new file mode 100755
index 0000000000..48dd4771d2
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_016.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_017.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_017.png
new file mode 100755
index 0000000000..8b84ae6adc
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_017.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_018.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_018.png
new file mode 100755
index 0000000000..b00a6e115c
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_018.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_019.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_019.png
new file mode 100755
index 0000000000..4b555039d8
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_019.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_020.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_020.png
new file mode 100755
index 0000000000..8c72864c9d
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_020.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_021.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_021.png
new file mode 100755
index 0000000000..73b5e86233
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_021.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_022.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_022.png
new file mode 100755
index 0000000000..5e81dacebb
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_022.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_023.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_023.png
new file mode 100755
index 0000000000..d4eceae988
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_023.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_024.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_024.png
new file mode 100755
index 0000000000..803b6cb253
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_024.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_025.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_025.png
new file mode 100755
index 0000000000..2a0c814794
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_025.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_026.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_026.png
new file mode 100755
index 0000000000..a3ed8ec8a7
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_026.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_027.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_027.png
new file mode 100755
index 0000000000..699de0d893
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_027.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_028.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_028.png
new file mode 100755
index 0000000000..6ff7d26ab7
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_028.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_029.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_029.png
new file mode 100755
index 0000000000..e41c9362d7
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_029.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_030.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_030.png
new file mode 100755
index 0000000000..7d20dcacc5
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_030.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_031.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_031.png
new file mode 100755
index 0000000000..b353fae8ab
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_031.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_032.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_032.png
new file mode 100755
index 0000000000..30ad40146e
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_032.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_033.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_033.png
new file mode 100755
index 0000000000..de15df3049
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_033.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_034.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_034.png
new file mode 100755
index 0000000000..10f7554b1a
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_034.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_035.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_035.png
new file mode 100755
index 0000000000..6286c42fe9
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_035.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_036.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_036.png
new file mode 100755
index 0000000000..c1c1595eb6
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_036.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_037.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_037.png
new file mode 100755
index 0000000000..fb4868f177
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_037.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_038.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_038.png
new file mode 100755
index 0000000000..01e673ff4d
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_038.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_039.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_039.png
new file mode 100755
index 0000000000..38dd1c7923
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_039.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_040.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_040.png
new file mode 100755
index 0000000000..98c55f0584
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_040.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_041.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_041.png
new file mode 100755
index 0000000000..719edc9b4c
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_041.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_042.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_042.png
new file mode 100755
index 0000000000..95b3758dfe
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_042.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_043.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_043.png
new file mode 100755
index 0000000000..601c0efadf
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_043.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_044.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_044.png
new file mode 100755
index 0000000000..5769591a7a
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_044.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_045.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_045.png
new file mode 100755
index 0000000000..bf296187b5
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_045.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_046.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_046.png
new file mode 100755
index 0000000000..07b7978d43
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_046.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_047.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_047.png
new file mode 100755
index 0000000000..a7e7bc5d32
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_047.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_048.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_048.png
new file mode 100755
index 0000000000..cd1160bfa6
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_048.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_049.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_049.png
new file mode 100755
index 0000000000..66dab77907
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_049.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_050.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_050.png
new file mode 100755
index 0000000000..fde4e0512b
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_050.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_051.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_051.png
new file mode 100755
index 0000000000..8a427f5119
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_051.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_052.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_052.png
new file mode 100755
index 0000000000..908cb93fb8
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_052.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_053.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_053.png
new file mode 100755
index 0000000000..ffc487eb6d
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_053.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_054.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_054.png
new file mode 100755
index 0000000000..15d67e3397
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_054.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_055.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_055.png
new file mode 100755
index 0000000000..84013b902d
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_055.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_056.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_056.png
new file mode 100755
index 0000000000..900e33290f
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_056.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_057.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_057.png
new file mode 100755
index 0000000000..1241f9cf27
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_057.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_058.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_058.png
new file mode 100755
index 0000000000..d5323c16b4
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_058.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_059.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_059.png
new file mode 100755
index 0000000000..90426a0121
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_059.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_060.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_060.png
new file mode 100755
index 0000000000..d61e9f701a
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_060.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_061.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_061.png
new file mode 100755
index 0000000000..2eadc245ae
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_061.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_062.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_062.png
new file mode 100755
index 0000000000..10bd7483b3
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_062.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_063.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_063.png
new file mode 100755
index 0000000000..2e4e035cd3
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_063.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_064.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_064.png
new file mode 100755
index 0000000000..387c066ca8
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_064.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_065.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_065.png
new file mode 100755
index 0000000000..94a0203f8c
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_065.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_066.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_066.png
new file mode 100755
index 0000000000..e2c4aeaa24
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_066.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_067.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_067.png
new file mode 100755
index 0000000000..f64167c021
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_067.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_068.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_068.png
new file mode 100755
index 0000000000..58be1f4d67
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_068.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_069.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_069.png
new file mode 100755
index 0000000000..9109ac365f
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_069.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_070.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_070.png
new file mode 100755
index 0000000000..8f2f0a00f1
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_070.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_071.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_071.png
new file mode 100755
index 0000000000..618a65a474
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_071.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_072.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_072.png
new file mode 100755
index 0000000000..90f2503cb1
Binary files /dev/null and b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_warn_072.png differ
diff --git a/OCH/common/common/src/main/res/xiaozhi/layout/common_xiaozhi.xml b/OCH/common/common/src/main/res/xiaozhi/layout/common_xiaozhi.xml
new file mode 100644
index 0000000000..c2062785e1
--- /dev/null
+++ b/OCH/common/common/src/main/res/xiaozhi/layout/common_xiaozhi.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml b/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml
index 426fd62486..232e11c697 100644
--- a/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml
+++ b/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml
@@ -53,98 +53,98 @@
- - @drawable/charter_p_xiaozhi_think_00
- - @drawable/charter_p_xiaozhi_think_01
- - @drawable/charter_p_xiaozhi_think_02
- - @drawable/charter_p_xiaozhi_think_03
- - @drawable/charter_p_xiaozhi_think_04
- - @drawable/charter_p_xiaozhi_think_05
- - @drawable/charter_p_xiaozhi_think_06
- - @drawable/charter_p_xiaozhi_think_07
- - @drawable/charter_p_xiaozhi_think_08
- - @drawable/charter_p_xiaozhi_think_09
- - @drawable/charter_p_xiaozhi_think_10
- - @drawable/charter_p_xiaozhi_think_11
- - @drawable/charter_p_xiaozhi_think_12
- - @drawable/charter_p_xiaozhi_think_13
- - @drawable/charter_p_xiaozhi_think_14
- - @drawable/charter_p_xiaozhi_think_15
- - @drawable/charter_p_xiaozhi_think_16
- - @drawable/charter_p_xiaozhi_think_17
- - @drawable/charter_p_xiaozhi_think_18
- - @drawable/charter_p_xiaozhi_think_19
- - @drawable/charter_p_xiaozhi_think_20
- - @drawable/charter_p_xiaozhi_think_21
- - @drawable/charter_p_xiaozhi_think_22
- - @drawable/charter_p_xiaozhi_think_23
- - @drawable/charter_p_xiaozhi_think_24
- - @drawable/charter_p_xiaozhi_think_25
- - @drawable/charter_p_xiaozhi_think_26
- - @drawable/charter_p_xiaozhi_think_27
- - @drawable/charter_p_xiaozhi_think_28
- - @drawable/charter_p_xiaozhi_think_29
- - @drawable/charter_p_xiaozhi_think_30
- - @drawable/charter_p_xiaozhi_think_31
-
-
- - @drawable/charter_p_xiaozhi_think_34
- - @drawable/charter_p_xiaozhi_think_35
- - @drawable/charter_p_xiaozhi_think_36
- - @drawable/charter_p_xiaozhi_think_37
- - @drawable/charter_p_xiaozhi_think_38
- - @drawable/charter_p_xiaozhi_think_39
- - @drawable/charter_p_xiaozhi_think_40
- - @drawable/charter_p_xiaozhi_think_41
- - @drawable/charter_p_xiaozhi_think_42
- - @drawable/charter_p_xiaozhi_think_43
- - @drawable/charter_p_xiaozhi_think_44
- - @drawable/charter_p_xiaozhi_think_45
- - @drawable/charter_p_xiaozhi_think_46
- - @drawable/charter_p_xiaozhi_think_47
- - @drawable/charter_p_xiaozhi_think_48
- - @drawable/charter_p_xiaozhi_think_49
- - @drawable/charter_p_xiaozhi_think_50
- - @drawable/charter_p_xiaozhi_think_51
- - @drawable/charter_p_xiaozhi_think_52
- - @drawable/charter_p_xiaozhi_think_53
- - @drawable/charter_p_xiaozhi_think_54
- - @drawable/charter_p_xiaozhi_think_55
- - @drawable/charter_p_xiaozhi_think_56
- - @drawable/charter_p_xiaozhi_think_57
- - @drawable/charter_p_xiaozhi_think_58
- - @drawable/charter_p_xiaozhi_think_59
- - @drawable/charter_p_xiaozhi_think_60
- - @drawable/charter_p_xiaozhi_think_61
- - @drawable/charter_p_xiaozhi_think_62
- - @drawable/charter_p_xiaozhi_think_63
- - @drawable/charter_p_xiaozhi_think_64
- - @drawable/charter_p_xiaozhi_think_65
- - @drawable/charter_p_xiaozhi_think_66
- - @drawable/charter_p_xiaozhi_think_67
- - @drawable/charter_p_xiaozhi_think_68
- - @drawable/charter_p_xiaozhi_think_69
- - @drawable/charter_p_xiaozhi_think_70
- - @drawable/charter_p_xiaozhi_think_71
+ - @drawable/xiaozhi_think_00
+ - @drawable/xiaozhi_think_01
+ - @drawable/xiaozhi_think_02
+ - @drawable/xiaozhi_think_03
+ - @drawable/xiaozhi_think_04
+ - @drawable/xiaozhi_think_05
+ - @drawable/xiaozhi_think_06
+ - @drawable/xiaozhi_think_07
+ - @drawable/xiaozhi_think_08
+ - @drawable/xiaozhi_think_09
+ - @drawable/xiaozhi_think_10
+ - @drawable/xiaozhi_think_11
+ - @drawable/xiaozhi_think_12
+ - @drawable/xiaozhi_think_13
+ - @drawable/xiaozhi_think_14
+ - @drawable/xiaozhi_think_15
+ - @drawable/xiaozhi_think_16
+ - @drawable/xiaozhi_think_17
+ - @drawable/xiaozhi_think_18
+ - @drawable/xiaozhi_think_19
+ - @drawable/xiaozhi_think_20
+ - @drawable/xiaozhi_think_21
+ - @drawable/xiaozhi_think_22
+ - @drawable/xiaozhi_think_23
+ - @drawable/xiaozhi_think_24
+ - @drawable/xiaozhi_think_25
+ - @drawable/xiaozhi_think_26
+ - @drawable/xiaozhi_think_27
+ - @drawable/xiaozhi_think_28
+ - @drawable/xiaozhi_think_29
+ - @drawable/xiaozhi_think_30
+ - @drawable/xiaozhi_think_31
+
+ - @drawable/xiaozhi_warn_033
+ - @drawable/xiaozhi_think_34
+ - @drawable/xiaozhi_think_35
+ - @drawable/xiaozhi_think_36
+ - @drawable/xiaozhi_think_37
+ - @drawable/xiaozhi_think_38
+ - @drawable/xiaozhi_think_39
+ - @drawable/xiaozhi_think_40
+ - @drawable/xiaozhi_think_41
+ - @drawable/xiaozhi_think_42
+ - @drawable/xiaozhi_think_43
+ - @drawable/xiaozhi_think_44
+ - @drawable/xiaozhi_think_45
+ - @drawable/xiaozhi_think_46
+ - @drawable/xiaozhi_think_47
+ - @drawable/xiaozhi_think_48
+ - @drawable/xiaozhi_think_49
+ - @drawable/xiaozhi_think_50
+ - @drawable/xiaozhi_think_51
+ - @drawable/xiaozhi_think_52
+ - @drawable/xiaozhi_think_53
+ - @drawable/xiaozhi_think_54
+ - @drawable/xiaozhi_think_55
+ - @drawable/xiaozhi_think_56
+ - @drawable/xiaozhi_think_57
+ - @drawable/xiaozhi_think_58
+ - @drawable/xiaozhi_think_59
+ - @drawable/xiaozhi_think_60
+ - @drawable/xiaozhi_think_61
+ - @drawable/xiaozhi_think_62
+ - @drawable/xiaozhi_think_63
+ - @drawable/xiaozhi_think_64
+ - @drawable/xiaozhi_think_65
+ - @drawable/xiaozhi_think_66
+ - @drawable/xiaozhi_think_67
+ - @drawable/xiaozhi_think_68
+ - @drawable/xiaozhi_think_69
+ - @drawable/xiaozhi_think_70
+ - @drawable/xiaozhi_think_71
- - @drawable/charter_p_xiaozhi_think_normal_01
- - @drawable/charter_p_xiaozhi_think_normal_02
- - @drawable/charter_p_xiaozhi_think_normal_03
- - @drawable/charter_p_xiaozhi_think_normal_04
- - @drawable/charter_p_xiaozhi_think_normal_05
- - @drawable/charter_p_xiaozhi_think_normal_06
- - @drawable/charter_p_xiaozhi_think_normal_07
- - @drawable/charter_p_xiaozhi_think_normal_08
- - @drawable/charter_p_xiaozhi_think_normal_09
- - @drawable/charter_p_xiaozhi_think_normal_10
- - @drawable/charter_p_xiaozhi_think_normal_11
- - @drawable/charter_p_xiaozhi_think_normal_12
- - @drawable/charter_p_xiaozhi_think_normal_13
- - @drawable/charter_p_xiaozhi_think_normal_14
- - @drawable/charter_p_xiaozhi_think_normal_15
- - @drawable/charter_p_xiaozhi_think_normal_16
- - @drawable/charter_p_xiaozhi_think_normal_17
+ - @drawable/xiaozhi_think_normal_01
+ - @drawable/xiaozhi_think_normal_02
+ - @drawable/xiaozhi_think_normal_03
+ - @drawable/xiaozhi_think_normal_04
+ - @drawable/xiaozhi_think_normal_05
+ - @drawable/xiaozhi_think_normal_06
+ - @drawable/xiaozhi_think_normal_07
+ - @drawable/xiaozhi_think_normal_08
+ - @drawable/xiaozhi_think_normal_09
+ - @drawable/xiaozhi_think_normal_10
+ - @drawable/xiaozhi_think_normal_11
+ - @drawable/xiaozhi_think_normal_12
+ - @drawable/xiaozhi_think_normal_13
+ - @drawable/xiaozhi_think_normal_14
+ - @drawable/xiaozhi_think_normal_15
+ - @drawable/xiaozhi_think_normal_16
+ - @drawable/xiaozhi_think_normal_17
@@ -317,4 +317,101 @@
+
+ - @drawable/xiaozhi_warn_000
+ - @drawable/xiaozhi_warn_001
+ - @drawable/xiaozhi_warn_002
+ - @drawable/xiaozhi_warn_003
+ - @drawable/xiaozhi_warn_004
+ - @drawable/xiaozhi_warn_005
+ - @drawable/xiaozhi_warn_006
+ - @drawable/xiaozhi_warn_007
+ - @drawable/xiaozhi_warn_008
+ - @drawable/xiaozhi_warn_009
+ - @drawable/xiaozhi_warn_010
+ - @drawable/xiaozhi_warn_011
+ - @drawable/xiaozhi_warn_012
+ - @drawable/xiaozhi_warn_013
+ - @drawable/xiaozhi_warn_014
+ - @drawable/xiaozhi_warn_015
+ - @drawable/xiaozhi_warn_016
+ - @drawable/xiaozhi_warn_017
+ - @drawable/xiaozhi_warn_018
+ - @drawable/xiaozhi_warn_019
+ - @drawable/xiaozhi_warn_020
+ - @drawable/xiaozhi_warn_021
+ - @drawable/xiaozhi_warn_022
+ - @drawable/xiaozhi_warn_023
+ - @drawable/xiaozhi_warn_024
+ - @drawable/xiaozhi_warn_025
+ - @drawable/xiaozhi_warn_026
+ - @drawable/xiaozhi_warn_027
+ - @drawable/xiaozhi_warn_028
+ - @drawable/xiaozhi_warn_029
+ - @drawable/xiaozhi_warn_030
+ - @drawable/xiaozhi_warn_031
+ - @drawable/xiaozhi_warn_032
+ - @drawable/xiaozhi_warn_033
+ - @drawable/xiaozhi_warn_034
+ - @drawable/xiaozhi_warn_035
+ - @drawable/xiaozhi_warn_036
+ - @drawable/xiaozhi_warn_037
+ - @drawable/xiaozhi_warn_038
+ - @drawable/xiaozhi_warn_039
+ - @drawable/xiaozhi_warn_040
+ - @drawable/xiaozhi_warn_041
+ - @drawable/xiaozhi_warn_042
+ - @drawable/xiaozhi_warn_043
+ - @drawable/xiaozhi_warn_044
+ - @drawable/xiaozhi_warn_045
+ - @drawable/xiaozhi_warn_046
+ - @drawable/xiaozhi_warn_047
+ - @drawable/xiaozhi_warn_048
+ - @drawable/xiaozhi_warn_049
+ - @drawable/xiaozhi_warn_050
+ - @drawable/xiaozhi_warn_051
+ - @drawable/xiaozhi_warn_052
+ - @drawable/xiaozhi_warn_053
+ - @drawable/xiaozhi_warn_054
+ - @drawable/xiaozhi_warn_055
+ - @drawable/xiaozhi_warn_056
+ - @drawable/xiaozhi_warn_057
+ - @drawable/xiaozhi_warn_058
+ - @drawable/xiaozhi_warn_059
+ - @drawable/xiaozhi_warn_060
+ - @drawable/xiaozhi_warn_061
+ - @drawable/xiaozhi_warn_062
+ - @drawable/xiaozhi_warn_063
+ - @drawable/xiaozhi_warn_064
+ - @drawable/xiaozhi_warn_065
+ - @drawable/xiaozhi_warn_066
+ - @drawable/xiaozhi_warn_067
+ - @drawable/xiaozhi_warn_068
+ - @drawable/xiaozhi_warn_069
+ - @drawable/xiaozhi_warn_070
+ - @drawable/xiaozhi_warn_071
+ - @drawable/xiaozhi_warn_072
+
+
+
+ - @drawable/xiaozhi_normal_warn_000
+ - @drawable/xiaozhi_normal_warn_001
+ - @drawable/xiaozhi_normal_warn_002
+ - @drawable/xiaozhi_normal_warn_003
+ - @drawable/xiaozhi_normal_warn_004
+ - @drawable/xiaozhi_normal_warn_005
+ - @drawable/xiaozhi_normal_warn_006
+ - @drawable/xiaozhi_normal_warn_007
+ - @drawable/xiaozhi_normal_warn_008
+ - @drawable/xiaozhi_normal_warn_009
+ - @drawable/xiaozhi_normal_warn_010
+ - @drawable/xiaozhi_normal_warn_011
+ - @drawable/xiaozhi_normal_warn_012
+ - @drawable/xiaozhi_normal_warn_013
+ - @drawable/xiaozhi_normal_warn_014
+ - @drawable/xiaozhi_normal_warn_015
+ - @drawable/xiaozhi_normal_warn_016
+ - @drawable/xiaozhi_normal_warn_017
+
+
\ No newline at end of file
diff --git a/app/config/MusicUrlConfig.json b/app/config/MusicUrlConfig.json
index f1a854552e..ea54d8c5cc 100644
--- a/app/config/MusicUrlConfig.json
+++ b/app/config/MusicUrlConfig.json
@@ -8,8 +8,8 @@
"songName": "钢琴曲",
"songUrl": "android.resource://com.mogo.launcher.f/raw/piano_music.mp3",
"songUrlType": "local",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
- "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
+ "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
"tag": [
"放松"
]
@@ -20,7 +20,7 @@
"songName": "唯美的梦",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523329643/beautiful_dream.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"放松"
@@ -32,7 +32,7 @@
"songName": "有趣的时光",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523382842/fun_times.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718256470/taxt_p_music_head_03.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406527579/taxt_p_music_head_03.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718184532/taxt_p_music_bottom_03.png",
"tag": [
"欢快"
@@ -44,7 +44,7 @@
"songName": "游乐场",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523484705/playground_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"欢快"
@@ -56,7 +56,7 @@
"songName": "鼓舞我",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523537118/uplift_me.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -68,7 +68,7 @@
"songName": "假日乐趣",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523604653/summer_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -80,7 +80,7 @@
"songName": "伟大梦想",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523656707/dreaming_big.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"浪漫"
@@ -92,7 +92,7 @@
"songName": "钢琴映像",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523740974/piano_reflections.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"浪漫"
@@ -104,7 +104,7 @@
"songName": "宁静的景色",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523785714/serene_view.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"静谧"
@@ -116,7 +116,7 @@
"songName": "困倦小猫",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523857450/sleepy_cat.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"静谧"
@@ -132,8 +132,8 @@
"songName": "钢琴曲",
"songUrl": "android.resource://com.mogo.launcher.f/raw/piano_music.mp3",
"songUrlType": "local",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
- "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
+ "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
"tag": [
"放松"
]
@@ -144,7 +144,7 @@
"songName": "唯美的梦",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523329643/beautiful_dream.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"放松"
@@ -156,7 +156,7 @@
"songName": "有趣的时光",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523382842/fun_times.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718256470/taxt_p_music_head_03.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406527579/taxt_p_music_head_03.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718184532/taxt_p_music_bottom_03.png",
"tag": [
"欢快"
@@ -168,7 +168,7 @@
"songName": "游乐场",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523484705/playground_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"欢快"
@@ -180,7 +180,7 @@
"songName": "鼓舞我",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523537118/uplift_me.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -192,7 +192,7 @@
"songName": "假日乐趣",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523604653/summer_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -204,7 +204,7 @@
"songName": "伟大梦想",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523656707/dreaming_big.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"浪漫"
@@ -216,7 +216,7 @@
"songName": "钢琴映像",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523740974/piano_reflections.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"浪漫"
@@ -228,7 +228,7 @@
"songName": "宁静的景色",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523785714/serene_view.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"静谧"
@@ -240,7 +240,7 @@
"songName": "困倦小猫",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523857450/sleepy_cat.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"静谧"
@@ -258,8 +258,8 @@
"songName": "钢琴曲",
"songUrl": "android.resource://com.mogo.launcher.f/raw/piano_music.mp3",
"songUrlType": "local",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
- "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
+ "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
"tag": [
"放松"
]
@@ -270,7 +270,7 @@
"songName": "唯美的梦",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523329643/beautiful_dream.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"放松"
@@ -282,7 +282,7 @@
"songName": "有趣的时光",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523382842/fun_times.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718256470/taxt_p_music_head_03.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406527579/taxt_p_music_head_03.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718184532/taxt_p_music_bottom_03.png",
"tag": [
"欢快"
@@ -294,7 +294,7 @@
"songName": "游乐场",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523484705/playground_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"欢快"
@@ -306,7 +306,7 @@
"songName": "鼓舞我",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523537118/uplift_me.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -318,7 +318,7 @@
"songName": "假日乐趣",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523604653/summer_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -330,7 +330,7 @@
"songName": "伟大梦想",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523656707/dreaming_big.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"浪漫"
@@ -342,7 +342,7 @@
"songName": "钢琴映像",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523740974/piano_reflections.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"浪漫"
@@ -354,7 +354,7 @@
"songName": "宁静的景色",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523785714/serene_view.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"静谧"
@@ -366,7 +366,7 @@
"songName": "困倦小猫",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523857450/sleepy_cat.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"静谧"
@@ -384,8 +384,8 @@
"songName": "钢琴曲",
"songUrl": "android.resource://com.mogo.launcher.f/raw/piano_music.mp3",
"songUrlType": "local",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
- "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
+ "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
"tag": [
"放松"
]
@@ -396,7 +396,7 @@
"songName": "唯美的梦",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523329643/beautiful_dream.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"放松"
@@ -408,7 +408,7 @@
"songName": "有趣的时光",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523382842/fun_times.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718256470/taxt_p_music_head_03.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406527579/taxt_p_music_head_03.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718184532/taxt_p_music_bottom_03.png",
"tag": [
"欢快"
@@ -420,7 +420,7 @@
"songName": "游乐场",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523484705/playground_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"欢快"
@@ -432,7 +432,7 @@
"songName": "鼓舞我",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523537118/uplift_me.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -444,7 +444,7 @@
"songName": "假日乐趣",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523604653/summer_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -456,7 +456,7 @@
"songName": "伟大梦想",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523656707/dreaming_big.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"浪漫"
@@ -468,7 +468,7 @@
"songName": "钢琴映像",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523740974/piano_reflections.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"浪漫"
@@ -480,7 +480,7 @@
"songName": "宁静的景色",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523785714/serene_view.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"静谧"
@@ -492,7 +492,7 @@
"songName": "困倦小猫",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523857450/sleepy_cat.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"静谧"
@@ -510,8 +510,8 @@
"songName": "钢琴曲",
"songUrl": "android.resource://com.mogo.launcher.f/raw/piano_music.mp3",
"songUrlType": "local",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
- "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
+ "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
"tag": [
"放松"
]
@@ -522,7 +522,7 @@
"songName": "唯美的梦",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523329643/beautiful_dream.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"放松"
@@ -534,7 +534,7 @@
"songName": "有趣的时光",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523382842/fun_times.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718256470/taxt_p_music_head_03.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406527579/taxt_p_music_head_03.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718184532/taxt_p_music_bottom_03.png",
"tag": [
"欢快"
@@ -546,7 +546,7 @@
"songName": "游乐场",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523484705/playground_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"欢快"
@@ -558,7 +558,7 @@
"songName": "鼓舞我",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523537118/uplift_me.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -570,7 +570,7 @@
"songName": "假日乐趣",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523604653/summer_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -582,7 +582,7 @@
"songName": "伟大梦想",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523656707/dreaming_big.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"浪漫"
@@ -594,7 +594,7 @@
"songName": "钢琴映像",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523740974/piano_reflections.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"浪漫"
@@ -606,7 +606,7 @@
"songName": "宁静的景色",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523785714/serene_view.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"静谧"
@@ -618,7 +618,7 @@
"songName": "困倦小猫",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523857450/sleepy_cat.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"静谧"
@@ -634,8 +634,8 @@
"songName": "钢琴曲",
"songUrl": "android.resource://com.mogo.launcher.f/raw/piano_music.mp3",
"songUrlType": "local",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
- "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718285436/taxt_p_music_head_05.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
+ "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png",
"tag": [
"放松"
]
@@ -646,7 +646,7 @@
"songName": "唯美的梦",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523329643/beautiful_dream.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"放松"
@@ -658,7 +658,7 @@
"songName": "有趣的时光",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523382842/fun_times.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718256470/taxt_p_music_head_03.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406527579/taxt_p_music_head_03.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718184532/taxt_p_music_bottom_03.png",
"tag": [
"欢快"
@@ -670,7 +670,7 @@
"songName": "游乐场",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523484705/playground_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"欢快"
@@ -682,7 +682,7 @@
"songName": "鼓舞我",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523537118/uplift_me.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -694,7 +694,7 @@
"songName": "假日乐趣",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523604653/summer_fun.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"动感"
@@ -706,7 +706,7 @@
"songName": "伟大梦想",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523656707/dreaming_big.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"浪漫"
@@ -718,7 +718,7 @@
"songName": "钢琴映像",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523740974/piano_reflections.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718241926/taxt_p_music_head_02.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406513029/taxt_p_music_head_02.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718167794/taxt_p_music_bottom_02.png",
"tag": [
"浪漫"
@@ -730,7 +730,7 @@
"songName": "宁静的景色",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523785714/serene_view.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718271475/taxt_p_music_head_04.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406541992/taxt_p_music_head_04.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718199388/taxt_p_music_bottom_04.png",
"tag": [
"静谧"
@@ -742,7 +742,7 @@
"songName": "困倦小猫",
"songUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709523857450/sleepy_cat.mp3",
"songUrlType": "cloud",
- "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718228949/taxt_p_music_head_01.png",
+ "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406495491/taxt_p_music_head_01.png",
"coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718149545/taxt_p_music_bottom_01.png",
"tag": [
"静谧"