diff --git a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml index 2944a93384..df3f1b67b0 100644 --- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml @@ -137,7 +137,7 @@ android:layout_height="@dimen/dp_30"/> - - {// 进入默认状态 + CallerLogger.d(TAG,"正在静默状态") + ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni) + } + ZhiRecordWinUi.RecordStatus.STATUS_LISTENING -> {// 正在监听唤醒人说话 + CallerLogger.d(TAG,"正在监听唤醒人说话") + ZhiViewmanager.showListeningAni(ZhiViewmanager.listenerAni) + } + ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTANDING -> {// 小智正在理解中 + CallerLogger.d(TAG,"正在理解") + } + ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTAND_END -> {// 理解完毕 + CallerLogger.d(TAG,"理解结束") + } + ZhiRecordWinUi.RecordStatus.STATUS_SPEAKING -> {// 小智正在说话 + CallerLogger.d(TAG,"小智正在说话") + ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni) + } + else -> { + + } + } + + + } + + /** + * 关闭对话 + * @param trigger 是否手动 + */ + override fun close(trigger: Boolean) { + CallerLogger.d(TAG,"-----close $trigger") + onStatusChange(ZhiRecordWinUi.RecordStatus.STATUS_SILENCE) + val msg = VoiceMsg( + isWakeUp = false, + isWakeUpEnd = true, + msg = null, + isLastMsg = true, + isResp = true + ) + pushMsgBox(msg) + } + + /** + * 语音输入音量变化 + * + * @param volume + */ + override fun onVolumeChange(volume: Int) { + CallerLogger.d(TAG,"-----onVolumeChange $volume") + } + + /** + * 显示用户输入的内容 + * + * @param asrTextBean + */ + override fun showInputText(asrTextBean: AsrTextBean?) { + CallerLogger.d(TAG,"-----showInputText $asrTextBean") + asrTextBean.let { + val msg = VoiceMsg( + isWakeUp = false, + isWakeUpEnd = false, + msg = it?.text, + isLastMsg = it?.isLast == true, + isResp = false + ) + pushMsgBox(msg) + } + } + + /** + * 显示控件 暂时没有需求 + * + * @param callbackWidget + */ + override fun showOutPutWidget(callbackWidget: CallbackWidget?) { + // todo 咱不支持定制显示 包括天气 + CallerLogger.d(TAG,"-----showOutPutWidget $callbackWidget") + } + /** + * 显示系统输出内容 + * + * @param outPutText + */ + override fun showOutputText(outPutText: String?) { + CallerLogger.d(TAG,"-----showOutputText $outPutText") + outPutText?.let { + val msg = VoiceMsg( + isWakeUp = false, + isWakeUpEnd = false, + msg = it, + isLastMsg = false, + isResp = true + ) + pushMsgBox(msg) + } + } + + + fun setZhiEnable(enable:Boolean){ + if(enable){// 可用 + enableZhi.set(true) + AvatarManager.enableXiaoZhi(false) + }else{// 不可用 + enableZhi.set(false) + AvatarManager.enableXiaoZhi(true) + } + } + + fun weakUpXiaoZhi(){ + if (!AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { + return + } + if (!isFastClick()) { + ToastCharterUtils.showToastShort("请稍后唤醒") + return + } + if (PermissionUtil.checkPermission(AbsMogoApplication.getApp(), Manifest.permission.RECORD_AUDIO)) { + if(enableZhi.get()) { + AvatarManager.wakeupXiaoZhi() + } + }else{ + //申请悬浮窗权限 + val shouldShowRequestPermissionRationale = ActivityUtils.getTopActivity() + .shouldShowRequestPermissionRationale(Manifest.permission.RECORD_AUDIO) + if(shouldShowRequestPermissionRationale){// 可以弹窗系统权限框 + ActivityCompat.requestPermissions( + ActivityUtils.getTopActivity(), + arrayOf( + Manifest.permission.RECORD_AUDIO, + ), MainPresenter.MOGO_PERMISSION_REQUEST_CODE + ) + }else{// 不会弹系统弹窗 + PermissionsDialogUtils.openAppDetails(ActivityUtils.getTopActivity(), "录音机", 100) + } + + } + } + + // 两次点击按钮之间的点击间隔不能少于1000毫秒 + private const val MIN_CLICK_DELAY_TIME = 3000 + private var lastClickTime: Long = 0 + + private fun isFastClick(): Boolean { + var flag = false + val curClickTime = System.currentTimeMillis() + if (curClickTime - lastClickTime >= MIN_CLICK_DELAY_TIME) { + flag = true + } + lastClickTime = curClickTime + return flag + } + + + private fun pushMsgBox(msg: VoiceMsg){ + CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.VOICE, msg)) + } + + + +} \ 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 new file mode 100644 index 0000000000..39baa196b7 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiView.kt @@ -0,0 +1,73 @@ +package com.mogo.och.common.module.manager.xiaozhimanager + +import android.content.Context +import android.util.AttributeSet +import androidx.appcompat.widget.AppCompatImageView +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.common.module.utils.FrameAnimatorContainer +import com.mogo.tts.base.zhi.CallbackWidget +import com.mogo.tts.base.zhi.ZhiRecordWinUi +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 { + companion object { + const val TAG = "ZhiView" + } + + // 播放默认小智 + // 传递播放一次的动画 + // 传递开始播放 + + private var currentAnim:FrameAnimatorContainer? = null + + init { + setOnClickListener { + ZhiStateManager.weakUpXiaoZhi() + } + } + + override fun setFirstPlayAni(initAni: ZhiViewmanager.AniData,aniListener:FrameAnimatorContainer.OnAnimationStoppedListener){ + currentAnim = FrameAnimatorContainer(initAni.aniArrayId, 12,this) + currentAnim?.isOnce = initAni.isOnce + currentAnim?.sequence = initAni.sequence + currentAnim?.setFtp(initAni.fps) + currentAnim?.setOnAnimStopListener(aniListener) + currentAnim?.reStart() + } + + override fun setNewPlayData(currentPalyingAni: ZhiViewmanager.AniData) { + currentAnim?.setData(currentPalyingAni.aniList) + currentAnim?.isOnce = currentPalyingAni.isOnce + currentAnim?.sequence = currentPalyingAni.sequence + currentAnim?.setFtp(currentPalyingAni.fps) + } + + override fun changeAniImmediately(currentPalyingAni: ZhiViewmanager.AniData) { + currentAnim?.setData(currentPalyingAni.aniList) + currentAnim?.isOnce = currentPalyingAni.isOnce + currentAnim?.sequence = currentPalyingAni.sequence + currentAnim?.setFtp(currentPalyingAni.fps) + currentAnim?.reStart() + } + + + override fun restartAni() { + currentAnim?.reStart() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + ZhiViewmanager.addDistanceListener(this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + ZhiViewmanager.removeListener() + } + +} 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 new file mode 100644 index 0000000000..cbc5d9cfe8 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt @@ -0,0 +1,137 @@ +package com.mogo.och.common.module.manager.xiaozhimanager + +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 java.util.concurrent.ArrayBlockingQueue + +object ZhiViewmanager { + + private const val TAG = "ZhiViewmanager" + + private var iViewCallbacks: IViewCallback? = null + + val normalAni = AniData(1, R.array.xiaozhi_normal, false, true,true,12) + val listenerAni = AniData(2,R.array.xiaozhi_think,false,true,true,12) + + val listener2Normal = AniData(3, R.array.xiaozhi_think_normal, true, false,true,24) + val normal2Listener = AniData(4, R.array.xiaozhi_think_normal, true, true,true,24) + + val beltAni = AniData(5, R.array.xiaozhi_belt, false, true,true,12) + val loveAni = AniData(6, R.array.xiaozhi_love, false, true,true,12) + + private var initAni = normalAni + private var currentAni: AniData? = null + + private val readQueue = ArrayBlockingQueue(8, true) + + + fun addDistanceListener(listener: IViewCallback) { + this.iViewCallbacks = listener + this.currentAni = initAni + listener.setFirstPlayAni(initAni, + object : FrameAnimatorContainer.OnAnimationStoppedListener { + override fun playOnce() { + CallerLogger.d(TAG, "播放完一遍动画") + var nextPlay = readQueue.poll() + CallerLogger.d(TAG, "获取下一个动画${Thread.currentThread().name}--${nextPlay?.id}-${readQueue.size}") + if(nextPlay == currentAni){ + return + } + if(nextPlay==null){ + if(currentAni?.isOnce==true) { + // 没有设置新的动画 且上一个动画是直播一次的动画 + currentAni = initAni + iViewCallbacks?.setNewPlayData(initAni) + }else{ + // 没有设置新的动画 且上一个动画时循环动画 + return + } + }else{ + // 有设置新的动画 + currentAni = nextPlay + CallerLogger.d(TAG, "切换动画${nextPlay.id}") + iViewCallbacks?.setNewPlayData(nextPlay) + } + } + + override fun AnimationStopped() { + CallerLogger.d(TAG, "动画停止") + listener.restartAni() + } + }) + } + + fun removeListener() { + iViewCallbacks = null + } + + fun showListeningAni(aniData: AniData) { + var lastAni = readQueue.peek() + if(lastAni==null){ + lastAni = currentAni + } + if(lastAni?.id==aniData.id){ + return + } + when (lastAni?.id) { + 1 -> {//正在播放默认动画 + if(aniData.id==2){ + iViewCallbacks?.changeAniImmediately(normal2Listener) + currentAni = normal2Listener + CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${normal2Listener.id}-${readQueue.size}") + readQueue.offer(aniData) + CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}") + }else{ + iViewCallbacks?.changeAniImmediately(aniData) + currentAni = aniData + CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}") + } + } + 2 -> {// 正在播放倾听中动画 + if(aniData.id==1){ + iViewCallbacks?.changeAniImmediately(listener2Normal) + currentAni = listener2Normal + CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${listener2Normal.id}-${readQueue.size}") + readQueue.offer(aniData) + CallerLogger.d(TAG, "排队播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}") + }else{ + iViewCallbacks?.changeAniImmediately(aniData) + currentAni = aniData + CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}") + } + } + + else -> { + iViewCallbacks?.changeAniImmediately(aniData) + currentAni = aniData + CallerLogger.d(TAG, "立刻播放${Thread.currentThread().name}--${aniData.id}-${readQueue.size}") + } + } + + } + + + interface IViewCallback { + fun setFirstPlayAni( + currentPalyingAni: AniData, + aniListener: FrameAnimatorContainer.OnAnimationStoppedListener + ) + + fun setNewPlayData(currentPalyingAni: AniData) + fun changeAniImmediately(currentPalyingAni: AniData) + fun restartAni() + } + + data class AniData( + val id: Int,// 动画ID + val aniArrayId: Int,// 动画序列号 + val isOnce: Boolean,// true 只播一次 false 循环播放 + val sequence: Boolean,// true 正向播放 false 倒着播放 + val immediately:Boolean, + val fps:Int + ) { + var aniList = FrameAnimatorContainer.getData(aniArrayId) + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt index 82c809d15d..c44d685aa0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt @@ -33,6 +33,24 @@ class FrameAnimatorContainer (resId: Int, var isOnce:Boolean = false var sequence:Boolean = true + fun setFtp(fps:Int){ + mDelayMillis = 1000 / fps + } + + companion object{ + fun getData(resId: Int): IntArray { + val array = AbsMogoApplication.getApp().resources.obtainTypedArray(resId) + val len = array.length() + val intArray = IntArray(array.length()) + for (i in 0 until len) { + intArray[i] = array.getResourceId(i, 0) + } + array.recycle() + return intArray + } + + } + init { createAnimation(imageView, getData(resId), fps,initFirstFrame,width,height) this.isOnce = isOnce @@ -87,16 +105,24 @@ class FrameAnimatorContainer (resId: Int, private val next: Int get() { mIndex++ + var isPlayOnce = false if (mIndex >= mFrames.size){ mIndex = 0 if(isOnce){// 一次性动画 播放完毕后直接结束 stop() } + isPlayOnce = true + } - if(!sequence){// 倒叙 - return mFrames[mFrames.size-1-mIndex] + val nextInfo= if(sequence){// 倒叙 + mFrames[mIndex] + }else{ + mFrames[mFrames.size-1-mIndex] } - return mFrames[mIndex] + if(isPlayOnce){// 锁定nextInfo 在回调中可能会修改mFrames值 + mOnAnimationStoppedListener?.playOnce() + } + return nextInfo } @Synchronized @@ -120,9 +146,8 @@ class FrameAnimatorContainer (resId: Int, val imageView = mSoftReferenceImageView!!.get() if (!mShouldRun || imageView == null) { mIsRunning = false - if (mOnAnimationStoppedListener != null) { - mOnAnimationStoppedListener!!.AnimationStopped() - } + mOnAnimationStoppedListener?.AnimationStopped() + Logger.d(TAG, "结束动画1") return } mIsRunning = true @@ -131,9 +156,8 @@ class FrameAnimatorContainer (resId: Int, val imageRes: Int = next if (!mShouldRun || imageView == null) { mIsRunning = false - if (mOnAnimationStoppedListener != null) { - mOnAnimationStoppedListener!!.AnimationStopped() - } + mOnAnimationStoppedListener?.AnimationStopped() + Logger.d(TAG, "结束动画2") return } mHandler?.postDelayed(this, mDelayMillis.toLong()) @@ -195,16 +219,6 @@ class FrameAnimatorContainer (resId: Int, * @param resId * @return */ - fun getData(resId: Int): IntArray { - val array = AbsMogoApplication.getApp().resources.obtainTypedArray(resId) - val len = array.length() - val intArray = IntArray(array.length()) - for (i in 0 until len) { - intArray[i] = array.getResourceId(i, 0) - } - array.recycle() - return intArray - } fun setData(mFrames: IntArray){ this.mFrames = mFrames @@ -215,5 +229,6 @@ class FrameAnimatorContainer (resId: Int, */ interface OnAnimationStoppedListener { fun AnimationStopped() + fun playOnce(){} } } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt index d3a188508e..1efe8ef10b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt @@ -24,7 +24,13 @@ object VoiceNotice { } @JvmStatic - fun showNotice(notice: String?, level: Int, delayed: Long = 0) { + fun showNotice(notice: String?, delayed: Long,callback:IMogoTTSCallback ) { + showNotice(notice, AIAssist.LEVEL0, delayed,callback) + } + + + @JvmStatic + fun showNotice(notice: String?, level: Int, delayed: Long = 0,callback:IMogoTTSCallback?=null) { notice?.let { if (delayed == 0L) { UiThreadHandler.post { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt deleted file mode 100644 index 182dc21e52..0000000000 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt +++ /dev/null @@ -1,281 +0,0 @@ -package com.mogo.och.common.module.wigets - -import android.Manifest -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import androidx.appcompat.widget.AppCompatImageView -import androidx.core.app.ActivityCompat -import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.data.msgbox.MsgBoxType -import com.mogo.eagle.core.data.msgbox.VoiceMsg -import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager -import com.mogo.eagle.core.function.main.MainPresenter -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -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.mogo.permissions.PermissionsDialogUtils -import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.eagle.core.utilcode.util.ClickUtils -import com.mogo.och.common.module.R -import com.mogo.och.common.module.utils.FrameAnimatorContainer -import com.mogo.och.common.module.utils.PermissionUtil -import com.mogo.och.common.module.wigets.toast.ToastCharterUtils -import com.mogo.tts.base.zhi.AsrTextBean -import com.mogo.tts.base.zhi.AvatarManager -import com.mogo.tts.base.zhi.CallbackWidget -import com.mogo.tts.base.zhi.ZhiRecordWinUi -import java.util.concurrent.atomic.AtomicBoolean - -class ZhiView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : AppCompatImageView(context, attrs, defStyleAttr), - ZhiRecordWinUi { - companion object { - const val TAG = "ZhiView" - } - - private var currentAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 12,this) - - @Volatile - private var status = ZhiRecordWinUi.RecordStatus.STATUS_SILENCE - private var animalState = AnimalState.Normal - private val enableZhi = AtomicBoolean(true) - init { - val xiaozhiNormal = currentAnim.getData(R.array.xiaozhi_normal) - val xiaozhiThink = currentAnim.getData(R.array.xiaozhi_think) - val xiaozhiThinkNormal = currentAnim.getData(R.array.xiaozhi_think_normal) - currentAnim.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ - override fun AnimationStopped() { - when (status) { - ZhiRecordWinUi.RecordStatus.STATUS_SILENCE -> { - if(animalState==AnimalState.SPEAK){ - currentAnim.setData(xiaozhiThinkNormal) - currentAnim.isOnce = true - currentAnim.sequence = false - currentAnim.reStart() - animalState = AnimalState.NORMAL_SPEAK - CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "动画$status speak to normal") - }else{ - currentAnim.setData(xiaozhiNormal) - currentAnim.isOnce = false - currentAnim.sequence = true - currentAnim.reStart() - animalState = AnimalState.Normal - CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "动画$status normal") - } - } - ZhiRecordWinUi.RecordStatus.STATUS_LISTENING -> { - if(animalState==AnimalState.Normal){ - currentAnim.setData(xiaozhiThinkNormal) - currentAnim.isOnce = true - currentAnim.sequence = true - currentAnim.reStart() - animalState = AnimalState.NORMAL_SPEAK - CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "动画$status normal to speak") - }else{ - currentAnim.setData(xiaozhiThink) - currentAnim.isOnce = false - currentAnim.sequence = true - currentAnim.reStart() - animalState = AnimalState.SPEAK - CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "动画$status speak") - } - } - ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTANDING -> {} - ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTAND_END -> {} - ZhiRecordWinUi.RecordStatus.STATUS_SPEAKING -> { - if(animalState==AnimalState.SPEAK){ - currentAnim.setData(xiaozhiThinkNormal) - currentAnim.isOnce = true - currentAnim.sequence = false - currentAnim.reStart() - animalState = AnimalState.NORMAL_SPEAK - CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "动画$status speak to normal") - }else{ - currentAnim.setData(xiaozhiNormal) - currentAnim.isOnce = false - currentAnim.sequence = true - currentAnim.reStart() - animalState = AnimalState.Normal - CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "动画$status normal") - } - - } - } - } - }) - - setOnClickListener { - if (!AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { - return@setOnClickListener - } - if (ClickUtils.isClickTooFrequent(this,3000)) { - ToastCharterUtils.showToastShort("请稍后唤醒") - return@setOnClickListener - } - if (PermissionUtil.checkPermission(context,Manifest.permission.RECORD_AUDIO)) { - if(enableZhi.get()) { - AvatarManager.wakeupXiaoZhi() - } - }else{ - //申请悬浮窗权限 - val shouldShowRequestPermissionRationale = ActivityUtils.getTopActivity() - .shouldShowRequestPermissionRationale(Manifest.permission.RECORD_AUDIO) - if(shouldShowRequestPermissionRationale){// 可以弹窗系统权限框 - ActivityCompat.requestPermissions(ActivityUtils.getTopActivity(), - arrayOf( - Manifest.permission.RECORD_AUDIO, - ), MainPresenter.MOGO_PERMISSION_REQUEST_CODE - ) - }else{// 不会弹系统弹窗 - PermissionsDialogUtils.openAppDetails(ActivityUtils.getTopActivity(), "录音机", 100) - } - - } - } - } - - fun setZhiEnable(enable:Boolean){ - if(enable){// 可用 - enableZhi.set(true) - AvatarManager.enableXiaoZhi(false) - }else{// 不可用 - enableZhi.set(false) - AvatarManager.enableXiaoZhi(true) - } - } - - override fun onWindowFocusChanged(hasWindowFocus: Boolean) { - super.onWindowFocusChanged(hasWindowFocus) - CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "焦点与否：${hasWindowFocus}") - AvatarManager.enableXiaoZhi(!hasWindowFocus) - if(hasWindowFocus){ - currentAnim.reStart() - }else{ - currentAnim.stop() - } - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - AvatarManager.addDistanceListener(TAG,this) - currentAnim.reStart() - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - AvatarManager.removeListener(TAG) - } - - override fun start(reason: String?) { - CallerLogger.d(TAG,"-----start $reason") - } - - override fun onStatusChange(status: ZhiRecordWinUi.RecordStatus?) { - CallerLogger.d(TAG,"-----onStatusChange $status") - this.status = status?:ZhiRecordWinUi.RecordStatus.STATUS_SILENCE - when (status) { - ZhiRecordWinUi.RecordStatus.STATUS_SILENCE -> { - currentAnim.stop() - } - ZhiRecordWinUi.RecordStatus.STATUS_LISTENING -> {// 监听中 - currentAnim.stop() - } - ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTANDING -> { - // 正在理解 - CallerLogger.d(TAG,"正在理解") - } - ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTAND_END -> { - CallerLogger.d(TAG,"理解结束") - } - ZhiRecordWinUi.RecordStatus.STATUS_SPEAKING -> { - // 正在说话 - currentAnim.stop() - } - else -> { - - } - } - - - - - } - - override fun close(trigger: Boolean) { - CallerLogger.d(TAG,"-----close $trigger") - onStatusChange(ZhiRecordWinUi.RecordStatus.STATUS_SILENCE) - val msg = VoiceMsg( - isWakeUp = false, - isWakeUpEnd = true, - msg = null, - isLastMsg = true, - isResp = true - ) - pushMsgBox(msg) - } - - - override fun onVolumeChange(volume: Int) { - CallerLogger.d(TAG,"-----onVolumeChange $volume") - } - - /** - * 用户输入的 - */ - override fun showInputText(asrTextBean: AsrTextBean?) { - CallerLogger.d(TAG,"-----showInputText $asrTextBean") - asrTextBean.let { - val msg = VoiceMsg( - isWakeUp = false, - isWakeUpEnd = false, - msg = it?.text, - isLastMsg = it?.isLast == true, - isResp = false - ) - pushMsgBox(msg) - } - } - - /** - * 特定View - */ - override fun showOutPutWidget(callbackWidget: CallbackWidget?) { - // todo 咱不支持定制显示 包括天气 - CallerLogger.d(TAG,"-----showOutPutWidget $callbackWidget") - } - - /** - * 小智说的 - */ - override fun showOutputText(outPutText: String?) { - CallerLogger.d(TAG,"-----showOutputText $outPutText") - outPutText?.let { - val msg = VoiceMsg( - isWakeUp = false, - isWakeUpEnd = false, - msg = it, - isLastMsg = false, - isResp = true - ) - pushMsgBox(msg) - } - } - - private fun pushMsgBox(msg:VoiceMsg){ - CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.VOICE, msg)) - } - - enum class AnimalState { - Normal, - NORMAL_SPEAK, - SPEAK_NORMAL, - SPEAK, - } - - -} diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_00.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_00.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_00.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_00.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_01.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_01.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_01.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_01.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_02.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_02.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_02.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_02.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_03.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_03.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_03.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_03.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_04.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_04.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_04.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_04.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_05.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_05.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_05.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_05.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_06.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_06.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_06.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_06.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_07.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_07.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_07.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_07.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_08.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_08.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_08.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_08.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_09.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_09.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_09.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_09.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_10.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_10.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_10.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_10.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_11.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_11.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_11.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_11.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_12.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_12.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_12.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_12.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_13.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_13.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_13.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_13.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_14.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_14.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_14.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_14.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_15.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_15.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_15.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_15.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_16.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_16.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_16.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_16.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_17.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_17.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_17.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_17.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_18.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_18.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_18.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_18.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_19.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_19.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_19.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_19.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_20.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_20.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_20.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_20.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_21.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_21.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_21.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_21.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_22.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_22.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_22.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_22.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_23.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_23.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_23.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_23.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_24.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_24.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_24.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_24.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_25.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_25.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_25.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_25.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_26.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_26.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_26.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_26.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_27.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_27.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_27.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_27.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_28.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_28.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_28.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_28.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_29.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_29.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_29.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_29.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_30.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_30.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_30.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_30.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_31.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_31.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_31.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_31.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_34.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_34.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_34.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_34.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_35.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_35.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_35.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_35.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_36.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_36.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_36.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_36.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_37.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_37.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_37.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_37.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_38.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_38.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_38.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_38.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_39.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_39.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_39.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_39.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_40.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_40.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_40.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_40.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_41.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_41.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_41.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_41.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_42.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_42.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_42.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_42.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_43.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_43.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_43.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_43.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_44.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_44.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_44.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_44.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_45.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_45.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_45.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_45.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_46.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_46.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_46.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_46.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_47.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_47.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_47.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_47.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_48.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_48.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_48.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_48.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_49.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_49.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_49.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_49.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_50.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_50.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_50.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_50.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_51.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_51.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_51.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_51.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_52.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_52.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_52.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_52.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_53.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_53.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_53.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_53.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_54.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_54.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_54.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_54.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_55.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_55.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_55.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_55.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_56.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_56.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_56.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_56.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_57.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_57.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_57.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_57.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_58.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_58.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_58.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_58.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_59.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_59.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_59.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_59.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_60.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_60.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_60.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_60.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_61.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_61.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_61.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_61.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_62.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_62.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_62.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_62.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_63.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_63.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_63.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_63.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_64.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_64.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_64.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_64.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_65.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_65.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_65.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_65.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_66.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_66.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_66.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_66.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_67.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_67.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_67.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_67.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_68.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_68.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_68.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_68.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_69.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_69.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_69.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_69.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_70.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_70.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_70.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_70.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_71.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_71.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_71.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_71.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp diff --git a/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_000.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_000.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_000.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_000.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_001.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_001.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_001.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_001.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_002.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_002.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_002.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_002.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_003.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_003.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_003.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_003.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_004.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_004.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_004.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_004.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_005.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_005.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_005.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_005.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_006.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_006.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_006.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_006.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_007.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_007.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_007.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_007.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_008.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_008.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_008.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_008.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_009.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_009.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_009.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_009.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_010.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_010.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_010.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_010.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_011.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_011.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_011.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_011.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_012.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_012.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_012.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_012.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_013.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_013.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_013.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_013.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_014.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_014.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_014.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_014.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_015.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_015.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_015.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_015.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_016.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_016.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_016.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_016.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_017.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_017.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_017.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_017.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_018.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_018.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_018.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_018.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_019.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_019.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_019.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_019.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_020.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_020.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_020.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_020.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_021.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_021.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_021.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_021.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_022.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_022.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_022.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_022.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_023.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_023.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_023.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_023.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_024.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_024.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_024.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_024.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_025.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_025.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_025.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_025.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_026.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_026.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_026.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_026.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_027.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_027.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_027.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_027.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_028.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_028.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_028.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_028.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_029.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_029.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_029.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_029.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_030.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_030.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_030.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_030.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_031.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_031.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_031.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_031.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_032.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_032.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_032.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_032.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_033.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_033.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_033.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_033.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_034.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_034.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_034.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_034.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_035.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_035.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_035.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_035.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_036.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_036.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_036.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_036.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_037.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_037.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_037.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_037.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_038.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_038.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_038.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_038.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_039.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_039.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_039.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_039.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_040.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_040.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_040.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_040.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_041.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_041.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_041.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_041.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_042.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_042.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_042.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_042.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_043.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_043.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_043.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_043.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_044.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_044.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_044.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_044.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_045.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_045.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_045.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_045.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_046.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_046.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_046.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_046.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_047.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_047.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_047.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_047.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_048.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_048.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_belt_048.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_belt_048.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_00.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_00.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_00.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_00.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_01.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_01.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_01.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_01.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_02.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_02.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_02.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_02.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_03.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_03.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_03.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_03.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_04.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_04.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_04.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_04.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_05.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_05.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_05.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_05.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_06.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_06.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_06.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_06.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_07.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_07.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_07.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_07.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_08.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_08.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_08.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_08.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_09.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_09.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_09.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_09.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_10.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_10.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_10.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_10.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_11.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_11.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_11.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_11.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_12.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_12.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_12.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_12.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_13.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_13.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_13.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_13.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_14.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_14.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_14.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_14.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_15.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_15.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_15.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_15.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_16.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_16.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_16.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_16.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_17.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_17.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_17.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_17.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_18.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_18.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_18.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_18.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_19.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_19.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_19.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_19.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_20.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_20.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_20.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_20.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_21.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_21.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_21.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_21.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_22.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_22.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_22.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_22.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_23.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_23.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_23.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_23.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_24.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_24.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_24.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_24.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_25.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_25.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_25.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_25.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_26.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_26.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_26.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_26.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_27.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_27.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_27.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_27.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_28.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_28.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_28.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_28.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_29.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_29.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_29.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_29.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_30.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_30.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_30.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_30.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_31.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_31.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_31.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_31.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_32.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_32.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_32.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_32.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_33.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_33.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_33.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_33.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_34.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_34.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_34.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_34.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_35.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_35.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_35.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_35.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_36.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_36.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_36.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_36.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_37.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_37.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_37.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_37.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_38.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_38.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_38.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_38.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_39.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_39.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_39.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_39.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_40.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_40.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_40.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_40.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_41.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_41.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_41.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_41.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_42.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_42.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_42.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_42.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_43.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_43.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_43.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_43.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_44.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_44.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_44.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_44.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_45.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_45.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_45.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_45.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_46.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_46.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_46.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_46.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_47.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_47.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_47.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_47.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_48.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_48.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_48.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_48.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_49.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_49.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_49.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_49.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_50.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_50.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_50.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_50.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_51.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_51.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_51.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_51.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_52.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_52.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_52.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_52.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_53.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_53.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_53.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_53.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_54.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_54.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_54.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_54.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_55.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_55.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_55.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_55.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_56.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_56.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_56.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_56.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_57.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_57.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_57.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_57.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_58.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_58.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_58.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_58.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_59.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_59.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_59.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_59.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_60.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_60.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_60.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_60.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_61.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_61.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_61.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_61.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_62.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_62.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_62.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_62.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_63.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_63.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_63.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_63.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_64.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_64.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_64.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_64.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_65.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_65.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_65.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_65.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_66.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_66.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_66.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_66.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_67.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_67.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_67.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_67.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_68.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_68.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_68.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_68.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_69.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_69.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_69.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_69.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_70.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_70.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_70.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_70.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_71.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_71.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_71.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_71.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_72.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_72.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_72.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_72.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_73.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_73.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_73.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_73.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_74.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_74.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_74.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_74.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_75.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_75.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_75.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_75.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_76.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_76.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_76.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_76.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_77.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_77.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_77.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_77.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_78.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_78.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_78.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_78.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_79.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_79.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_79.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_79.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_80.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_80.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_80.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_80.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_81.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_81.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_81.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_81.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_82.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_82.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_82.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_82.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_83.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_83.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_83.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_83.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_84.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_84.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_84.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_84.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_85.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_85.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_85.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_85.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_86.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_86.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_86.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_86.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_87.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_87.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_87.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_87.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_88.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_88.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_88.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_88.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_89.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_89.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_89.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_89.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_90.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_90.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_90.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_90.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_91.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_91.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_91.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_91.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_92.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_92.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_92.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_92.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_93.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_93.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_93.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_93.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_94.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_94.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_94.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_94.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_95.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_95.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_95.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_95.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_96.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_96.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/xiaozhi_love_96.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_love_96.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0000.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0000.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0001.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0001.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0002.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0002.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0003.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0003.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0004.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0004.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0005.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0005.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0006.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0006.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0007.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0007.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0008.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0008.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0009.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0009.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0010.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0010.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0011.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0011.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0012.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0012.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0013.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0013.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0014.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0014.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0015.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0015.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0016.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0016.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0017.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0017.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0018.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0018.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0019.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0019.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0020.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0020.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0021.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0021.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0022.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0022.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0023.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0023.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0024.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0024.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0025.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0025.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0026.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0026.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0027.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0027.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0028.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0028.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0029.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0029.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0030.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0030.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0031.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0031.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0032.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0032.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0033.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0033.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0034.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0034.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0035.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0035.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0036.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0036.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0037.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0037.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0038.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0038.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0039.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0039.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0040.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0040.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0041.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0041.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0042.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0042.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0043.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0043.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0044.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0044.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0045.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0045.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0046.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0046.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0047.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0047.png diff --git a/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png b/OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0048.png similarity index 100% rename from OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png rename to OCH/common/common/src/main/res/xiaozhi/drawable-nodpi/xiaozhi_normal_0048.png diff --git a/OCH/common/common/src/main/res/values/arrays.xml b/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml similarity index 52% rename from OCH/common/common/src/main/res/values/arrays.xml rename to OCH/common/common/src/main/res/xiaozhi/values/arrays.xml index 07e7450afa..426fd62486 100644 --- a/OCH/common/common/src/main/res/values/arrays.xml +++ b/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml @@ -147,4 +147,174 @@ @drawable/charter_p_xiaozhi_think_normal_17 + + @drawable/xiaozhi_belt_000 + @drawable/xiaozhi_belt_001 + @drawable/xiaozhi_belt_002 + @drawable/xiaozhi_belt_003 + @drawable/xiaozhi_belt_004 + @drawable/xiaozhi_belt_005 + @drawable/xiaozhi_belt_006 + @drawable/xiaozhi_belt_007 + @drawable/xiaozhi_belt_008 + @drawable/xiaozhi_belt_009 + + @drawable/xiaozhi_belt_010 + @drawable/xiaozhi_belt_011 + @drawable/xiaozhi_belt_012 + @drawable/xiaozhi_belt_013 + @drawable/xiaozhi_belt_014 + @drawable/xiaozhi_belt_015 + @drawable/xiaozhi_belt_016 + @drawable/xiaozhi_belt_017 + @drawable/xiaozhi_belt_018 + @drawable/xiaozhi_belt_019 + + @drawable/xiaozhi_belt_020 + @drawable/xiaozhi_belt_021 + @drawable/xiaozhi_belt_022 + @drawable/xiaozhi_belt_023 + @drawable/xiaozhi_belt_024 + @drawable/xiaozhi_belt_025 + @drawable/xiaozhi_belt_026 + @drawable/xiaozhi_belt_027 + @drawable/xiaozhi_belt_028 + @drawable/xiaozhi_belt_029 + + + @drawable/xiaozhi_belt_030 + @drawable/xiaozhi_belt_031 + @drawable/xiaozhi_belt_032 + @drawable/xiaozhi_belt_033 + @drawable/xiaozhi_belt_034 + @drawable/xiaozhi_belt_035 + @drawable/xiaozhi_belt_036 + @drawable/xiaozhi_belt_037 + @drawable/xiaozhi_belt_038 + @drawable/xiaozhi_belt_039 + + @drawable/xiaozhi_belt_040 + @drawable/xiaozhi_belt_041 + @drawable/xiaozhi_belt_042 + @drawable/xiaozhi_belt_043 + @drawable/xiaozhi_belt_044 + @drawable/xiaozhi_belt_045 + @drawable/xiaozhi_belt_046 + @drawable/xiaozhi_belt_047 + @drawable/xiaozhi_belt_048 + + + + + @drawable/xiaozhi_love_00 + + @drawable/xiaozhi_love_02 + + @drawable/xiaozhi_love_04 + + @drawable/xiaozhi_love_06 + + @drawable/xiaozhi_love_08 + + + @drawable/xiaozhi_love_10 + + @drawable/xiaozhi_love_12 + + @drawable/xiaozhi_love_14 + + @drawable/xiaozhi_love_16 + + @drawable/xiaozhi_love_18 + + + @drawable/xiaozhi_love_20 + + @drawable/xiaozhi_love_22 + + @drawable/xiaozhi_love_24 + + @drawable/xiaozhi_love_26 + + @drawable/xiaozhi_love_28 + + + + @drawable/xiaozhi_love_30 + + @drawable/xiaozhi_love_32 + + @drawable/xiaozhi_love_34 + + @drawable/xiaozhi_love_36 + + @drawable/xiaozhi_love_38 + + + @drawable/xiaozhi_love_40 + + @drawable/xiaozhi_love_42 + + @drawable/xiaozhi_love_44 + + @drawable/xiaozhi_love_46 + + @drawable/xiaozhi_love_48 + + + + @drawable/xiaozhi_love_50 + + @drawable/xiaozhi_love_52 + + @drawable/xiaozhi_love_54 + + @drawable/xiaozhi_love_56 + + @drawable/xiaozhi_love_58 + + + @drawable/xiaozhi_love_60 + + @drawable/xiaozhi_love_62 + + @drawable/xiaozhi_love_64 + + @drawable/xiaozhi_love_66 + + @drawable/xiaozhi_love_68 + + + @drawable/xiaozhi_love_70 + + @drawable/xiaozhi_love_72 + + @drawable/xiaozhi_love_74 + + @drawable/xiaozhi_love_76 + + @drawable/xiaozhi_love_78 + + + @drawable/xiaozhi_love_80 + + @drawable/xiaozhi_love_82 + + @drawable/xiaozhi_love_84 + + @drawable/xiaozhi_love_86 + + @drawable/xiaozhi_love_88 + + + @drawable/xiaozhi_love_90 + + @drawable/xiaozhi_love_92 + + @drawable/xiaozhi_love_94 + + @drawable/xiaozhi_love_96 + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml index 9dbd6a2a9c..a4f407f00f 100644 --- a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml @@ -137,7 +137,7 @@ android:layout_height="@dimen/dp_30"/> - - @drawable/light_00017 - - @drawable/xiaozhi_love_00 - @drawable/xiaozhi_love_01 - @drawable/xiaozhi_love_02 - @drawable/xiaozhi_love_03 - @drawable/xiaozhi_love_04 - @drawable/xiaozhi_love_05 - @drawable/xiaozhi_love_06 - @drawable/xiaozhi_love_07 - @drawable/xiaozhi_love_08 - @drawable/xiaozhi_love_09 - - @drawable/xiaozhi_love_10 - @drawable/xiaozhi_love_11 - @drawable/xiaozhi_love_12 - @drawable/xiaozhi_love_13 - @drawable/xiaozhi_love_14 - @drawable/xiaozhi_love_15 - @drawable/xiaozhi_love_16 - @drawable/xiaozhi_love_17 - @drawable/xiaozhi_love_18 - @drawable/xiaozhi_love_19 - - @drawable/xiaozhi_love_20 - @drawable/xiaozhi_love_21 - @drawable/xiaozhi_love_22 - @drawable/xiaozhi_love_23 - @drawable/xiaozhi_love_24 - @drawable/xiaozhi_love_25 - @drawable/xiaozhi_love_26 - @drawable/xiaozhi_love_27 - @drawable/xiaozhi_love_28 - @drawable/xiaozhi_love_29 - @drawable/xiaozhi_love_30 - @drawable/xiaozhi_love_31 - @drawable/xiaozhi_love_32 - @drawable/xiaozhi_love_33 - @drawable/xiaozhi_love_34 - @drawable/xiaozhi_love_35 - @drawable/xiaozhi_love_36 - @drawable/xiaozhi_love_37 - @drawable/xiaozhi_love_38 - @drawable/xiaozhi_love_39 - @drawable/xiaozhi_love_40 - @drawable/xiaozhi_love_41 - @drawable/xiaozhi_love_42 - @drawable/xiaozhi_love_43 - @drawable/xiaozhi_love_44 - @drawable/xiaozhi_love_45 - @drawable/xiaozhi_love_46 - @drawable/xiaozhi_love_47 - @drawable/xiaozhi_love_48 - @drawable/xiaozhi_love_49 - - - @drawable/xiaozhi_love_50 - @drawable/xiaozhi_love_51 - @drawable/xiaozhi_love_52 - @drawable/xiaozhi_love_53 - @drawable/xiaozhi_love_54 - @drawable/xiaozhi_love_55 - @drawable/xiaozhi_love_56 - @drawable/xiaozhi_love_57 - @drawable/xiaozhi_love_58 - @drawable/xiaozhi_love_59 - - @drawable/xiaozhi_love_60 - @drawable/xiaozhi_love_61 - @drawable/xiaozhi_love_62 - @drawable/xiaozhi_love_63 - @drawable/xiaozhi_love_64 - @drawable/xiaozhi_love_65 - @drawable/xiaozhi_love_66 - @drawable/xiaozhi_love_67 - @drawable/xiaozhi_love_68 - @drawable/xiaozhi_love_69 - - @drawable/xiaozhi_love_70 - @drawable/xiaozhi_love_71 - @drawable/xiaozhi_love_72 - @drawable/xiaozhi_love_73 - @drawable/xiaozhi_love_74 - @drawable/xiaozhi_love_75 - @drawable/xiaozhi_love_76 - @drawable/xiaozhi_love_77 - @drawable/xiaozhi_love_78 - @drawable/xiaozhi_love_79 - - @drawable/xiaozhi_love_80 - @drawable/xiaozhi_love_81 - @drawable/xiaozhi_love_82 - @drawable/xiaozhi_love_83 - @drawable/xiaozhi_love_84 - @drawable/xiaozhi_love_85 - @drawable/xiaozhi_love_86 - @drawable/xiaozhi_love_87 - @drawable/xiaozhi_love_88 - @drawable/xiaozhi_love_89 - - @drawable/xiaozhi_love_90 - @drawable/xiaozhi_love_91 - @drawable/xiaozhi_love_92 - @drawable/xiaozhi_love_93 - @drawable/xiaozhi_love_94 - @drawable/xiaozhi_love_95 - @drawable/xiaozhi_love_96 - - - - - @drawable/xiaozhi_belt_000 - @drawable/xiaozhi_belt_001 - @drawable/xiaozhi_belt_002 - @drawable/xiaozhi_belt_003 - @drawable/xiaozhi_belt_004 - @drawable/xiaozhi_belt_005 - @drawable/xiaozhi_belt_006 - @drawable/xiaozhi_belt_007 - @drawable/xiaozhi_belt_008 - @drawable/xiaozhi_belt_009 - - @drawable/xiaozhi_belt_010 - @drawable/xiaozhi_belt_011 - @drawable/xiaozhi_belt_012 - @drawable/xiaozhi_belt_013 - @drawable/xiaozhi_belt_014 - @drawable/xiaozhi_belt_015 - @drawable/xiaozhi_belt_016 - @drawable/xiaozhi_belt_017 - @drawable/xiaozhi_belt_018 - @drawable/xiaozhi_belt_019 - - @drawable/xiaozhi_belt_020 - @drawable/xiaozhi_belt_021 - @drawable/xiaozhi_belt_022 - @drawable/xiaozhi_belt_023 - @drawable/xiaozhi_belt_024 - @drawable/xiaozhi_belt_025 - @drawable/xiaozhi_belt_026 - @drawable/xiaozhi_belt_027 - @drawable/xiaozhi_belt_028 - @drawable/xiaozhi_belt_029 - - - @drawable/xiaozhi_belt_030 - @drawable/xiaozhi_belt_031 - @drawable/xiaozhi_belt_032 - @drawable/xiaozhi_belt_033 - @drawable/xiaozhi_belt_034 - @drawable/xiaozhi_belt_035 - @drawable/xiaozhi_belt_036 - @drawable/xiaozhi_belt_037 - @drawable/xiaozhi_belt_038 - @drawable/xiaozhi_belt_039 - - @drawable/xiaozhi_belt_040 - @drawable/xiaozhi_belt_041 - @drawable/xiaozhi_belt_042 - @drawable/xiaozhi_belt_043 - @drawable/xiaozhi_belt_044 - @drawable/xiaozhi_belt_045 - @drawable/xiaozhi_belt_046 - @drawable/xiaozhi_belt_047 - @drawable/xiaozhi_belt_048 - - diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 71d1752033..7cffcbf71e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.map.listener.IMogoMapListener +import com.mogo.och.common.module.manager.xiaozhimanager.ZhiStateManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R @@ -170,9 +171,9 @@ class TaxiPassengerBaseFragment() : CallerLogger.d(M_TAXI_P + TAG, "arrived ${show}") if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){ showOrHide(true) - aciv_xiaozhi_normal.setZhiEnable(true) + ZhiStateManager.setZhiEnable(true) }else{ - aciv_xiaozhi_normal.setZhiEnable(false) + ZhiStateManager.setZhiEnable(false) } } } @@ -181,9 +182,9 @@ class TaxiPassengerBaseFragment() : CallerLogger.d(M_TAXI_P + TAG, "check and startAutopilot ${show}") if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){ showOrHide(true) - aciv_xiaozhi_normal.setZhiEnable(true) + ZhiStateManager.setZhiEnable(true) }else{ - aciv_xiaozhi_normal.setZhiEnable(false) + ZhiStateManager.setZhiEnable(false) } } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 4ecf8eac00..2c0e91ecd5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R @@ -70,10 +71,12 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { v_video_right_rear_view.resetView() aniSpeedSettingRow() viewModel.setEndInfo() + ZhiViewmanager.showListeningAni(ZhiViewmanager.loveAni) } else { v_video_right_rear_view.resetView() taxiPxiaozhiLove = null RxUtils.disposeSubscribe(subscribe) + ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni) } arrivedVisilityChangeListenr?.isShow(isVisible) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 8a972f36a9..536e3cc600 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -12,6 +12,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView @@ -73,8 +74,10 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, startAutopilotView.showStartAutopilot() } } + ZhiViewmanager.showListeningAni(ZhiViewmanager.beltAni) } else { aniCheck2StartAutopilotView = null + ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni) } checkAndStartVisilityChangeListenr?.isShow(isVisible) } diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index 344b49ad66..e0ce210f1e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -172,7 +172,7 @@ android:layout_height="match_parent"/> -