From fcba006453424c735fa8d3272c9a67ab4abcb907 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 12 Mar 2024 15:19:00 +0800 Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[=E9=9F=B3=E4=B9=90=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E6=8A=BD=E5=8F=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/taxi/passenger/build.gradle | 3 +- .../passenger/ui/TaxiPassengerBaseFragment.kt | 82 ++++++-------- .../taxi_p_map_view_dir_end.png | Bin 5779 -> 10957 bytes .../taxi_p_map_view_dir_start.png | Bin 5574 -> 10855 bytes .../main/res/layout/taxi_p_base_fragment.xml | 91 +-------------- .../passenger/src/main/res/values/colors.xml | 20 ++-- .../passenger/src/main/res/values/strings.xml | 3 +- OCH/taxi/pcommon/.gitignore | 1 + OCH/taxi/pcommon/build.gradle | 50 +++++++++ OCH/taxi/pcommon/consumer-rules.pro | 0 OCH/taxi/pcommon/proguard-rules.pro | 21 ++++ OCH/taxi/pcommon/src/main/AndroidManifest.xml | 5 + .../passenger/ui/evaluate/EvaluateView.kt | 19 ++-- .../ui/evaluate/EvaluateViewModel.kt | 13 ++- .../och/taxi/passenger/ui/music/MusicView.kt | 2 +- .../taxi/passenger/ui/music/MusicViewModel.kt | 8 +- .../ui/music/list/MusicListItemAdapter.kt | 9 +- .../passenger/ui/music/list/MusicListView.kt | 3 +- .../ui/music/list/MusicListViewModel.kt | 3 +- .../ui/music/playing/MusicPlayingView.kt | 2 +- .../ui/music/playing/MusicPlayingViewModel.kt | 3 - .../passenger/ui/rightbar/RightBarView.kt | 106 ++++++++++++++++++ .../passenger/ui/setting}/TaxiPSettingView.kt | 10 +- .../drawable-nodpi/taxi_p_evaluate_close.png | Bin .../drawable-nodpi/taxi_p_evaluate_great.png | Bin .../drawable-nodpi/taxi_p_evaluate_low.png | Bin .../taxi_p_function_voice_humb.png | Bin .../taxi_p_iv_light_increase_set.png | Bin .../drawable-nodpi/taxi_p_iv_light_set.png | Bin .../taxi_p_iv_voice_increase_set.png | Bin .../drawable-nodpi/taxi_p_iv_voice_set.png | Bin .../drawable-nodpi/taxi_p_music_checked.png | Bin .../taxi_p_music_list_playing.png | Bin .../res/drawable-nodpi/taxi_p_music_next.png | Bin .../drawable-nodpi/taxi_p_music_normal.png | Bin .../res/drawable-nodpi/taxi_p_music_pause.png | Bin .../res/drawable-nodpi/taxi_p_music_play.png | Bin .../res/drawable-nodpi/taxi_p_music_pre.png | Bin .../taxi_p_reset_location_bg.png | Bin .../drawable-nodpi/taxi_p_setting_checked.png | Bin .../taxi_p_setting_music_bg.png | Bin .../drawable-nodpi/taxi_p_setting_view_bg.png | Bin .../res/drawable-nodpi/taxt_p_go2_list.png | Bin .../res/drawable-nodpi/taxt_p_go2_playing.png | Bin .../res/drawable-nodpi/taxt_p_greate_text.png | Bin .../taxt_p_location_center_checked.png | Bin .../taxt_p_location_center_normal.png | Bin .../res/drawable-nodpi/taxt_p_music_bg.png | Bin .../drawable-nodpi/taxt_p_music_bg_middle.png | Bin .../taxt_p_music_bg_relax_bottom.png | Bin .../taxt_p_music_bg_relax_head.png | Bin .../drawable-nodpi/taxt_p_setting_normal.png | Bin .../taxi_p_center_location_selector.xml | 0 ...xi_p_function_voice_right_process_humb.xml | 0 .../drawable/taxi_p_music_list_item_bg.xml | 0 .../res/drawable/taxi_p_music_list_tag_bg.xml | 2 +- .../res/drawable/taxi_p_music_selector.xml | 0 .../res/drawable/taxi_p_setting_selector.xml | 0 .../drawable/taxt_p_music_seekbar_style.xml | 6 +- .../src/main/res/layout/taxi_p_evaluate.xml | 6 +- .../src/main/res/layout/taxi_p_music.xml | 0 .../src/main/res/layout/taxi_p_music_list.xml | 2 +- .../res/layout/taxi_p_music_list_item.xml | 4 +- .../main/res/layout/taxi_p_music_playing.xml | 10 +- .../src/main/res/layout/taxi_p_rightbar.xml | 95 ++++++++++++++++ .../main/res/layout/taxi_p_setting_view.xml | 12 +- .../pcommon/src/main/res/values/colors.xml | 17 +++ .../pcommon/src/main/res/values/strings.xml | 5 + settings.gradle | 1 + 69 files changed, 408 insertions(+), 206 deletions(-) create mode 100644 OCH/taxi/pcommon/.gitignore create mode 100644 OCH/taxi/pcommon/build.gradle create mode 100644 OCH/taxi/pcommon/consumer-rules.pro create mode 100644 OCH/taxi/pcommon/proguard-rules.pro create mode 100644 OCH/taxi/pcommon/src/main/AndroidManifest.xml rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt (92%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt (83%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt (98%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt (51%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt (96%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt (97%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt (92%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt (99%) rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt (93%) create mode 100644 OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt rename OCH/taxi/{passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting => pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/setting}/TaxiPSettingView.kt (97%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_evaluate_close.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_evaluate_great.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_evaluate_low.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_music_checked.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_music_list_playing.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_music_next.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_music_normal.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_music_pause.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_music_play.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_music_pre.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_setting_checked.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_setting_music_bg.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_go2_list.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_go2_playing.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_greate_text.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_music_bg.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_bottom.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable-nodpi/taxt_p_setting_normal.png (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable/taxi_p_center_location_selector.xml (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable/taxi_p_music_list_item_bg.xml (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable/taxi_p_music_list_tag_bg.xml (94%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable/taxi_p_music_selector.xml (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable/taxi_p_setting_selector.xml (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/drawable/taxt_p_music_seekbar_style.xml (78%) rename OCH/taxi/{passenger => pcommon}/src/main/res/layout/taxi_p_evaluate.xml (96%) rename OCH/taxi/{passenger => pcommon}/src/main/res/layout/taxi_p_music.xml (100%) rename OCH/taxi/{passenger => pcommon}/src/main/res/layout/taxi_p_music_list.xml (95%) rename OCH/taxi/{passenger => pcommon}/src/main/res/layout/taxi_p_music_list_item.xml (95%) rename OCH/taxi/{passenger => pcommon}/src/main/res/layout/taxi_p_music_playing.xml (95%) create mode 100644 OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml rename OCH/taxi/{passenger => pcommon}/src/main/res/layout/taxi_p_setting_view.xml (94%) create mode 100644 OCH/taxi/pcommon/src/main/res/values/colors.xml create mode 100644 OCH/taxi/pcommon/src/main/res/values/strings.xml diff --git a/OCH/taxi/passenger/build.gradle b/OCH/taxi/passenger/build.gradle index 1a3fde2f56..cff4ee3253 100644 --- a/OCH/taxi/passenger/build.gradle +++ b/OCH/taxi/passenger/build.gradle @@ -57,9 +57,10 @@ dependencies { implementation rootProject.ext.dependencies.amapnavi3dmap implementation rootProject.ext.dependencies.amapsearch - implementation project(":OCH:common:common") +// implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') + implementation project(':OCH:taxi:pcommon') } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 5a97fa57ca..6a0fc0aa91 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -21,10 +21,13 @@ import com.mogo.och.common.module.manager.xiaozhimanager.ZhiStateManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.model.TaxiPassengerModel import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.ui.bottom.BottomBar import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView +import com.mogo.och.taxi.passenger.ui.evaluate.EvaluateView +import com.mogo.och.taxi.passenger.ui.rightbar.RightBarView import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.taxi_p_base_fragment.* @@ -74,31 +77,29 @@ class TaxiPassengerBaseFragment() : } private fun settingAndMusicListener() { - ck_setting.isChecked = false - ck_setting_only.isChecked = false - ck_music.isChecked = false + rbv_setting_music.setOrderIdCallback(object :RightBarView.RightBarCallback{ + override fun setSettingAndMusicShow(settingShow: Boolean, musicShow: Boolean) { + clSettingView.visibility = if(settingShow) View.VISIBLE else View.GONE + mv_music_info.visibility = if(musicShow) View.VISIBLE else View.GONE + } - ck_setting.setOnCheckedChangeListener { _, isChecked -> - clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE - ck_setting_only.isChecked = isChecked - if(isChecked){ - ck_music.isChecked = false + override fun setGo2CenterClick() { + when (bottom.getCurrentPage()) { + BottomBar.SelectView.PRECISIONMAP -> { + //切换到地图中间 + mapBizView.getUI()?.let { + it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null) + } + } + BottomBar.SelectView.OVERMAPVIEW -> { + overMapView.displayCustomOverView() + } + + else -> {} + } } - } - ck_setting_only.setOnCheckedChangeListener { _, isChecked -> - clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE - ck_setting.isChecked = isChecked - if(isChecked){ - ck_music.isChecked = false - } - } - ck_music.setOnCheckedChangeListener { _, isChecked -> - mv_music_info.visibility = if(isChecked) View.VISIBLE else View.GONE - if(isChecked){ - ck_setting.isChecked = false - ck_setting_only.isChecked = false - } - } + + }) } private fun initListener() { @@ -118,8 +119,7 @@ class TaxiPassengerBaseFragment() : romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE } - con_third_group.visibility = View.VISIBLE - con_only_one_group.visibility = View.GONE + rbv_setting_music.setShowOnlySetting(0) pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE @@ -132,8 +132,7 @@ class TaxiPassengerBaseFragment() : speedView.visibility = View.VISIBLE romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE - con_third_group.visibility = View.VISIBLE - con_only_one_group.visibility = View.GONE + rbv_setting_music.setShowOnlySetting(0) pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE @@ -144,13 +143,9 @@ class TaxiPassengerBaseFragment() : mapBizView.visibility = View.GONE presenter?.setItineraryVisibility() speedView.visibility = View.GONE - ck_setting.isChecked = false - ck_music.isChecked = false - ck_setting_only.isChecked = false + rbv_setting_music.setShowOnlySetting(1) romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE - con_third_group.visibility = View.GONE - con_only_one_group.visibility = View.VISIBLE pcnActionView.visibility = View.GONE CallerHmiManager.hideTrafficLightView() infoVideoView.visibility = View.VISIBLE @@ -163,22 +158,6 @@ class TaxiPassengerBaseFragment() : } }) - iv_center_location_bg.onClick { - when (bottom.getCurrentPage()) { - BottomBar.SelectView.PRECISIONMAP -> { - //切换到地图中间 - mapBizView.getUI()?.let { - it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null) - } - } - BottomBar.SelectView.OVERMAPVIEW -> { - overMapView.displayCustomOverView() - } - - else -> {} - } - - } arrivedView.arrivedVisilityChangeListenr = object :ArrivedView.ArrivedVisilityChangeListenr{ override fun isShow(show: Boolean) { CallerLogger.d(M_TAXI_P + TAG, "arrived ${show}") @@ -201,6 +180,13 @@ class TaxiPassengerBaseFragment() : } } } + evaluate.setOrderIdCallback(object :EvaluateView.EvaluateCallback{ + override fun getOrderId(): String { + val orderNo = TaxiPassengerModel.currentOCHOrder?.orderNo + return orderNo?:"" + } + + }) } override fun onResume() { diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_end.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_end.png index a81336d4c23bf6b45c3c4aeb0e66c44cab48cdd1..385c078c448d1b081ddd729d7975936abf058ee8 100644 GIT binary patch literal 10957 zcmV;;Dl*lHP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91L!biy1ONa40RR91X#fBK0NEN;K>z?MH%UZ6RCod9e0jWIMU`jW?YF-@ z`wK~k2@oO#!q&)cA~Aq1jYIq(*n-PwH?6ee(zYXZnrWPIP}}*?O4BW))Uc$=){xJphtGczG^R07EovM3ZEcGS?eb4e# zHM8Yx+X~N)qF{lx!xL0wO;%BuRZ6EV9eFy6d}W7K6qyyd7+H20X(x(o z8<5zMRu*DpSy7;EjVH?oT-C@?fwEK-DfAD}^d(E_`@-^++w<3cdoQLFV2&mrM->cx z&pnRc^2qxmC%8fD@FddfctK!$Ro}`5H9Hg36%dF6r#1^~$Utf_k2aR0bOWGdT!B6(*R%C~m5i?W zHiT$z%F;J^>a07|mH!}WbR>Wz6k?{s47K0>{pFTj{I@95owi%@-E?osax0JkFanuZ zb~1&F)#e&HWDuEVP}q(jSd<7#j%UU7NKKh0Kxjy8Au{1mCFSoa=c3`7i}D_AyVvF4 zbN_G987&XbmK-)1dslpZYFoPUW3Ba{*;XZRyluk(0Y)$Zf#PnWtUAavz%XTGeFGGN z!RW;e?NlrsRsu*vv|wK}gg}RqM#CkqzP(b2N;Su_^`k+Ues9ZF_w^nQAfV>ZL+Od- zm!s1OO-YuY$KkzxW9xotRj`0PpA9jP^ zKYYKf^dejL22KPZgeVXu#xO}qXF!_(=KL^bo@L-s;ZcdSB;`h0P>k&rj3Ej@NPVon z2j*=`1;!E}T!Ml;8tD-El$Lt9Cn_o{D{F=6o#CdzQ?3YSP=5VRRbT z*9~TE4%$#Z{OydN+Wfc`MW@*QD^=UyFdPHG?%-66Vlsr;B}4*Pk0=R$5RA02PjfjX z!U59`cM(w&fRVS9leLwdgQOr@Mp{IaAPoRjLn=f%ibyMPN+2m=UDvk_wg&qu5UJ>i zHG{Jko&M2(1G)zf355r4q#uSvWS;mvjMiy(c~#L4wpXMznHI^w5Job{9T{RUpfu-2 z5>Q}(;_LznGDb>l+73pjicOmV5D1D_02lzqMauG6w;&O)83G7_CR{o>;_2<9CTD}}2ci@mvK6V4_6jo4J^>fU8np1hPX!|=WvOU6}tAMM5lv`a0 zDP&oMG9USnDUBTJSk7nW*?x2ypuHJO>d+3pne-3+c-2F!wog^ybF#p(Z2@Qi%OOB5 zu>{$9qy)>g+^$?D)txI_+P!3E5RWy+02~u3>s^$}vaKql}vf;ZgUJXG0_kj%R0g>`wy6f#$ZRi23wllE% z9~*!kf*=s+fF?=;3Fma&7RdmLMMcP@s5D7Ike!2RGL^9}MvYi*@?sd#me0*Qi${Bb z)%IE}m1@Px7i{IV0TAvs+J zX`=&1d2JZnwxZJtD*s`rN@Nc`Jt*QY5=I~pjp);W$um$PK%x$)=Wc=|j>sEzk$!BO zsEtvX#xpvJ)UXfRU`%Y8s$PP6zzzgRnGaweLf8i%TdR1alnU-LFt84dF4TtVBU>|V zk7H%t($cTeI0L5DgZlP&C0A1RS!ogfP#Oq|q$r|okQGOsCtF~Ws22PhG~&_3 zK@@|FzM4)M9kvJ?2oAXxB-!Dr1W+{}niT5H?7~2GL$R||D1QT^UKdZi|Cdya2>z@0 zp9df>u}iPktf&I&5F&_$kqCldR#a9oA+llo(1j91!-#quu7E>?B7(-Y7*C8Y+B77E zG-DI+5t*W#4kqq605F&e01S<(&)ovC4)G64Xowh6HBiqvWkp~|9HAxa9I5Aj7D z589RXy-BGm=(=Y3&P6AZwdOEFGQ`@hzvsIemkHMJD`nm>Ad-1dMn*6pnc~uO1x;W% zZ3hGMlmrAWbRCNlpgoTuo`*{fw6h!AFUBEIU;>b#tz}gMPN-EXW$RSV)$};P5k}*D zP?b6dfnyECONft_*ckPMCjsey#JQ?o-szdtdu!yjURlMx%C zi6hXp>9Q#kW1; zVgpJDZ3m2GKxc~*Lbsgf6cP=fEbKTc0YqGRtUJy<78W8kHCqBwC-(jOqVpO^ATvTT ztg!e`m?Tn_eN@;cJRKTEp(&gFq6R*g$pLk`q z^y=?w^`~y=_iz+P?|89c7Xpl5Do1wijOz+5(@&QJNOfRKIQa5+%aD!8NplN>x^O-h z%L9#ZJV={{X|Rx?n5NhUqq>=xZf^TL>=6)6P#_^<`y6F=x@CKplS^CS*U;z;lETmc zL+^fikuLYlw)!^39;S#ULEtK4KB|VSCb$%FK^==Fu#D`10JH@Z3imKpx$aui-tvxg z+(xP5_GkQ@0Gsqhe_~p%hE_FwygNAog6(_O{jOf@5A8}-TQ1dtYT{rXCxqMLt8^w( z`8KGMK&v zFjQsW1~3A7-5p=dB>cy=0_6=RKo`Lv?*+Y$x<#CrMP8mQJsR&dV?p*$it4C~i)6aN+MxA~&mU-+@=~?Yp*DUY%>>^I3E`abb zA($2EL^tk4BvK@Vi-ZcaM5KvQPKR4kJMEmE(w{=Z4{;Xu03T0eu}v+qs(T1M3a|%q z$!LsdBdE8u540O19n7-~46%-Rri_pbT=%LjrNY zg~)AB`LNVi+;h*Bs4$YTJGD%!TG}e@EC~XXa{+-(5U3{N0AX<21_s`&;eS-{rx7BE zCU!!r>P>Sd&ACwYAC5S)WeQ6$@J!b${&%Qef&p81iS1&0N-s( zDZFQi!_Z6LDYfJLVnr~lA=E=bLgb7B`$Af|4BTo-umFN*nr*p?A_E{hr)w}k+RLgd z@R)#MM{l#rgWw#4P&K3}nt14WM@NgnlV+*DNuedVal={{wds0ekU|FQp7 zbYM?1Cw(O6WZLY`lirgVDs8qu%wus(M4u)>ADmqyu31bZrR;q+N_8Rf3Pa7(z+{nJ|(kQ6C@!;e^!)by+WF zjji`?o{GzqNvhV5S2k=&^+6iJXwVh_9|3~sau5arBLgOqBXyzj;c}NMk>#HFmsux` zGXg@-Ge4~9zKytU$=RI?u52*gzxkP9*2SM2VKmu3(>mFnd({tG>#ZlJ%4Odw23h-< zOKxp*(>RzXYFj_r0o{13yeR&NNm0V;9|4SJ01wp%06rZu z0z&5uWsJN{7lY3!K{&cm>ajEX;0y1h29I}DwRV!|m=9-5wjrSx_;4YTJnaMn!Jys= z5qM6jneuR1#a=$`>bu*VR4f%X4pFCl_Q`f9h4VpE=w11>a+lK^?78owL({MNaeL2W zUoC~t-(K0i_HO5xtA5;;>73!XkgOBl_wAOZS=64Vzg2d3t*B<(oe1tmOrtUA5OVMc z(Wkm3y|{3^JCzqw++FZ2ybwgeoz*x5*eXn0C&Psc=820-2D#$GAyQ)_I52_X6a<4! zL^RQ!euZqgFy3gdaS*BQ-ayPH*k0Ni4aD%KC;im+hiVl-%?KD+6H&AF*Ak^GRUozH(_#^qjXSRpgL3+ zUI+S+jsO}#-KWc&NI9<2aRPyux%w1%NWo-qk#LE*HEac~Ff2 zb527g;!)z?)?-d_+n{QL^{g{ojO;2r(-2~>VJ^fT5Fj}}VS1{I*bst}MBayR=aJJi zB?Rrc!lWNAKD^jzE_VIAC_I_xwqwJ`$GsQ;iP7WYG$e+E;aNm2Awn!Hf-wdbjND$msop|*%{iptnAO4dZD@Q#~W zrk(We#;(EHOz_~zcAtBFE;#-DnSIaRS=qPlJLQ~LkMdcqJuEBlkA*o4^oO|EpWs*B%@yErOYTQQ*K6vABCqGBP`JogL1UP4zX>Mx4HQDa7 zKa`>2#4r-re#fJ?R{Y`Z;q-TWG4JKtrOwT?+EdQ`+q}Q<1KHj`+)?g-<@@C}>|+^x z)?o8Wk;atAdPP7;ENq4i0O)dvRY8#)8wdm<|UcT zDc58tAOCib)NlwBO1stsJ@?-*oGEVbJy5snu19Mv7v9{`al$(rQsd=1>?!Acy5KLo zHdp-hRlTWjcR-;Qng|H*I4H0-45j3SYp{T4E-q=O3~-GxF;+gs12K+CfKA9rI*>Lx zEIy?I(m^+tfKUVp76)k#qBfWl292Os>W*EVdQp1T*&h(%tNlBpJu7Z5=d93jW?q!> z{koof=`Af@%S2giGgJg!-|^UO)xpQVT58RNQ8sUBFXif7)Eg8Z_}JjKweQSyo%fl1 zZo*r@LL6$no5HZTJyLW-#5#cht_U{^-mr7`BOp8+QabRzEG&5xK$!Biy;a0+;udA= zF%rQSIJ{h?R7f84rua;?M@PAHY|tVSA)^y$&{3)>tIwM3OkMWP#7UjoEWIf| z^K%=!CSQARyK0^3?*7e}%NS4s{f%9}{YrWLR~GhFH$7gT^Vbixd#C?xVbD3o9U2a7 zA6{+F3!~i56_tJ8Tim<-{!b27_Pq-0srBF!HxFm%bI{Y29T6!nf#_uMMxU2LjC?OE zSBNY}J-1}?3}krJg;WngP3$4%@~lrr0RW9?0~kmJ-%SKy-ob1{mL4ikv?fTO_zuGl zZL2IXImOp9`Mjs!-(UCbHD`9#r0kWViq!MO2FV)0UXA3_{xKIIchop51}@&Gb(O;!Y}{vCpEqCSJj+d*DY9G7k7US zB#`Eaa>f7MSAS96ck8d~LDziOowGF4a{R?!Va7tyPag3*PF$K|EUmpSr5^vpfCrMW zuCgxiYLh$Cj>G^$7hK-_qn%XaM|MR%P({)-;9xubJU+A7db+CgKB@LSS5xI4`041( zOV>J`75Mi)E?sMbICu;o#T7jxy*cV1-CMb)=R`1`Z~$pDf>S@1ulMhc>RX=*oZ+ou z3jPPay@JNYz6fM) zb@)^eKi;vhUdmwv>-dJm&rYy2^Da$!g)Xc9)U9Q|?F4t)Cm!o4?^+uc*RH77HvFpQ z46F-Mo}(QQPoC(~R&~bC&VLUa*HC#|e^$-|2uRmRrYX&|Yg}|unWUb8n3r1wgb`H) zD$vv0!l1*?Ty|$Wi zGE53W=w_Yw4-l9-Tx*}q)8I}%*-Op7Fjbg;X{u%RnKatg5H4|c-Fd~(^y?pP%O86N z^{x@BIGYT?uvRy$sOudoYnfE2J(?^mlnapfPQ@cohGF*PYKt^LtAtrTqg={jDUdcU z>cwWD41Ma+ya_r=Ka#oZj*F>}K+Szf>DH5EE0w!LFu*NCzLTIaP3zdofpO?Oo(TYy z9o+M#4b1cMzm7YQQtKQyoO)i`o^p!Uii?`u)DxYtuJkC;nOSGM>8=@|YGlZC&2Td3 zd^oERgUVpk|NKvC!>hhq@rvt%99lbg^9BLXHrxmSgv>L@E&(;CXoy>o03wTpyzGRi zBS45c;*Chw#@D&OV0U7tbZN_Js@ngQ8dzIX!`lPc4X6kh=RE+8DlSySepG2UU_Yob za{0Pu==twgqmB1gTHLD6W}V2xx{2LrNJG5h(wpx2X#2s6M4dvryAawl zvMIM?y0!RAdm5AKzUMaqkZ!eaRjeumgKjNf^OJGE3?QH;RT@*i>*TQ*kvB=WSP8LO zC8$Q_#On)_m;Pg6G%G=QAR1irK)w9peRcbl71g|5(XivZht~n#vEX{ws^PB9&rY_T zx$jJ8kAG*nWBwA)qMtJ=gtcN+T>XQp^UU(09IS{OuE{h5Z3efKX8S>)ST4pCX<|S8 z)Tv#NjF-|&Z(GQ&v6?Wa(s!$L$KNU3j)KY9zn~k-ca(T7f!iA_A$+I!H68|rZpe)} z+Tf+G1vAHH7A}4{T77VLRNDG%P}}-U-QWJCZ|!>8$B9J4N@*__;q52<0|+TePhp$I z;S=XK+%!geqWZ?Wg6g{eTi*8TNshPRFSG5Zy)ToUxZeeLa0M8Y_ToExDjOo^m6Uda zMf5x9W6*~n>b7UH>fgNuuf3ESTvtN@R-IcXb{49O z7)`1Nb`wenr9!q@-aS_Fskjd>7?(Ry!LHeDj^Dox_g)$o_5tXzabFqmdmA}P%Spgc z&>(|c#Ju3hCr66_BUItlR$!FF?(a4J8f9 zV1cgm%}}MS8&!Enq=q&?I$%gCZd8YWP8cJ%RytmA#t4uYQn4!lj)s@c7-nqTH)7xf zoCXMT!2-fe5SJbgbc~vVtTe_#N(raSE*gPmbk2BXAhto&gFv8yc}51>2d;waGBGvYlITbpMgccf0u95F0s0B7qzPb^%)|TtsZE9&Y&g zT_z6|bmRFoZwj`CUQinKY)?XDl`t?&-y0Z9EfmCbUodYY;G`+UKQX zh7v+)vU$hBuVPZT^5;iq@_i-&LFC6~a#$e6JTxGc2u|AT3u%u87AI^xX4lgKEXm<)1D<~J2QzZh;rHSh@jglIB5 zA{efdLJmud%N@Z~u?qoXBt6_d*^ZG#4OEynft8#T0+WAhOXPJz$lBg-Srki%j!h2QATi!0;PSyGG3Pf9&g&N>|BnLWq&kHJySP}?+xWXGT&5uK{chWtj zn6jLTFPE_-5P{D|8mLAbU*-_b;x;IbnU5a@Y~dcy$uN>3XpMlp0JgtOXOGQB`4cj@ zqxgR6g1>vX(X=VEzjad~vwH8|7Uk?%kJX=~`rwH9L)a!jyckBD#>`=k-)f6f2E%HM zth~*l(Z!Zb=6QM}<#gl-9E~!c1w;bGz$S>2MQT8j6os*oKnAPKGDA5RKpZL-ATm#2 z*q(I=IycdaCM<5p@UOb(T{M3zsbIS?C4&{#M5@c)%T#UW1Au_Ru{a>c;&UTKmU#gIW3mtP z0s@}pewIzx4?%!n9@DxxJDPA&n|8dSYfo8pARyQ+>CNoeK@V=eROz9g;y%Mt{i~Bx zEzd1jdA`Ascbt$8zK9ZEgy$Jv0btwZJ4b@T56?_{0RnyHYZc7NgP~!XKwx(^j}3~1 zO8ju4g<)ipRTswjp$7xKO$Ni2lhV|xUkX=DkS734MHG;V4}vlVVQN%u|z1OZ+5B|O*{uSFIA5+U6*(#Uj3N# zeVw0igTZn1z?OHYaNu6NiAt+sc&L>_lY6acY4t;c1f&NH%TI&7yWUtrC<{Dr2G z4w^kAFgTK~?mbRbcKsUJnX0q}ug5mWhdNnpfFd@5(gASfk6>7qs0WQH!I2Xs)r&xq z5dwoK4G0&$6^)q-T~UW zRc#+W<=b3u*b=j10tzKURvru>FRBGb1SpjAa+Ayp7)%jK8Kuim7y}f8YWk-;9Mv{2 zt22{ue)V4tQWLLE&04g|(08b*nd(scHQGZ;997)-MI8BWz%mt7tuIpLt+?D6ggxQv z(Uu?;hYd{9u84nuvgTD5NdO9L!XE-6QYIiKAW)*vKQl3&bSJ!>s4sHz|HGc~ z_J29hUl?)3@q{A=!%U*LZOf|G%BNvGZ-Dr>%l2E@6RH~C#RT{mmd27nB!EDWS)^2z z1}G>K31CAoE_bnPi#(+uKh;xdL>wCNqN>O8@?TOL!hf|cdhI!bBOGctYG9a&At|;R z-u&nAN&ZSX(fJSx+;l=Z{6XB1;X*kohw{BC|CYtCp)N#BB!Sm;yuo&GRgl6T9eOQ+ z@>(7I2^K#12C4WnUi>_$y!KnwgawZrsU#ShO?uS9Fat9MFj-aJv=~=}e-8aWAEGb= zr8x05rsWF5Vo;UnH_&N7fW*L&#`Ty52QS=&cf1cNJAa?*n)fIGNJK1ddNh9T6Q!M}&GYX)xIPr{!P%vL*BzDt+)E{?wif!iM7`q0PQy2>70EN|arz4!6i2O8^* zC_msq?Twf$5$i1&n^Ebz=CvYO%sf{GO41}VG#YPicvHc64QssMp}jzefA^=jZ+uPj zH@e_Y3kGZiY=iI!6@rPNrAT0*!F-d$pB4<g^K(4N5&j-cFh+0zy7=5&W}Z!ocTof*ZW2pGlVrq}wQ-q;vB-RL z#G?cba8!Uf8eqiS9Gr2kKiipJFG52^cZe`&5`xag6;{~OHQ3Sr&MxJP+csF2Wd`2{G*U~#tU5mf#(zx z3Cid^nK#m6=sILTOh=4$$bo&EqXEJ&PoO2vpFT17U(cIy;ncS5MTLxej%(Y;;3msH z_IR!4ATo@0$14?EKk}g7TCDj`>>R83R43HQw9!vNPrwJ z7|kFsFDs6eKo}6bzc};QNy`?_{BTzx^FDmv-5F!IpT1dhL-m&9$k%H_xn!&Vd=w@l zX$}ti_6}8l@S{I$y5qiQxAdR~?==i4Obs9gls6p=BMnR&ARwQ*^ZIwbXZFOlBrX9thwy^+E6Lm>X|2jUlPnA4x{wHyl3F1kKFdaPf>;Ib^*lz zb3}j~j$|}TMYBZU221|zCH?a+yzkSK+VVGWX&MvMdT?R08Q(qc!g|JkYSKBgOU*rJ zE?Ob5VN-{J9Rq6p@3+EgOjWvN7QUdJ)YJ%n-`ZEa^)J5kgRi0xw?Yk24kRIH^7?^d zeW<~JK_CnmlnR28`tcV(bj{3ZlfHmIxF<=M~=f8Ds`_-47|1CF_$vLTvih5V8VDp2Jgyi2R8ATHR zVWRRtS+yV2iLV*tlX3xK_xjyx*NZzww#FEGU<1CQYEh}KIRG%NCQRr&<&W#O{BZle zeo6;zg^30fj`4!R8%o|&gy76OIoiqEG?yI?Sy0lYO*HNtx9%{o?wfE&7Rq8LQ zp^#7(m7i1{pcrKtK#A zvYk$uJY|+wXp`~$9XrQ8Zcy`8-==-zZcm`S?ggS!Q>RRxiH@9~3u6{)++#I2WalFZ z1`q+IXRy3Im2Xvy+3r)0WZZ-H%}qZA9~!nHwyNC&W$IHi5Qe6Mjxko{k%BQ|%vV}^e|D|vzT%%%dg7cBlOE0k$C!4-*D&UFA{8kB{>-{pZ~Nm~ z`8UPJvI}FC9dznLMh~MAK=uaw}Kd_cw2yf5LTaWGJd^{ev2K z@t3N!=}CMMwHr0BA7~`=$DWPv>n>5b8K;lvuxj-ScU^et6}O>~AFeZU%WC#HnjJ7y zy?!_nFbE0(k!=+z!QjD40Qu4PzH{l)C5u1qxn68hQDFl9{6hHyJMjW-FWyP-1vvcI z_AyZFM112ON3U&~O0`WfT^ecKuMhp=S1Z1G&2=C76$;Bukspr{jIq2?6u*8r95C32 z(SX4nsaZOVgk;Y@|NP1S^Pg_Ia^b0`F7;ArfI>Nmr=)LXt}sy8s4ghmz17M@t1IgF|r39ao4c8&}gtBlck=7>o@+19^f%FifPR zq^C`rR=DxT8_zuZ?6c39J$v@aEiEmRP|m&w3(@fKaL+5Ryz&B=fA;2^Z+>Riu3c0I zO2FvY3`Da_{-%Lp05P_M>cU9-VL&l?rl#KQ?(WWBe);9c%$qlF5`f7S3I&3u@b7I@ z06=-onl*dxz4zYjJ9pyWEZ%=IrTFt;M#e`+b6{%*f)YV67{?V3M>06@Xz6H{5Mx6K zh=~RWrj(@7PEs=+W;MwSMV*mM5)1yYY$J>{ zh8f4C%>b~Bu^EKMV26@98j@k=Gl1~f0Ah%52H-$aL15UA!7#>@(J*Y7HqWNc%xC&D zHF;#m7n*f-d_6|CGX0s3j$HYJ#pd=SN8JymVbXvyR%#eG%$w)YW4`XQVdixk9;AU8 zqd9G6l=)_r7+q)jnJGpyMF0$gCU4TwZ8?T1Gvkdr9Zkr%JC4!NjMbcu&hyzs4$)k1 zhBV9=09bDFqtmhan6g7o4Kat@@gN<{m?mXYlRr>8)^N?Bu>SR)#~S01$_#Ob)aei! vH;><(=MbZxM-OY5H|5RG&3RLQ#OeP7?m1GhoDfqV00000NkvXXu0mjfs?B>1 delta 5760 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 xhf%S;kM=Z4jeQ2nZ4Ov?FwB;NPr}e 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 - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent"/> - #C8F3F4 #282F62 #242C65 - #374968 - #303C52 - #2CBFFC - #1060ff - #425877 - #96a5c2 + + + + + #76D7FF #255BAA #80F8FF #A0B3DA #005D6A8C #5D6A8C - #576887 + #995D6A8C #B37E90BF - #44488ED0 - #598CFF - #253A5A - #4DFFFFFF - #131415 + + #464646 diff --git a/OCH/taxi/passenger/src/main/res/values/strings.xml b/OCH/taxi/passenger/src/main/res/values/strings.xml index 7154fd3468..1612d7f826 100644 --- a/OCH/taxi/passenger/src/main/res/values/strings.xml +++ b/OCH/taxi/passenger/src/main/res/values/strings.xml @@ -17,8 +17,7 @@ 剩余(分) - 亮度 - 音量 + \ No newline at end of file diff --git a/OCH/taxi/pcommon/.gitignore b/OCH/taxi/pcommon/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/OCH/taxi/pcommon/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/OCH/taxi/pcommon/build.gradle b/OCH/taxi/pcommon/build.gradle new file mode 100644 index 0000000000..f0fbfd5c18 --- /dev/null +++ b/OCH/taxi/pcommon/build.gradle @@ -0,0 +1,50 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' + id 'kotlin-android-extensions' +} + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + lintOptions { + abortOnError false + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation rootProject.ext.dependencies.kotlinstdlib + implementation rootProject.ext.dependencies.androidxccorektx + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.material + implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.arouter + + api project(":OCH:common:common") + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { + api rootProject.ext.dependencies.mogoutils + }else { + api project(":core:mogo-core-utils") + } +} \ No newline at end of file diff --git a/OCH/taxi/pcommon/consumer-rules.pro b/OCH/taxi/pcommon/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/OCH/taxi/pcommon/proguard-rules.pro b/OCH/taxi/pcommon/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/OCH/taxi/pcommon/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/AndroidManifest.xml b/OCH/taxi/pcommon/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..c11e143669 --- /dev/null +++ b/OCH/taxi/pcommon/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt similarity index 92% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt index 023585036b..9f1bafb1c0 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt @@ -2,12 +2,9 @@ package com.mogo.och.taxi.passenger.ui.evaluate import android.animation.Animator import android.animation.AnimatorListenerAdapter -import android.animation.ObjectAnimator -import android.animation.ValueAnimator import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner @@ -16,9 +13,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.arrived.ArrivedViewModel -import com.mogo.och.taxi.passenger.ui.orderinfo.OrderInfoViewModel +import com.mogo.och.taxi.passenger.common.R import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_close import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_great import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_low @@ -39,7 +34,7 @@ class EvaluateView : ConstraintLayout, EvaluateViewModel.EvaluateCallback { private var isFirat = true - private lateinit var viewModel: EvaluateViewModel + private var viewModel: EvaluateViewModel?=null private fun initView() { LayoutInflater.from(context).inflate(R.layout.taxi_p_evaluate, this, true) @@ -100,7 +95,7 @@ class EvaluateView : ConstraintLayout, EvaluateViewModel.EvaluateCallback { override fun onAttachedToWindow() { super.onAttachedToWindow() - val viewModel = findViewTreeViewModelStoreOwner()?.let { + viewModel = findViewTreeViewModelStoreOwner()?.let { ViewModelProvider(it).get(EvaluateViewModel::class.java) } viewModel?.setViewCallback(this) @@ -124,5 +119,13 @@ class EvaluateView : ConstraintLayout, EvaluateViewModel.EvaluateCallback { } } + fun setOrderIdCallback(evaluateCallback: EvaluateCallback) { + viewModel?.setOrderIdCallback(evaluateCallback) + } + + interface EvaluateCallback { + fun getOrderId():String + } + } \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt similarity index 83% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt index 37325ac145..5d535451be 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt @@ -5,7 +5,6 @@ import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.manager.distancemamager.IDistanceListener import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel class EvaluateViewModel : ViewModel(), IDistanceListener { @@ -15,6 +14,8 @@ class EvaluateViewModel : ViewModel(), IDistanceListener { private var viewCallback: EvaluateCallback? = null + private var evaluateCallback: EvaluateView.EvaluateCallback?=null + init { TrajectoryAndDistanceManager.addDistanceListener(TAG, this) } @@ -22,11 +23,11 @@ class EvaluateViewModel : ViewModel(), IDistanceListener { override fun distanceCallback(distance: Float) { super.distanceCallback(distance) if(distance<=500) { - TaxiPassengerModel.currentOCHOrder?.let { + evaluateCallback?.getOrderId()?.let{ val string = SharedPrefsMgr.getInstance().getString(orderShowEvaluate) - if (StringUtils.isEmpty(string) || !string.equals(it.orderNo)) { + if (StringUtils.isEmpty(string) || !string.equals(it)) { this.viewCallback?.showEvaluate(true) - SharedPrefsMgr.getInstance().putString(orderShowEvaluate, it.orderNo) + SharedPrefsMgr.getInstance().putString(orderShowEvaluate, it) } } } @@ -42,6 +43,10 @@ class EvaluateViewModel : ViewModel(), IDistanceListener { this.viewCallback = null } + fun setOrderIdCallback(evaluateCallback: EvaluateView.EvaluateCallback) { + this.evaluateCallback = evaluateCallback + } + interface EvaluateCallback { fun showEvaluate(show: Boolean) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt similarity index 98% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt index 35091e55f0..9ab6a1a1ea 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt @@ -8,7 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.och.common.module.manager.auditionmanager.MusicData -import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.common.R import com.mogo.och.taxi.passenger.ui.music.list.MusicListView import kotlinx.android.synthetic.main.taxi_p_music.view.iv_toggle_list_playing import kotlinx.android.synthetic.main.taxi_p_music.view.mlv_list diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt similarity index 51% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt index 1e6f8a70a9..c1a1823423 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt @@ -1,20 +1,18 @@ package com.mogo.och.taxi.passenger.ui.music import androidx.lifecycle.ViewModel -import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel -class MusicViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback { +class MusicViewModel: ViewModel() { private val TAG = MusicViewModel::class.java.simpleName - private var viewCallback:IMusicViewCallback?=null + private var viewCallback: IMusicViewCallback?=null init { } - fun setDistanceCallback(viewCallback:IMusicViewCallback){ + fun setDistanceCallback(viewCallback: IMusicViewCallback){ this.viewCallback = viewCallback } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt similarity index 96% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt index 3834dba218..141233c498 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt @@ -12,8 +12,7 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.och.common.module.manager.auditionmanager.MusicData import com.mogo.och.common.module.manager.auditionmanager.PlayState -import com.mogo.och.taxi.passenger.R -import me.jessyan.autosize.utils.AutoSizeUtils +import com.mogo.och.taxi.passenger.common.R /** * Created by adityagohad on 06/06/17. @@ -27,9 +26,9 @@ class MusicListItemAdapter( val gradientDrawable = GradientDrawable().also { it.shape = GradientDrawable.RECTANGLE val firstColor = ContextCompat.getColor(context, android.R.color.transparent) - val setondColor = ContextCompat.getColor(context, R.color.taxi_p_4DFFFFFF) - val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_4DFFFFFF) - val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_4DFFFFFF) + val setondColor = ContextCompat.getColor(context, R.color.taxi_cp_4DFFFFFF) + val thirdColor = ContextCompat.getColor(context, R.color.taxi_cp_4DFFFFFF) + val fourceColor = ContextCompat.getColor(context, R.color.taxi_cp_4DFFFFFF) val fifthColor = ContextCompat.getColor(context, android.R.color.transparent) it.orientation = GradientDrawable.Orientation.LEFT_RIGHT diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt similarity index 97% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt index f8cc5d2f3d..b89f3fc916 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt @@ -9,9 +9,8 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.manager.auditionmanager.MusicData -import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.common.R import kotlinx.android.synthetic.main.taxi_p_music_list.view.rv_music_list -import me.jessyan.autosize.utils.AutoSizeUtils class MusicListView : ConstraintLayout, MusicListViewModel.IMusicListViewCaLillback, MusicListItemAdapter.ClickListener { diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt similarity index 92% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt index ae820af928..fa889854ef 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt @@ -5,9 +5,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.auditionmanager.AuditionManager import com.mogo.och.common.module.manager.auditionmanager.MusicData -import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback -class MusicListViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback, +class MusicListViewModel : ViewModel(), AuditionManager.MusicDataChangeListener { private val TAG = MusicListViewModel::class.java.simpleName diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt similarity index 99% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt index 5d29192b03..826960c92e 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt @@ -18,7 +18,7 @@ import com.mogo.eagle.core.utilcode.util.TimeTransformUtils import com.mogo.och.common.module.manager.auditionmanager.MusicData import com.mogo.och.common.module.manager.auditionmanager.PlayState import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.common.R import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_music_cover import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_music_cover_bg import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_show_next diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt similarity index 93% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt index a0a330e2de..68f935a8a7 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt @@ -2,11 +2,8 @@ package com.mogo.och.taxi.passenger.ui.music.playing import androidx.lifecycle.ViewModel import com.elegant.utils.UiThreadHandler -import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.manager.auditionmanager.AuditionManager import com.mogo.och.common.module.manager.auditionmanager.MusicData -import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListener { diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt new file mode 100644 index 0000000000..13aeb76d9b --- /dev/null +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt @@ -0,0 +1,106 @@ +package com.mogo.och.taxi.passenger.ui.rightbar + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.taxi.passenger.common.R +import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_music +import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting +import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting_only +import kotlinx.android.synthetic.main.taxi_p_rightbar.view.con_only_one_group +import kotlinx.android.synthetic.main.taxi_p_rightbar.view.con_third_group +import kotlinx.android.synthetic.main.taxi_p_rightbar.view.iv_center_location + + +class RightBarView : ConstraintLayout { + + private val TAG = "RightBarView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private var rightBarCallback:RightBarCallback?=null + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.taxi_p_rightbar, this, true) + + ck_setting.isChecked = false + ck_setting_only.isChecked = false + ck_music.isChecked = false + + ck_setting.setOnCheckedChangeListener { _, isChecked -> + CallerLogger.d(TAG,"ck_setting=${isChecked}") + rightBarCallback?.setSettingAndMusicShow(ck_setting.isChecked,ck_music.isChecked) + ck_setting_only.isChecked = isChecked + if(isChecked){ + ck_music.isChecked = false + } + } + ck_setting_only.setOnCheckedChangeListener { _, isChecked -> + CallerLogger.d(TAG,"ck_setting_only=${isChecked}") + ck_setting.isChecked = isChecked + rightBarCallback?.setSettingAndMusicShow(ck_setting.isChecked,ck_music.isChecked) + if(isChecked){ + ck_music.isChecked = false + } + } + ck_music.setOnCheckedChangeListener { _, isChecked -> + CallerLogger.d(TAG,"ck_music=${isChecked}") + rightBarCallback?.setSettingAndMusicShow(ck_setting.isChecked,ck_music.isChecked) + if(isChecked){ + ck_setting.isChecked = false + ck_setting_only.isChecked = false + } + } + iv_center_location.onClick { + this.rightBarCallback?.setGo2CenterClick() + } + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + fun setOrderIdCallback(rightBarCallback: RightBarCallback) { + this.rightBarCallback = rightBarCallback + } + + fun setShowOnlySetting(i: Int) { + if(i==0){ + con_third_group.visibility = View.VISIBLE + con_only_one_group.visibility = View.GONE + }else if (i==1){ + con_third_group.visibility = View.GONE + con_only_one_group.visibility = View.VISIBLE + ck_music.isChecked = false + } + } + + + interface RightBarCallback { + fun setSettingAndMusicShow(settingShow:Boolean,musicShow:Boolean) + fun setGo2CenterClick() + } + + +} \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/setting/TaxiPSettingView.kt similarity index 97% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/setting/TaxiPSettingView.kt index 7baaf6247b..4c6118be3f 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/setting/TaxiPSettingView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.systemsetting +package com.mogo.och.taxi.passenger.ui.setting import android.annotation.SuppressLint import android.content.Context @@ -25,7 +25,7 @@ import com.mogo.eagle.core.function.call.setting.CallerRequestActivityHandleMana import com.mogo.eagle.core.utilcode.util.BrightnessUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.wigets.MineGradientDrawable -import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.common.R import kotlinx.android.synthetic.main.taxi_p_setting_view.view.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -127,9 +127,9 @@ class TaxiPSettingView @JvmOverloads constructor( private fun getDrawable(): Drawable { val dp2px = AutoSizeUtils.dp2px(context, 26f)//进度条高度 - val color2CBFFC = ContextCompat.getColor(context, R.color.taxi_p_2CBFFC) - val color1060FF = ContextCompat.getColor(context, R.color.taxi_p_1060ff) - val color96A5C2 = ContextCompat.getColor(context, R.color.taxi_p_96a5c2) + val color2CBFFC = ContextCompat.getColor(context, R.color.taxi_cp_2CBFFC) + val color1060FF = ContextCompat.getColor(context, R.color.taxi_cp_1060ff) + val color96A5C2 = ContextCompat.getColor(context, R.color.taxi_cp_96a5c2) val temp03 = MineGradientDrawable(color2CBFFC, color1060FF, dp2px) val clipDrawable3 = ClipDrawable(temp03, Gravity.START, ClipDrawable.HORIZONTAL) val temp01 = MineGradientDrawable(color96A5C2, color96A5C2, dp2px) diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_evaluate_close.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_evaluate_close.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_evaluate_close.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_evaluate_close.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_evaluate_great.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_evaluate_great.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_evaluate_great.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_evaluate_great.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_evaluate_low.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_evaluate_low.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_evaluate_low.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_evaluate_low.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_checked.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_checked.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_checked.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_checked.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_list_playing.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_list_playing.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_list_playing.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_list_playing.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_next.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_next.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_next.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_next.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_normal.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_normal.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_normal.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_normal.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_pause.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_pause.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_pause.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_pause.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_play.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_play.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_play.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_play.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_pre.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_pre.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_pre.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_pre.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_checked.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_setting_checked.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_checked.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_setting_checked.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_music_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_setting_music_bg.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_music_bg.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_setting_music_bg.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_go2_list.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_go2_list.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_go2_list.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_go2_list.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_go2_playing.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_go2_playing.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_go2_playing.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_go2_playing.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_greate_text.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_greate_text.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_greate_text.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_greate_text.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_bottom.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_bottom.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_bottom.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_bottom.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_setting_normal.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_setting_normal.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_setting_normal.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_setting_normal.png diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_center_location_selector.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_center_location_selector.xml similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/taxi_p_center_location_selector.xml rename to OCH/taxi/pcommon/src/main/res/drawable/taxi_p_center_location_selector.xml diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml rename to OCH/taxi/pcommon/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_list_item_bg.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_item_bg.xml similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_list_item_bg.xml rename to OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_item_bg.xml diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_list_tag_bg.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_tag_bg.xml similarity index 94% rename from OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_list_tag_bg.xml rename to OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_tag_bg.xml index 7dee2fc01e..ed9a6a094f 100644 --- a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_list_tag_bg.xml +++ b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_tag_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_selector.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_selector.xml similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_selector.xml rename to OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_selector.xml diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_setting_selector.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_setting_selector.xml similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable/taxi_p_setting_selector.xml rename to OCH/taxi/pcommon/src/main/res/drawable/taxi_p_setting_selector.xml diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxt_p_music_seekbar_style.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxt_p_music_seekbar_style.xml similarity index 78% rename from OCH/taxi/passenger/src/main/res/drawable/taxt_p_music_seekbar_style.xml rename to OCH/taxi/pcommon/src/main/res/drawable/taxt_p_music_seekbar_style.xml index 913d8c9679..742f57fd2d 100644 --- a/OCH/taxi/passenger/src/main/res/drawable/taxt_p_music_seekbar_style.xml +++ b/OCH/taxi/pcommon/src/main/res/drawable/taxt_p_music_seekbar_style.xml @@ -4,14 +4,14 @@ - + - + @@ -19,7 +19,7 @@ - + diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_evaluate.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml similarity index 96% rename from OCH/taxi/passenger/src/main/res/layout/taxi_p_evaluate.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml index 8aeb80e630..b6c01f5107 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_evaluate.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml @@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/dp_51" android:layout_marginEnd="@dimen/dp_51" android:text="行程即将结束，小智很想知道你的体验如何呢？" - android:textColor="@color/taxi_p_131415" + android:textColor="@color/taxi_cp_131415" android:textSize="@dimen/dp_32" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -38,7 +38,7 @@ android:layout_marginStart="@dimen/dp_105" android:layout_marginBottom="@dimen/dp_40" android:text="新奇有趣" - android:textColor="@color/taxi_p_303C52" + android:textColor="@color/taxi_cp_303C52" android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -50,7 +50,7 @@ android:layout_marginEnd="@dimen/dp_99" android:layout_marginBottom="@dimen/dp_40" android:text="有待提升" - android:textColor="@color/taxi_p_303C52" + android:textColor="@color/taxi_cp_303C52" android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_music.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music.xml similarity index 100% rename from OCH/taxi/passenger/src/main/res/layout/taxi_p_music.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxi_p_music.xml diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_list.xml similarity index 95% rename from OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_list.xml index 55b874ff7e..d603b4c664 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_list.xml @@ -9,7 +9,7 @@ @@ -52,7 +52,7 @@ app:layout_constraintEnd_toStartOf="@+id/tv_tag" app:layout_constraintTop_toBottomOf="@+id/tv_music_name" android:textSize="@dimen/dp_32" - android:textColor="@color/taxi_p_576887" + android:textColor="@color/taxi_cp_576887" tools:text="Kokia" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -62,7 +62,7 @@ app:layout_constraintEnd_toEndOf="parent" android:textSize="@dimen/dp_16" app:layout_constraintBaseline_toBaselineOf="@+id/tv_author" - android:textColor="@color/taxi_p_576887" + android:textColor="@color/taxi_cp_576887" tools:text="轻柔" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -91,7 +91,7 @@ app:layout_constraintTop_toTopOf="@+id/sb_musuc_progess" app:layout_constraintBottom_toBottomOf="@+id/sb_musuc_progess" app:layout_constraintEnd_toStartOf="@+id/sb_musuc_progess" - android:textColor="@color/taxi_p_576887" + android:textColor="@color/taxi_cp_576887" android:layout_marginEnd="@dimen/dp_13" tools:text="02:34" android:layout_width="wrap_content" @@ -104,7 +104,7 @@ app:layout_constraintTop_toTopOf="@+id/sb_musuc_progess" app:layout_constraintBottom_toBottomOf="@+id/sb_musuc_progess" app:layout_constraintStart_toEndOf="@+id/sb_musuc_progess" - android:textColor="@color/taxi_p_576887" + android:textColor="@color/taxi_cp_576887" android:layout_marginEnd="@dimen/dp_13" android:layout_marginStart="@dimen/dp_13" tools:text="05:56" diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml new file mode 100644 index 0000000000..eb2360772a --- /dev/null +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_setting_view.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_setting_view.xml similarity index 94% rename from OCH/taxi/passenger/src/main/res/layout/taxi_p_setting_view.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxi_p_setting_view.xml index 8f467b442d..e83b88ef1c 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_setting_view.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_setting_view.xml @@ -12,8 +12,8 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_95" android:layout_marginTop="@dimen/dp_98" - android:text="@string/taxi_p_setting_light" - android:textColor="@color/taxi_p_374968" + android:text="@string/taxi_cp_setting_light" + android:textColor="@color/taxi_cp_374968" android:textSize="@dimen/dp_36" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -57,7 +57,7 @@ android:layout_marginTop="@dimen/dp_154" android:layout_marginRight="@dimen/dp_113" android:gravity="right" - android:textColor="@color/taxi_p_303C52" + android:textColor="@color/taxi_cp_303C52" android:textSize="@dimen/dp_56" android:textStyle="bold" app:layout_constraintRight_toRightOf="parent" @@ -69,8 +69,8 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_95" android:layout_marginTop="@dimen/dp_129" - android:text="@string/taxi_p_setting_sound" - android:textColor="@color/taxi_p_374968" + android:text="@string/taxi_cp_setting_sound" + android:textColor="@color/taxi_cp_374968" android:textSize="@dimen/dp_36" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" /> @@ -116,7 +116,7 @@ android:gravity="right" android:textSize="@dimen/dp_56" android:textStyle="bold" - android:textColor="@color/taxi_p_303C52" + android:textColor="@color/taxi_cp_303C52" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/OCH/taxi/pcommon/src/main/res/values/colors.xml b/OCH/taxi/pcommon/src/main/res/values/colors.xml new file mode 100644 index 0000000000..2e08eb7c65 --- /dev/null +++ b/OCH/taxi/pcommon/src/main/res/values/colors.xml @@ -0,0 +1,17 @@ + + + + #253A5A + #303C52 + #425877 + #576887 + #4DFFFFFF + #44488ED0 + #598CFF + #2CBFFC + #1060ff + #96a5c2 + #374968 + #131415 + + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/values/strings.xml b/OCH/taxi/pcommon/src/main/res/values/strings.xml new file mode 100644 index 0000000000..aa556a2245 --- /dev/null +++ b/OCH/taxi/pcommon/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ + + + 亮度 + 音量 + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 873102c46d..8cd044ade9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -63,6 +63,7 @@ include ':OCH:bus:passenger' include ':OCH:taxi:driver' include ':OCH:taxi:passenger' +include ':OCH:taxi:pcommon' include ':OCH:taxi:unmanned-driver' include ':OCH:taxi:unmanned-passenger'