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 a81336d4c2..385c078c44 100644 Binary files a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_end.png and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_end.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_start.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_start.png index 3cee184981..3fca47cb5f 100644 Binary files a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_start.png and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_map_view_dir_start.png 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 b8be0d3d2f..80d02edbf1 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 @@ -84,94 +84,12 @@ app:layout_constraintTop_toTopOf="parent" app:roma_change_dis_color="true" /> - - - - - - - - - - - - - - - - - - + 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'