diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 6972bef09d..e1c1ba24de 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -19,10 +19,11 @@ import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonValueCallback import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter -import com.mogo.och.taxi.passenger.ui.bottom.BottomBar import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView +import com.mogo.och.taxi.passenger.ui.bottom.BottomBar import com.mogo.och.taxi.passenger.ui.check.TaxiPassengerCheckView import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView +import com.mogo.och.taxi.passenger.widget.animutils.AnimationsContainer import kotlinx.android.synthetic.main.taxi_p_base_fragment.* import java.lang.ref.WeakReference @@ -53,6 +54,8 @@ class TaxiPassengerBaseFragment() : */ private var mStartAutopilotView: WeakReference? = null + private var createProgressDialogAnim: AnimationsContainer?=null + override fun getLayoutId(): Int { return R.layout.taxi_p_base_fragment } @@ -70,6 +73,13 @@ class TaxiPassengerBaseFragment() : mapBizView!!.onCreate(savedInstanceState) overMapView.onCreateView(savedInstanceState) overMapView.hideResetView() + + createProgressDialogAnim = AnimationsContainer(R.array.xiaozhi_normal, 20,aciv_xiaozhi_normal) + createProgressDialogAnim?.setOnAnimStopListener(object :AnimationsContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + CallerLogger.d(M_TAXI_P + TAG, "动画暂停") + } + }) } private fun initListener() { @@ -147,6 +157,15 @@ class TaxiPassengerBaseFragment() : } } + view?.viewTreeObserver?.addOnWindowFocusChangeListener { + if(it){ + CallerLogger.d(M_TAXI_P + TAG, "windows获取焦点") + createProgressDialogAnim?.start() + }else{ + CallerLogger.d(M_TAXI_P + TAG, "window失去焦点") + createProgressDialogAnim?.stop() + } + } } private fun initCheckView() { @@ -163,10 +182,7 @@ class TaxiPassengerBaseFragment() : overMapView.onResume() CallerLogger.d(M_TAXI_P + TAG, "onResume") - if (aciv_xiaozhi_normal.drawable is AnimationDrawable) { - val anim = aciv_xiaozhi_normal.drawable as AnimationDrawable - anim.start() - } + createProgressDialogAnim?.start() } override fun createPresenter(): BaseTaxiPassengerPresenter { @@ -188,10 +204,7 @@ class TaxiPassengerBaseFragment() : mapBizView!!.onPause() overMapView?.onPause() CallerLogger.d(M_TAXI_P + TAG, "onPause") - if (aciv_xiaozhi_normal.drawable is AnimationDrawable) { - val anim = aciv_xiaozhi_normal.drawable as AnimationDrawable - anim.stop() - } + createProgressDialogAnim?.stop() } override fun onDestroyView() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index c83027dc5e..a2486b5d26 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -6,19 +6,25 @@ import android.view.LayoutInflater import androidx.lifecycle.ViewModelProvider import com.mogo.commons.AbsMogoApplication 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.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment +import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import com.mogo.och.taxi.passenger.widget.animutils.AnimationsContainer import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.aciv_close import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.actv_endstation +import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.iv_xiaozhi_belt import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.svp_frame +import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_starting /** @@ -40,6 +46,8 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { private val gsyVideoOptionBuilder = GSYVideoOptionBuilder() + private var taxiPxiaozhiLove: AnimationsContainer?=null + private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") LayoutInflater.from(context).inflate(R.layout.taxi_p_arrived_end_panel, this, true) @@ -58,12 +66,20 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { aciv_close.onClick { OverlayViewUtils.dismissOverlayView(this) } + + taxiPxiaozhiLove = AnimationsContainer(R.array.xiaozhi_love, 20,iv_xiaozhi_belt) + taxiPxiaozhiLove?.setOnAnimStopListener(object :AnimationsContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") + } + }) } override fun onAttachedToWindow() { super.onAttachedToWindow() val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) + taxiPxiaozhiLove?.start() } override fun onDetachedFromWindow() { @@ -71,6 +87,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { svp_frame.setVideoAllCallBack(null) svp_frame.onVideoReset() svp_frame.release() + taxiPxiaozhiLove?.stop() super.onDetachedFromWindow() subscribe?.let { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index b3534ce4c1..6193bfdf82 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -8,11 +8,16 @@ import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.ViewModelProvider import com.elegant.utils.UiThreadHandler 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.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.AnimatorDrawableUtil import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import com.mogo.och.taxi.passenger.widget.animutils.AnimationsContainer +import kotlinx.android.synthetic.main.taxi_p_base_fragment.aciv_xiaozhi_normal import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_left_door import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_right_door import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_orderinfo @@ -45,24 +50,10 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } var isStarting = false - private var mAnimationDrawable: AnimatorDrawableUtil? = null - private var mCarAnimationDrawable: AnimatorDrawableUtil? = null - private val startingAnimIds = arrayOf(R.drawable.light_00000, R.drawable.light_00001, - R.drawable.light_00002, R.drawable.light_00003, R.drawable.light_00004, R.drawable.light_00005, - R.drawable.light_00006, R.drawable.light_00007, R.drawable.light_00008, R.drawable.light_00009, - R.drawable.light_00010, R.drawable.light_00011, R.drawable.light_00012, R.drawable.light_00013 - ) - private val startBtnBgAnimIds = arrayOf(R.drawable.image_00000, R.drawable.image_00001, - R.drawable.image_00002, R.drawable.image_00003, R.drawable.image_00004, R.drawable.image_00005, - R.drawable.image_00006, R.drawable.image_00007, R.drawable.image_00008, R.drawable.image_00009, - R.drawable.image_00010, R.drawable.image_00011, R.drawable.image_00012, R.drawable.image_00013, - R.drawable.image_00014, R.drawable.image_00015, R.drawable.image_00016, R.drawable.image_00017, - R.drawable.image_00018, R.drawable.image_00019, R.drawable.image_00020, R.drawable.image_00021, - R.drawable.image_00022, R.drawable.image_00023, R.drawable.image_00024, R.drawable.image_00025, - R.drawable.image_00026, R.drawable.image_00027, R.drawable.image_00028, R.drawable.image_00029, - R.drawable.image_00030, R.drawable.image_00031, R.drawable.image_00032, R.drawable.image_00033, - R.drawable.image_00034 - ) + + private var taxiPStartAutopilot: AnimationsContainer?=null + private var taxiPStartAutopilotCar: AnimationsContainer?=null + init { initView() @@ -70,18 +61,25 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu private fun initView() { LayoutInflater.from(context).inflate(R.layout.taxi_p_start_autopilot_view, this, true) + taxiPStartAutopilotCar = AnimationsContainer(R.array.taxi_p_start_autopilot_car, 20,taxi_p_autopilot_starting) + taxiPStartAutopilotCar?.setOnAnimStopListener(object :AnimationsContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") + } + }) + taxiPStartAutopilot = AnimationsContainer(R.array.taxi_p_start_autopilot, 20,taxi_p_autopilot_btn_bg) + taxiPStartAutopilot?.setOnAnimStopListener(object :AnimationsContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") + } + }) } fun startAutopilotBgAnimatorDrawable(isStart: Boolean) { if (isStart) { - if (mAnimationDrawable == null) { - initBtnAnimatonDrawable() - } - if (mAnimationDrawable != null) { - mAnimationDrawable!!.start(true, 30, null) - } + taxiPStartAutopilot?.start() } else { - clearBgAnimDrawable() + taxiPStartAutopilot?.stop() } } @@ -161,29 +159,14 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } } - private fun initCarStartingFrame() { - mCarAnimationDrawable = AnimatorDrawableUtil() - mCarAnimationDrawable?.setAnimation(taxi_p_autopilot_starting, Arrays.asList(*startingAnimIds)) - } - - private fun initBtnAnimatonDrawable() { - mAnimationDrawable = AnimatorDrawableUtil() - mAnimationDrawable?.setAnimation(taxi_p_autopilot_btn_bg, Arrays.asList(*startBtnBgAnimIds)) - } - private fun startingCarBgAnimatorDrawable(isStart: Boolean) { if (isStart) { - if (mCarAnimationDrawable == null) { - initCarStartingFrame() - } taxi_p_autopilot_starting!!.setImageResource(0) - mCarAnimationDrawable!!.start(true, 40, null) + taxiPStartAutopilotCar?.start() } else { - if (mCarAnimationDrawable != null) { - mCarAnimationDrawable!!.stop() - } + taxiPStartAutopilotCar?.stop() taxi_p_autopilot_starting!!.setImageResource(R.drawable.light_00003) } } @@ -203,17 +186,11 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } private fun clearBgAnimDrawable() { - if (mAnimationDrawable != null) { - mAnimationDrawable!!.stop() - mAnimationDrawable = null - } + taxiPStartAutopilot?.stop() } fun clearStartingAnimFrame() { - if (mCarAnimationDrawable != null) { - mCarAnimationDrawable!!.stop() - mCarAnimationDrawable = null - } + taxiPStartAutopilotCar?.stop() } private fun startingAutopilotCountDown() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/animutils/AnimationsContainer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/animutils/AnimationsContainer.kt new file mode 100644 index 0000000000..eab32ba7d0 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/animutils/AnimationsContainer.kt @@ -0,0 +1,146 @@ +package com.mogo.och.taxi.passenger.widget.animutils + +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.drawable.BitmapDrawable +import android.os.Handler +import android.os.Looper +import android.widget.ImageView +import com.mogo.commons.AbsMogoApplication +import java.lang.ref.SoftReference + +class AnimationsContainer(resId: Int, fps: Int, imageView: ImageView) { + private lateinit var mFrames: IntArray // 帧数组 + private var mIndex = 0 // 当前帧 + private var mShouldRun = false // 开始/停止播放用 + private var mIsRunning = false // 动画是否正在播放，防止重复播放 + private var mSoftReferenceImageView: SoftReference? = null // 软引用ImageView，以便及时释放掉 + private var mHandler: Handler? = null + private var mDelayMillis = 0 + private var mOnAnimationStoppedListener: OnAnimationStoppedListener? = null//播放停止监听 + private var mBitmap: Bitmap? = null + private var mBitmapOptions: BitmapFactory.Options? = null //Bitmap管理类，可有效减少Bitmap的OOM问题 + + init { + createAnimation(imageView, getData(resId), fps) + } + + private fun createAnimation(imageView: ImageView, frames: IntArray, fps: Int) { + mHandler = Handler(Looper.myLooper()!!) + mFrames = frames + mIndex = -1 + mSoftReferenceImageView = SoftReference(imageView) + mShouldRun = false + mIsRunning = false + mDelayMillis = 1000 / fps //帧动画时间间隔，毫秒 + imageView.setImageResource(mFrames[0]) + + // 当图片大小类型相同时进行复用，避免频繁GC + val bmp = (imageView.drawable as BitmapDrawable).bitmap + val width = bmp.width + val height = bmp.height + val config = bmp.config + mBitmap = Bitmap.createBitmap(width, height, config) + mBitmapOptions = BitmapFactory.Options() + //设置Bitmap内存复用 + mBitmapOptions!!.inBitmap = mBitmap //Bitmap复用内存块，类似对象池，避免不必要的内存分配和回收 + mBitmapOptions!!.inMutable = true //解码时返回可变Bitmap + mBitmapOptions!!.inSampleSize = 1 //缩放比例 + } + + //循环读取下一帧 + private val next: Int + get() { + mIndex++ + if (mIndex >= mFrames.size) mIndex = 0 + return mFrames[mIndex] + } + + /** + * 播放动画，同步锁防止多线程读帧时，数据安全问题 + */ + @Synchronized + fun start() { + mShouldRun = true + if (mIsRunning) return + val runnable: Runnable = object : Runnable { + override fun run() { + val imageView = mSoftReferenceImageView!!.get() + if (!mShouldRun || imageView == null) { + mIsRunning = false + if (mOnAnimationStoppedListener != null) { + mOnAnimationStoppedListener!!.AnimationStopped() + } + return + } + mIsRunning = true + //新开线程去读下一帧 + mHandler!!.postDelayed(this, mDelayMillis.toLong()) + if (imageView.isShown) { + val imageRes: Int = next + if (mBitmap != null) { // so Build.VERSION.SDK_INT >= 11 + var bitmap: Bitmap? = null + try { + bitmap = BitmapFactory.decodeResource( + imageView.resources, + imageRes, + mBitmapOptions + ) + } catch (e: Exception) { + e.printStackTrace() + } + if (bitmap != null) { + imageView.setImageBitmap(bitmap) + } else { + imageView.setImageResource(imageRes) + mBitmap!!.recycle() + mBitmap = null + } + } else { + imageView.setImageResource(imageRes) + } + } + } + } + mHandler!!.post(runnable) + } + + /** + * 停止播放 + */ + @Synchronized + fun stop() { + mShouldRun = false + } + + /** + * 设置停止播放监听 + * @param listener 设置监听 + */ + fun setOnAnimStopListener(listener: OnAnimationStoppedListener?) { + mOnAnimationStoppedListener = listener + } + + /** + * 从xml中读取帧数组 + * @param resId + * @return + */ + private 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 + } + + /** + * 停止播放监听 + */ + interface OnAnimationStoppedListener { + fun AnimationStopped() + } +} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png new file mode 100644 index 0000000000..adc24a4587 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_000.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_000.png new file mode 100755 index 0000000000..8f41f3ef17 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_000.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_001.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_001.png new file mode 100755 index 0000000000..8974bdb433 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_001.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_002.png new file mode 100755 index 0000000000..c27cff4a08 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_002.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_003.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_003.png new file mode 100755 index 0000000000..480226c096 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_003.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_004.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_004.png new file mode 100755 index 0000000000..d241bc3600 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_004.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_005.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_005.png new file mode 100755 index 0000000000..043772caef Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_005.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_006.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_006.png new file mode 100755 index 0000000000..e6141a5912 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_006.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_007.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_007.png new file mode 100755 index 0000000000..08157b8d6a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_007.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_008.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_008.png new file mode 100755 index 0000000000..518a163ee1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_008.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_009.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_009.png new file mode 100755 index 0000000000..0c00e4aec3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_009.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_010.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_010.png new file mode 100755 index 0000000000..e2a82962be Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_010.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_011.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_011.png new file mode 100755 index 0000000000..e4725814d1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_011.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_012.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_012.png new file mode 100755 index 0000000000..dd4c443901 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_012.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_013.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_013.png new file mode 100755 index 0000000000..7bcd528ef6 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_013.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_014.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_014.png new file mode 100755 index 0000000000..edf6a2a82f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_014.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_015.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_015.png new file mode 100755 index 0000000000..6d19a79755 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_015.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_016.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_016.png new file mode 100755 index 0000000000..13ca6cd6d7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_016.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_017.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_017.png new file mode 100755 index 0000000000..11ec920c66 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_017.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_018.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_018.png new file mode 100755 index 0000000000..5e747ba4db Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_018.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_019.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_019.png new file mode 100755 index 0000000000..b1a7577d77 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_019.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_020.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_020.png new file mode 100755 index 0000000000..281c7e819c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_020.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_021.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_021.png new file mode 100755 index 0000000000..6c1da40819 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_021.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_022.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_022.png new file mode 100755 index 0000000000..af5c969a1c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_022.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_023.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_023.png new file mode 100755 index 0000000000..f0e0032234 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_023.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_024.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_024.png new file mode 100755 index 0000000000..6dcdd8b73d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_024.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_025.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_025.png new file mode 100755 index 0000000000..5a6f07be8c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_025.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_026.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_026.png new file mode 100755 index 0000000000..f19df657d2 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_026.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_027.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_027.png new file mode 100755 index 0000000000..bedc1f5560 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_027.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_028.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_028.png new file mode 100755 index 0000000000..9cdfd7d0c6 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_028.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_029.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_029.png new file mode 100755 index 0000000000..dd15bcfc8b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_029.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_030.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_030.png new file mode 100755 index 0000000000..ec47b415ea Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_030.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_031.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_031.png new file mode 100755 index 0000000000..0b79143e97 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_031.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_032.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_032.png new file mode 100755 index 0000000000..50f98af14f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_032.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_033.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_033.png new file mode 100755 index 0000000000..a067948510 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_033.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_034.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_034.png new file mode 100755 index 0000000000..2a1654747f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_034.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_035.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_035.png new file mode 100755 index 0000000000..58e547f24d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_035.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_036.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_036.png new file mode 100755 index 0000000000..2a9683d1a7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_036.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_037.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_037.png new file mode 100755 index 0000000000..937add65e7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_037.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_038.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_038.png new file mode 100755 index 0000000000..e266a7f591 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_038.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_039.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_039.png new file mode 100755 index 0000000000..e5e902e036 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_039.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_040.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_040.png new file mode 100755 index 0000000000..3cb905752f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_040.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_041.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_041.png new file mode 100755 index 0000000000..143b9c8d90 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_041.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_042.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_042.png new file mode 100755 index 0000000000..a389ab571f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_042.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_043.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_043.png new file mode 100755 index 0000000000..1cb679d5b3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_043.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_044.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_044.png new file mode 100755 index 0000000000..8831f72e30 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_044.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_045.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_045.png new file mode 100755 index 0000000000..1dc2743f91 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_045.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_046.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_046.png new file mode 100755 index 0000000000..89a8a71f68 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_046.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_047.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_047.png new file mode 100755 index 0000000000..8162689ff4 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_047.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_048.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_048.png new file mode 100755 index 0000000000..0942909715 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_048.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_049.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_049.png new file mode 100755 index 0000000000..5dc09ffd53 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_049.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_050.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_050.png new file mode 100755 index 0000000000..701eb4430a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_050.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_051.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_051.png new file mode 100755 index 0000000000..85589aa923 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_051.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_052.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_052.png new file mode 100755 index 0000000000..6fde977d5d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_052.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_053.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_053.png new file mode 100755 index 0000000000..af7b3c073b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_053.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_054.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_054.png new file mode 100755 index 0000000000..73420b4b16 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_054.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_055.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_055.png new file mode 100755 index 0000000000..337d51bd7a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_055.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_056.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_056.png new file mode 100755 index 0000000000..baa1f32c72 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_056.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_057.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_057.png new file mode 100755 index 0000000000..bf048e1eff Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_057.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_058.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_058.png new file mode 100755 index 0000000000..a2fa4696b3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_058.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_059.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_059.png new file mode 100755 index 0000000000..5886f3c427 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_059.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 16af69035e..6821ee5e45 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -59,6 +59,13 @@ android:layout_width="@dimen/dp_900" android:layout_height="@dimen/dp_506"/> + + @@ -109,11 +116,10 @@ android:id="@+id/iv_xiaozhi_belt" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginEnd="@dimen/dp_98" - android:src="@drawable/xiaozhi_normal002" - android:layout_marginBottom="@dimen/dp_30" - android:layout_width="@dimen/dp_216" - android:layout_height="@dimen/dp_216"/> + android:layout_marginEnd="@dimen/dp_46" + android:layout_marginBottom="@dimen/dp_10" + android:layout_width="@dimen/dp_300" + android:layout_height="@dimen/dp_300"/> \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml new file mode 100644 index 0000000000..d72eb2b061 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml @@ -0,0 +1,189 @@ + + + + @drawable/xiaozhi_normal002 + @drawable/xiaozhi_normal004 + @drawable/xiaozhi_normal006 + @drawable/xiaozhi_normal008 + @drawable/xiaozhi_normal010 + @drawable/xiaozhi_normal012 + @drawable/xiaozhi_normal014 + @drawable/xiaozhi_normal016 + @drawable/xiaozhi_normal018 + @drawable/xiaozhi_normal020 + @drawable/xiaozhi_normal022 + @drawable/xiaozhi_normal024 + @drawable/xiaozhi_normal026 + @drawable/xiaozhi_normal028 + @drawable/xiaozhi_normal030 + @drawable/xiaozhi_normal032 + @drawable/xiaozhi_normal034 + @drawable/xiaozhi_normal036 + @drawable/xiaozhi_normal038 + @drawable/xiaozhi_normal040 + @drawable/xiaozhi_normal042 + @drawable/xiaozhi_normal044 + @drawable/xiaozhi_normal046 + @drawable/xiaozhi_normal048 + @drawable/xiaozhi_normal050 + @drawable/xiaozhi_normal052 + @drawable/xiaozhi_normal054 + @drawable/xiaozhi_normal056 + @drawable/xiaozhi_normal058 + @drawable/xiaozhi_normal060 + @drawable/xiaozhi_normal062 + @drawable/xiaozhi_normal064 + @drawable/xiaozhi_normal066 + @drawable/xiaozhi_normal068 + @drawable/xiaozhi_normal070 + @drawable/xiaozhi_normal072 + @drawable/xiaozhi_normal074 + @drawable/xiaozhi_normal076 + @drawable/xiaozhi_normal078 + @drawable/xiaozhi_normal080 + @drawable/xiaozhi_normal082 + @drawable/xiaozhi_normal084 + @drawable/xiaozhi_normal086 + @drawable/xiaozhi_normal088 + @drawable/xiaozhi_normal090 + @drawable/xiaozhi_normal092 + @drawable/xiaozhi_normal094 + @drawable/xiaozhi_normal096 + @drawable/xiaozhi_normal098 + @drawable/xiaozhi_normal100 + @drawable/xiaozhi_normal102 + @drawable/xiaozhi_normal104 + @drawable/xiaozhi_normal106 + @drawable/xiaozhi_normal108 + @drawable/xiaozhi_normal110 + @drawable/xiaozhi_normal112 + @drawable/xiaozhi_normal114 + @drawable/xiaozhi_normal116 + @drawable/xiaozhi_normal118 + + + + @drawable/image_00000 + @drawable/image_00001 + @drawable/image_00002 + @drawable/image_00003 + @drawable/image_00004 + @drawable/image_00005 + @drawable/image_00006 + @drawable/image_00007 + @drawable/image_00008 + @drawable/image_00009 + @drawable/image_00010 + @drawable/image_00011 + @drawable/image_00012 + @drawable/image_00013 + @drawable/image_00014 + @drawable/image_00015 + @drawable/image_00016 + @drawable/image_00017 + @drawable/image_00018 + @drawable/image_00019 + @drawable/image_00020 + @drawable/image_00021 + @drawable/image_00022 + @drawable/image_00023 + @drawable/image_00024 + @drawable/image_00025 + @drawable/image_00026 + @drawable/image_00027 + @drawable/image_00028 + @drawable/image_00029 + @drawable/image_00030 + @drawable/image_00031 + @drawable/image_00032 + @drawable/image_00033 + @drawable/image_00034 + + + + @drawable/light_00000 + @drawable/light_00001 + @drawable/light_00002 + @drawable/light_00003 + @drawable/light_00004 + @drawable/light_00005 + @drawable/light_00006 + @drawable/light_00007 + @drawable/light_00008 + @drawable/light_00009 + @drawable/light_00010 + @drawable/light_00011 + @drawable/light_00012 + @drawable/light_00013 + + + + @drawable/xiaozhi_love_000 + @drawable/xiaozhi_love_001 + @drawable/xiaozhi_love_002 + @drawable/xiaozhi_love_003 + @drawable/xiaozhi_love_004 + @drawable/xiaozhi_love_005 + @drawable/xiaozhi_love_006 + @drawable/xiaozhi_love_007 + @drawable/xiaozhi_love_008 + @drawable/xiaozhi_love_009 + + @drawable/xiaozhi_love_010 + @drawable/xiaozhi_love_011 + @drawable/xiaozhi_love_012 + @drawable/xiaozhi_love_013 + @drawable/xiaozhi_love_014 + @drawable/xiaozhi_love_015 + @drawable/xiaozhi_love_016 + @drawable/xiaozhi_love_017 + @drawable/xiaozhi_love_018 + @drawable/xiaozhi_love_019 + + @drawable/xiaozhi_love_020 + @drawable/xiaozhi_love_021 + @drawable/xiaozhi_love_022 + @drawable/xiaozhi_love_023 + @drawable/xiaozhi_love_024 + @drawable/xiaozhi_love_025 + @drawable/xiaozhi_love_026 + @drawable/xiaozhi_love_027 + @drawable/xiaozhi_love_028 + @drawable/xiaozhi_love_029 + + + @drawable/xiaozhi_love_030 + @drawable/xiaozhi_love_031 + @drawable/xiaozhi_love_032 + @drawable/xiaozhi_love_033 + @drawable/xiaozhi_love_034 + @drawable/xiaozhi_love_035 + @drawable/xiaozhi_love_036 + @drawable/xiaozhi_love_037 + @drawable/xiaozhi_love_038 + @drawable/xiaozhi_love_039 + + @drawable/xiaozhi_love_040 + @drawable/xiaozhi_love_041 + @drawable/xiaozhi_love_042 + @drawable/xiaozhi_love_043 + @drawable/xiaozhi_love_044 + @drawable/xiaozhi_love_045 + @drawable/xiaozhi_love_046 + @drawable/xiaozhi_love_047 + @drawable/xiaozhi_love_048 + @drawable/xiaozhi_love_049 + + + @drawable/xiaozhi_love_050 + @drawable/xiaozhi_love_051 + @drawable/xiaozhi_love_052 + @drawable/xiaozhi_love_053 + @drawable/xiaozhi_love_054 + @drawable/xiaozhi_love_055 + @drawable/xiaozhi_love_056 + @drawable/xiaozhi_love_057 + @drawable/xiaozhi_love_058 + @drawable/xiaozhi_love_059 + + \ No newline at end of file