diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt index 10c8f99f56..188b742898 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt @@ -35,7 +35,7 @@ class ZhiView @JvmOverloads constructor( const val TAG = "ZhiView" } - private var currentAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 20,this) + private var currentAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 24,this) @Volatile private var status = ZhiRecordWinUi.RecordStatus.STATUS_SILENCE diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_00.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_00.webp deleted file mode 100644 index 59736772d9..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_00.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_01.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_01.webp deleted file mode 100644 index 3b6a5b7842..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_01.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_02.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_02.webp deleted file mode 100644 index 8d3f711e2d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_02.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_03.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_03.webp deleted file mode 100644 index 495e958dfb..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_03.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_04.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_04.webp deleted file mode 100644 index 4207e95be5..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_04.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_05.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_05.webp deleted file mode 100644 index 8d2a9a1120..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_05.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_06.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_06.webp deleted file mode 100644 index b9ba4ec7fe..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_06.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_07.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_07.webp deleted file mode 100644 index 95fa5cf251..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_07.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_08.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_08.webp deleted file mode 100644 index 99044e15f1..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_08.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_09.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_09.webp deleted file mode 100644 index a7d1729386..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_09.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_10.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_10.webp deleted file mode 100644 index e6c5bd1fc6..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_10.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_11.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_11.webp deleted file mode 100644 index 6b3bbaa6d1..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_11.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_12.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_12.webp deleted file mode 100644 index 4ae1887841..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_12.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_13.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_13.webp deleted file mode 100644 index 51ad32bee3..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_13.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_14.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_14.webp deleted file mode 100644 index c7792e61f1..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_14.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_15.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_15.webp deleted file mode 100644 index 85bad67894..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_15.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_16.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_16.webp deleted file mode 100644 index 11c592c273..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_16.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_17.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_17.webp deleted file mode 100644 index 95544019e8..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_17.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_18.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_18.webp deleted file mode 100644 index 2b885a14b7..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_18.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_19.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_19.webp deleted file mode 100644 index 3469bf2478..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_19.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_20.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_20.webp deleted file mode 100644 index c2f7d5a4a2..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_20.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_21.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_21.webp deleted file mode 100644 index 65f189690c..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_21.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_22.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_22.webp deleted file mode 100644 index d44939270a..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_22.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_23.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_23.webp deleted file mode 100644 index fe419028d4..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_23.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_24.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_24.webp deleted file mode 100644 index 3270c5821f..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_24.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_25.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_25.webp deleted file mode 100644 index 5f4994c754..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_25.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_26.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_26.webp deleted file mode 100644 index 54416a4074..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_26.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_27.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_27.webp deleted file mode 100644 index bbb6ea0e9c..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_27.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_28.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_28.webp deleted file mode 100644 index 3ce4ee4fdb..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_28.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_29.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_29.webp deleted file mode 100644 index e2bd5f4d53..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_29.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_30.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_30.webp deleted file mode 100644 index 974bf4220b..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_30.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_31.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_31.webp deleted file mode 100644 index 1abaa76470..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_31.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_32.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_32.webp deleted file mode 100644 index fcf2731522..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_32.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_33.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_33.webp deleted file mode 100644 index b19471408e..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_33.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_34.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_34.webp deleted file mode 100644 index 1f7713a093..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_34.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_35.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_35.webp deleted file mode 100644 index 81cb5afbd3..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_35.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_36.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_36.webp deleted file mode 100644 index 418c6ef9ff..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_36.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_37.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_37.webp deleted file mode 100644 index fc392eab69..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_37.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_38.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_38.webp deleted file mode 100644 index 40b3c23b14..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_38.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_39.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_39.webp deleted file mode 100644 index ea6cca0bd5..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_39.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_40.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_40.webp deleted file mode 100644 index 131f994fc6..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_40.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_41.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_41.webp deleted file mode 100644 index b55ac88773..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_41.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_42.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_42.webp deleted file mode 100644 index 4e2c17b954..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_42.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_43.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_43.webp deleted file mode 100644 index c632e6ce0d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_43.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_44.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_44.webp deleted file mode 100644 index fc98ef6513..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_44.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_45.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_45.webp deleted file mode 100644 index 81bf8998f2..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_45.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_46.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_46.webp deleted file mode 100644 index 5765c4c053..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_46.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_47.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_47.webp deleted file mode 100644 index 7aec6022bd..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_47.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_48.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_48.webp deleted file mode 100644 index f1de312084..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_48.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_49.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_49.webp deleted file mode 100644 index c699556317..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_49.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_50.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_50.webp deleted file mode 100644 index 4217782cd7..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_50.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_51.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_51.webp deleted file mode 100644 index b0f0755168..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_51.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_52.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_52.webp deleted file mode 100644 index 8ec255126d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_52.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_53.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_53.webp deleted file mode 100644 index c07fc56bc5..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_53.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_54.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_54.webp deleted file mode 100644 index 7b32e3b69d..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_54.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_55.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_55.webp deleted file mode 100644 index 8c57531000..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_55.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_56.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_56.webp deleted file mode 100644 index 617a637c48..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_56.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_57.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_57.webp deleted file mode 100644 index 9939227685..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_57.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_58.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_58.webp deleted file mode 100644 index d8537918f8..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_58.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_59.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_59.webp deleted file mode 100644 index 93eadcf531..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_59.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_60.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_60.webp deleted file mode 100644 index abe3e84f8a..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_60.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_61.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_61.webp deleted file mode 100644 index 382fe141df..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_61.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_62.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_62.webp deleted file mode 100644 index dff5c24b55..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_62.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_63.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_63.webp deleted file mode 100644 index 729d3efb66..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_63.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_64.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_64.webp deleted file mode 100644 index f0d689b069..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_64.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_65.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_65.webp deleted file mode 100644 index e035435642..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_65.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_66.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_66.webp deleted file mode 100644 index 746500b7ff..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_66.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_67.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_67.webp deleted file mode 100644 index 6352900bca..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_67.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_68.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_68.webp deleted file mode 100644 index 46caa69376..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_68.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_69.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_69.webp deleted file mode 100644 index cd446ce528..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_69.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_70.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_70.webp deleted file mode 100644 index f3e431ec10..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_70.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_71.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_71.webp deleted file mode 100644 index 0a27b49156..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_71.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_72.webp b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_72.webp deleted file mode 100644 index 9389f192b7..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_normal_72.webp and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png new file mode 100755 index 0000000000..9b650832f5 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png new file mode 100755 index 0000000000..b0ee512905 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png new file mode 100755 index 0000000000..1a9eb17d7b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png new file mode 100755 index 0000000000..fff8ab5426 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png new file mode 100755 index 0000000000..abcbefb4b8 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png new file mode 100755 index 0000000000..71df42d412 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png new file mode 100755 index 0000000000..343b71eec6 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png new file mode 100755 index 0000000000..29176c77df Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png new file mode 100755 index 0000000000..3514be34ca Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png new file mode 100755 index 0000000000..682106744b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png new file mode 100755 index 0000000000..f7b1e97c68 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png new file mode 100755 index 0000000000..b600b5cb22 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png new file mode 100755 index 0000000000..d0aaf2c048 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png new file mode 100755 index 0000000000..9deb781f58 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png new file mode 100755 index 0000000000..5462f1f23b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png new file mode 100755 index 0000000000..7d5ffaabe6 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png new file mode 100755 index 0000000000..fb6223e409 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png new file mode 100755 index 0000000000..f792bf1c8a Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png new file mode 100755 index 0000000000..40d56375b0 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png new file mode 100755 index 0000000000..e8bb611925 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png new file mode 100755 index 0000000000..e156eba37b Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png new file mode 100755 index 0000000000..22c35f5ef1 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png new file mode 100755 index 0000000000..900175fabe Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png new file mode 100755 index 0000000000..5d4fd47206 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png new file mode 100755 index 0000000000..1df483903e Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png new file mode 100755 index 0000000000..d7f7cd582e Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png new file mode 100755 index 0000000000..a03d3394e8 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png new file mode 100755 index 0000000000..89951cede7 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png new file mode 100755 index 0000000000..81f57d6e8f Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png new file mode 100755 index 0000000000..f3d65a3200 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png new file mode 100755 index 0000000000..460282761d Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png new file mode 100755 index 0000000000..e904ca5758 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png new file mode 100755 index 0000000000..32137993a4 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png new file mode 100755 index 0000000000..8c86c2a258 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png new file mode 100755 index 0000000000..f0d3f7a397 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png new file mode 100755 index 0000000000..9790e6f5d3 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png new file mode 100755 index 0000000000..c92762de1c Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png new file mode 100755 index 0000000000..af636e8370 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png new file mode 100755 index 0000000000..aa16a04e0f Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png new file mode 100755 index 0000000000..016e72d885 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png new file mode 100755 index 0000000000..9a91fd152f Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png new file mode 100755 index 0000000000..1d763f2794 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png new file mode 100755 index 0000000000..c1627112c3 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png new file mode 100755 index 0000000000..dc0db5e9b2 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png new file mode 100755 index 0000000000..68b2f80893 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png new file mode 100755 index 0000000000..a623e4c7aa Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png new file mode 100755 index 0000000000..1ba58a00de Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png new file mode 100755 index 0000000000..af0d9e1a50 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png new file mode 100755 index 0000000000..9b650832f5 Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/values/arrays.xml b/OCH/mogo-och-common-module/src/main/res/values/arrays.xml index bf2ee6d379..07e7450afa 100644 --- a/OCH/mogo-och-common-module/src/main/res/values/arrays.xml +++ b/OCH/mogo-och-common-module/src/main/res/values/arrays.xml @@ -1,79 +1,55 @@ - @drawable/charter_p_xiaozhi_normal_00 - @drawable/charter_p_xiaozhi_normal_01 - @drawable/charter_p_xiaozhi_normal_02 - @drawable/charter_p_xiaozhi_normal_03 - @drawable/charter_p_xiaozhi_normal_04 - @drawable/charter_p_xiaozhi_normal_05 - @drawable/charter_p_xiaozhi_normal_06 - @drawable/charter_p_xiaozhi_normal_07 - @drawable/charter_p_xiaozhi_normal_08 - @drawable/charter_p_xiaozhi_normal_09 - @drawable/charter_p_xiaozhi_normal_10 - @drawable/charter_p_xiaozhi_normal_11 - @drawable/charter_p_xiaozhi_normal_12 - @drawable/charter_p_xiaozhi_normal_13 - @drawable/charter_p_xiaozhi_normal_14 - @drawable/charter_p_xiaozhi_normal_15 - @drawable/charter_p_xiaozhi_normal_16 - @drawable/charter_p_xiaozhi_normal_17 - @drawable/charter_p_xiaozhi_normal_18 - @drawable/charter_p_xiaozhi_normal_19 - @drawable/charter_p_xiaozhi_normal_20 - @drawable/charter_p_xiaozhi_normal_21 - @drawable/charter_p_xiaozhi_normal_22 - @drawable/charter_p_xiaozhi_normal_23 - @drawable/charter_p_xiaozhi_normal_24 - @drawable/charter_p_xiaozhi_normal_25 - @drawable/charter_p_xiaozhi_normal_26 - @drawable/charter_p_xiaozhi_normal_27 - @drawable/charter_p_xiaozhi_normal_28 - @drawable/charter_p_xiaozhi_normal_29 - @drawable/charter_p_xiaozhi_normal_30 - @drawable/charter_p_xiaozhi_normal_31 - @drawable/charter_p_xiaozhi_normal_32 - @drawable/charter_p_xiaozhi_normal_33 - @drawable/charter_p_xiaozhi_normal_34 - @drawable/charter_p_xiaozhi_normal_35 - @drawable/charter_p_xiaozhi_normal_36 - @drawable/charter_p_xiaozhi_normal_37 - @drawable/charter_p_xiaozhi_normal_38 - @drawable/charter_p_xiaozhi_normal_39 - @drawable/charter_p_xiaozhi_normal_40 - @drawable/charter_p_xiaozhi_normal_41 - @drawable/charter_p_xiaozhi_normal_42 - @drawable/charter_p_xiaozhi_normal_43 - @drawable/charter_p_xiaozhi_normal_44 - @drawable/charter_p_xiaozhi_normal_45 - @drawable/charter_p_xiaozhi_normal_46 - @drawable/charter_p_xiaozhi_normal_47 - @drawable/charter_p_xiaozhi_normal_48 - @drawable/charter_p_xiaozhi_normal_49 - @drawable/charter_p_xiaozhi_normal_50 - @drawable/charter_p_xiaozhi_normal_51 - @drawable/charter_p_xiaozhi_normal_52 - @drawable/charter_p_xiaozhi_normal_53 - @drawable/charter_p_xiaozhi_normal_54 - @drawable/charter_p_xiaozhi_normal_55 - @drawable/charter_p_xiaozhi_normal_56 - @drawable/charter_p_xiaozhi_normal_57 - @drawable/charter_p_xiaozhi_normal_58 - @drawable/charter_p_xiaozhi_normal_59 - @drawable/charter_p_xiaozhi_normal_60 - @drawable/charter_p_xiaozhi_normal_61 - @drawable/charter_p_xiaozhi_normal_62 - @drawable/charter_p_xiaozhi_normal_63 - @drawable/charter_p_xiaozhi_normal_64 - @drawable/charter_p_xiaozhi_normal_65 - @drawable/charter_p_xiaozhi_normal_66 - @drawable/charter_p_xiaozhi_normal_67 - @drawable/charter_p_xiaozhi_normal_68 - @drawable/charter_p_xiaozhi_normal_69 - @drawable/charter_p_xiaozhi_normal_70 - @drawable/charter_p_xiaozhi_normal_71 - @drawable/charter_p_xiaozhi_normal_72 + @drawable/xiaozhi_normal_0000 + @drawable/xiaozhi_normal_0001 + @drawable/xiaozhi_normal_0002 + @drawable/xiaozhi_normal_0003 + @drawable/xiaozhi_normal_0004 + @drawable/xiaozhi_normal_0005 + @drawable/xiaozhi_normal_0006 + @drawable/xiaozhi_normal_0007 + @drawable/xiaozhi_normal_0008 + @drawable/xiaozhi_normal_0009 + @drawable/xiaozhi_normal_0010 + @drawable/xiaozhi_normal_0011 + @drawable/xiaozhi_normal_0012 + @drawable/xiaozhi_normal_0013 + @drawable/xiaozhi_normal_0014 + @drawable/xiaozhi_normal_0015 + @drawable/xiaozhi_normal_0016 + @drawable/xiaozhi_normal_0017 + @drawable/xiaozhi_normal_0018 + @drawable/xiaozhi_normal_0019 + @drawable/xiaozhi_normal_0020 + @drawable/xiaozhi_normal_0021 + @drawable/xiaozhi_normal_0022 + @drawable/xiaozhi_normal_0023 + @drawable/xiaozhi_normal_0024 + @drawable/xiaozhi_normal_0025 + @drawable/xiaozhi_normal_0026 + @drawable/xiaozhi_normal_0027 + @drawable/xiaozhi_normal_0028 + @drawable/xiaozhi_normal_0029 + @drawable/xiaozhi_normal_0030 + @drawable/xiaozhi_normal_0031 + @drawable/xiaozhi_normal_0032 + @drawable/xiaozhi_normal_0033 + @drawable/xiaozhi_normal_0034 + @drawable/xiaozhi_normal_0035 + @drawable/xiaozhi_normal_0036 + @drawable/xiaozhi_normal_0037 + @drawable/xiaozhi_normal_0038 + @drawable/xiaozhi_normal_0039 + @drawable/xiaozhi_normal_0040 + @drawable/xiaozhi_normal_0041 + @drawable/xiaozhi_normal_0042 + @drawable/xiaozhi_normal_0043 + @drawable/xiaozhi_normal_0044 + @drawable/xiaozhi_normal_0045 + @drawable/xiaozhi_normal_0046 + @drawable/xiaozhi_normal_0047 + @drawable/xiaozhi_normal_0048 diff --git a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index 97df6692c2..d914d4a1b7 100644 --- a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateTransform import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager +import com.mogo.och.common.module.utils.DateTimeUtil import com.zhidao.thirdlogin.utils.Aes import org.junit.Assert.* import org.junit.Test @@ -27,6 +28,16 @@ class ExampleUnitTest { val encrypt: String = Aes.encrypt(json, KEY, IVS, "UTF-8") println(encrypt) } + @Test + fun testData() { + for(time in 0 until 7200){ + val second2Time = DateTimeUtil.second2Time(time.toLong()) + + val listSplit = second2Time.split(":") + + println("${listSplit[0]}时:${listSplit[1]}分") + } + } @Test fun resetDataOnlyOne(){ diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index b1cd265813..f86355c8b9 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -65,7 +65,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { OverlayViewUtils.dismissOverlayView(this) } - taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 20,iv_xiaozhi_belt) + taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 48,iv_xiaozhi_belt) taxiPxiaozhiLove?.setOnAnimStopListener(object :FrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index 75898fbfb0..89b9c51489 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -92,7 +92,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") } }) - taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 15, iv_xiaozhi_belt) + taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 24, iv_xiaozhi_belt) taxiPXiaozhiBelt?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener { override fun AnimationStopped() { diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png index df003922ad..59cdbafe53 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_000.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png index a377c9fa22..a2efcd5479 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_001.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png index 6b3c113399..f21e4908d8 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_002.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png index 85007f7bf5..795ec65151 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_003.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png index 48b1275205..c7d6d77d41 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_004.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png index 976996147a..77a4aeeaad 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_005.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png index 8b8b34b1d9..b3ca7beeb2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_006.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png index 93a8766cb0..9836200d64 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_007.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png index b099132acc..4b9f5e7ea9 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_008.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png index 07c4391aad..e0870a2a30 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_009.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png index bf1890980e..b267279bc2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_010.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png index 7c92f9092a..a4284e2dd0 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_011.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png index 4492a095d8..6d816c4faa 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_012.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png index ad2c2d5491..0a8ea33df6 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_013.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png index 0d982f3806..8866597ef7 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_014.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png index fc97c2dd42..51f06b09aa 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_015.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png index c0203d8e49..bf46af12b2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_016.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png index 9b140ae8dc..77c8255d71 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_017.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png index bb936b738a..9a57e37bfc 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_018.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png index 89726692a1..dede5a4856 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_019.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png index 4aa0ba307d..a0ea531950 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_020.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png index cede039453..f4b15b6661 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_021.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png index 379641c7d0..b1f2067c24 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_022.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png index c7ca4be6e7..9c279818ec 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_023.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png index 94ba1a3577..3e28efd6cd 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_024.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png index 41521743ea..a7f8bf86ea 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_025.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png index 63584b72af..7b51471ac9 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_026.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png index 49555422b0..1f3e439184 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_027.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png index 63fb714d40..5b90ae5f30 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_028.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png index 5abe8a6ebb..6d00d8830c 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_029.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png index 124e72733f..32df235f4b 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_030.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png index e48f57fdc0..17038d1417 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_031.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png index bf2436db6f..f6b562b266 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_032.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png index ca84961ca3..77c017b63d 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_033.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png index e6b47d3107..78f31890d7 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_034.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png index 25286cba05..7b10b0e4bf 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_035.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png index 30b7996676..b7544a69f2 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_036.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png index 0ffdaf7820..60a883256c 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_037.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png index bdf5ce5f1f..bf9b431711 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_038.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png index adbf77522f..c7339d4ca4 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_039.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png index 1d30b1e3e3..18c4a23f80 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_040.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png index d5edec929e..53d4fe40ee 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_041.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png index 5fe8371d2d..daac0b3e83 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_042.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png index ad3bcbad5d..c56f4b2183 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_043.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png index 7d07ff5571..dabe1119d0 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_044.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png index 2d3747ed6c..493df9d1b3 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_045.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png index 1ee3cbd54c..f8a2b4379e 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_046.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png index 5f69e5ac69..4b3a022ebc 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_047.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png index cda6024b03..59cdbafe53 100755 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png and b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_048.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_049.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_049.png deleted file mode 100755 index b983e8e0f1..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_049.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_050.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_050.png deleted file mode 100755 index 93ba6fbe9a..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_050.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_051.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_051.png deleted file mode 100755 index 5623db4587..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_051.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_052.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_052.png deleted file mode 100755 index 34560dd9d2..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_052.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_053.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_053.png deleted file mode 100755 index f689722fcd..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_053.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_054.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_054.png deleted file mode 100755 index 6cf43054fc..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_054.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_055.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_055.png deleted file mode 100755 index 9e9ff1ae67..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_055.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_056.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_056.png deleted file mode 100755 index d5864d255f..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_056.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_057.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_057.png deleted file mode 100755 index 14c3e2d00e..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_057.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_058.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_058.png deleted file mode 100755 index 704667b20d..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_058.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_059.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_059.png deleted file mode 100755 index 5f01473637..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_059.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_060.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_060.png deleted file mode 100644 index 2c0e9e91e3..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_060.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_061.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_061.png deleted file mode 100644 index a90b91a899..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_061.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_062.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_062.png deleted file mode 100644 index 4f0eece63d..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_062.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_063.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_063.png deleted file mode 100644 index fa48df388b..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_063.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_064.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_064.png deleted file mode 100644 index b92191b853..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_064.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_065.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_065.png deleted file mode 100644 index c00bf40018..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_065.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_066.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_066.png deleted file mode 100644 index 28f7b191d4..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_066.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_067.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_067.png deleted file mode 100644 index e8ab94541a..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_067.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_068.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_068.png deleted file mode 100644 index 8f905f5196..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_068.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_069.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_069.png deleted file mode 100644 index a190a62959..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_069.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_070.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_070.png deleted file mode 100644 index d33b1e83e5..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_070.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_071.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_071.png deleted file mode 100644 index dff7f32927..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_071.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_072.png b/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_072.png deleted file mode 100644 index da70b6071c..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable/xiaozhi_belt_072.png and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index 45255a8308..61475df24a 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -159,7 +159,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_50" app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal" - android:layout_marginBottom="-50dp" + android:layout_marginBottom="-80dp" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/OCH/taxi/passenger/src/main/res/values/arrays.xml b/OCH/taxi/passenger/src/main/res/values/arrays.xml index 2d5f5a2d76..d17614ba84 100644 --- a/OCH/taxi/passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/passenger/src/main/res/values/arrays.xml @@ -223,33 +223,6 @@ @drawable/xiaozhi_belt_046 @drawable/xiaozhi_belt_047 @drawable/xiaozhi_belt_048 - @drawable/xiaozhi_belt_049 - - @drawable/xiaozhi_belt_050 - @drawable/xiaozhi_belt_051 - @drawable/xiaozhi_belt_052 - @drawable/xiaozhi_belt_053 - @drawable/xiaozhi_belt_054 - @drawable/xiaozhi_belt_055 - @drawable/xiaozhi_belt_056 - @drawable/xiaozhi_belt_057 - @drawable/xiaozhi_belt_058 - @drawable/xiaozhi_belt_059 - - @drawable/xiaozhi_belt_060 - @drawable/xiaozhi_belt_061 - @drawable/xiaozhi_belt_062 - @drawable/xiaozhi_belt_063 - @drawable/xiaozhi_belt_064 - @drawable/xiaozhi_belt_065 - @drawable/xiaozhi_belt_066 - @drawable/xiaozhi_belt_067 - @drawable/xiaozhi_belt_068 - @drawable/xiaozhi_belt_069 - - @drawable/xiaozhi_belt_070 - @drawable/xiaozhi_belt_071 - @drawable/xiaozhi_belt_072 \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 29da8db5fc..96f1b8918a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -64,7 +64,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { OverlayViewUtils.dismissOverlayView(this) } - taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 20,iv_xiaozhi_belt) + taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 48,iv_xiaozhi_belt) taxiPxiaozhiLove?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { d(SceneConstant.M_TAXI_P + TAG, "动画暂停") @@ -76,7 +76,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { super.onAttachedToWindow() val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) - taxiPxiaozhiLove?.start() + taxiPxiaozhiLove?.reStart() v_video_right_rear_view.resetView() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index e2fcf09d52..f462d85284 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -100,7 +100,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "可以启动自驾动画暂停") } }) - taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 15, iv_xiaozhi_belt) + taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 24, iv_xiaozhi_belt) taxiPXiaozhiBelt?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener { override fun AnimationStopped() { diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png index df003922ad..59cdbafe53 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png index a377c9fa22..a2efcd5479 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png index 6b3c113399..f21e4908d8 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png index 85007f7bf5..795ec65151 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png index 48b1275205..c7d6d77d41 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png index 976996147a..77a4aeeaad 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png index 8b8b34b1d9..b3ca7beeb2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png index 93a8766cb0..9836200d64 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png index b099132acc..4b9f5e7ea9 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png index 07c4391aad..e0870a2a30 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png index bf1890980e..b267279bc2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png index 7c92f9092a..a4284e2dd0 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png index 4492a095d8..6d816c4faa 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png index ad2c2d5491..0a8ea33df6 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png index 0d982f3806..8866597ef7 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png index fc97c2dd42..51f06b09aa 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png index c0203d8e49..bf46af12b2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png index 9b140ae8dc..77c8255d71 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png index bb936b738a..9a57e37bfc 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png index 89726692a1..dede5a4856 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png index 4aa0ba307d..a0ea531950 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png index cede039453..f4b15b6661 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png index 379641c7d0..b1f2067c24 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png index c7ca4be6e7..9c279818ec 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png index 94ba1a3577..3e28efd6cd 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png index 41521743ea..a7f8bf86ea 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png index 63584b72af..7b51471ac9 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png index 49555422b0..1f3e439184 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png index 63fb714d40..5b90ae5f30 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png index 5abe8a6ebb..6d00d8830c 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png index 124e72733f..32df235f4b 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png index e48f57fdc0..17038d1417 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png index bf2436db6f..f6b562b266 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png index ca84961ca3..77c017b63d 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png index e6b47d3107..78f31890d7 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png index 25286cba05..7b10b0e4bf 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png index 30b7996676..b7544a69f2 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png index 0ffdaf7820..60a883256c 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png index bdf5ce5f1f..bf9b431711 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png index adbf77522f..c7339d4ca4 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png index 1d30b1e3e3..18c4a23f80 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png index d5edec929e..53d4fe40ee 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png index 5fe8371d2d..daac0b3e83 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png index ad3bcbad5d..c56f4b2183 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png index 7d07ff5571..dabe1119d0 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png index 2d3747ed6c..493df9d1b3 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png index 1ee3cbd54c..f8a2b4379e 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png index 5f69e5ac69..4b3a022ebc 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png index cda6024b03..59cdbafe53 100755 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_049.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_049.png deleted file mode 100755 index b983e8e0f1..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_049.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_050.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_050.png deleted file mode 100755 index 93ba6fbe9a..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_050.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_051.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_051.png deleted file mode 100755 index 5623db4587..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_051.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_052.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_052.png deleted file mode 100755 index 34560dd9d2..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_052.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_053.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_053.png deleted file mode 100755 index f689722fcd..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_053.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_054.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_054.png deleted file mode 100755 index 6cf43054fc..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_054.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_055.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_055.png deleted file mode 100755 index 9e9ff1ae67..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_055.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_056.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_056.png deleted file mode 100755 index d5864d255f..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_056.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_057.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_057.png deleted file mode 100755 index 14c3e2d00e..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_057.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_058.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_058.png deleted file mode 100755 index 704667b20d..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_058.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_059.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_059.png deleted file mode 100755 index 5f01473637..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_059.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_060.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_060.png deleted file mode 100644 index 2c0e9e91e3..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_060.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_061.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_061.png deleted file mode 100644 index a90b91a899..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_061.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_062.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_062.png deleted file mode 100644 index 4f0eece63d..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_062.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_063.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_063.png deleted file mode 100644 index fa48df388b..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_063.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_064.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_064.png deleted file mode 100644 index b92191b853..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_064.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_065.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_065.png deleted file mode 100644 index c00bf40018..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_065.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_066.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_066.png deleted file mode 100644 index 28f7b191d4..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_066.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_067.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_067.png deleted file mode 100644 index e8ab94541a..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_067.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_068.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_068.png deleted file mode 100644 index 8f905f5196..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_068.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_069.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_069.png deleted file mode 100644 index a190a62959..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_069.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_070.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_070.png deleted file mode 100644 index d33b1e83e5..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_070.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_071.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_071.png deleted file mode 100644 index dff7f32927..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_071.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_072.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_072.png deleted file mode 100644 index da70b6071c..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_072.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 642ce95de1..ff44f994ee 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -162,7 +162,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_50" app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal" - android:layout_marginBottom="-50dp" + android:layout_marginBottom="-80dp" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml index 2d5f5a2d76..d17614ba84 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml @@ -223,33 +223,6 @@ @drawable/xiaozhi_belt_046 @drawable/xiaozhi_belt_047 @drawable/xiaozhi_belt_048 - @drawable/xiaozhi_belt_049 - - @drawable/xiaozhi_belt_050 - @drawable/xiaozhi_belt_051 - @drawable/xiaozhi_belt_052 - @drawable/xiaozhi_belt_053 - @drawable/xiaozhi_belt_054 - @drawable/xiaozhi_belt_055 - @drawable/xiaozhi_belt_056 - @drawable/xiaozhi_belt_057 - @drawable/xiaozhi_belt_058 - @drawable/xiaozhi_belt_059 - - @drawable/xiaozhi_belt_060 - @drawable/xiaozhi_belt_061 - @drawable/xiaozhi_belt_062 - @drawable/xiaozhi_belt_063 - @drawable/xiaozhi_belt_064 - @drawable/xiaozhi_belt_065 - @drawable/xiaozhi_belt_066 - @drawable/xiaozhi_belt_067 - @drawable/xiaozhi_belt_068 - @drawable/xiaozhi_belt_069 - - @drawable/xiaozhi_belt_070 - @drawable/xiaozhi_belt_071 - @drawable/xiaozhi_belt_072 \ No newline at end of file