yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[8.2.0]

Browse Source 
[算路]
[添加排序和id搜索]
This commit is contained in:
yangyakun
2025-08-01 18:27:54 +08:00
parent 3c01de63ee
commit cac4c5e633
26 changed files with 539 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt
View File

@@ -24,8 +24,13 @@ import com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp
import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager
import com.mogo.och.biz.routing.ui.RoutingSwitchModel
import com.mogo.och.biz.routing.ui.routingselect.RoutingSelectModel.SwtichRoutingViewCallback
import com.mogo.och.common.module.manager.InputManager
import com.mogo.och.common.module.manager.InputTextChangeListener
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.common.module.wigets.KeyboarView
import kotlinx.android.synthetic.main.biz_taxi_select.view.acctv_search_byid
import kotlinx.android.synthetic.main.biz_taxi_select.view.aciv_input_icon
import kotlinx.android.synthetic.main.biz_taxi_select.view.aciv_refresh_task
import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_current_order
import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_distance
@@ -42,7 +47,7 @@ import kotlinx.android.synthetic.main.biz_taxi_select.view.include_error
import kotlinx.android.synthetic.main.biz_taxi_select.view.switch_routing_rv
import me.jessyan.autosize.utils.AutoSizeUtils
class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback, InputTextChangeListener {
constructor(context: Context) : super(context)
@@ -70,7 +75,7 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
private var animatorStart = System.currentTimeMillis()
private var tempAllData = mutableListOf<GrayLineBean>()
init {
@@ -132,6 +137,13 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
animator?.repeatMode = ValueAnimator.RESTART // 设置重复模式
}
animator?.start()
InputManager.clearInput()
actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_default)
switch_routing_rv.smoothScrollToPosition(0)
acctv_search_byid.isChecked = false
acctv_search_byid.setBackgroundResource(R.drawable.biz_input_order_id_normal)
aciv_input_icon.setImageResource(R.drawable.biz_routing_search_right_normal)
InputManager.setKeyboardVisable(View.GONE)
}
cl_select_order_contain.onClick {
@@ -194,6 +206,20 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_time_desc)
switch_routing_rv.smoothScrollToPosition(0)
}
acctv_search_byid.onClick {
if(acctv_search_byid.isChecked==true){
acctv_search_byid.isChecked = false
acctv_search_byid.setBackgroundResource(R.drawable.biz_input_order_id_normal)
aciv_input_icon.setImageResource(R.drawable.biz_routing_search_right_normal)
InputManager.setKeyboardVisable(View.GONE)
}else{
acctv_search_byid.isChecked = true
aciv_input_icon.setImageResource(R.drawable.biz_routing_search_right_check)
acctv_search_byid.setBackgroundResource(R.drawable.biz_input_order_id_check)
InputManager.setKeyboardVisable(View.VISIBLE)
}
}
}
private fun showEmptyView() {
@@ -218,6 +244,7 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
private fun onRoutingGrayLineListChanged(data: MutableList<GrayLineBean>) {
if (data.isNotEmpty()) {
showRecyclerView()
tempAllData = data
mRoutingLineList.clear()
mRoutingLineList.addAll(data)
mChooseLineListAdapter.notifyDataSetChanged()
@@ -238,6 +265,13 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
swtichViewModel = findViewTreeViewModelStoreOwner()?.let {
ViewModelProvider(it).get(RoutingSwitchModel::class.java)
}
InputManager.addListener(TAG,this)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
InputManager.removeListener(TAG)
}
override fun onVisibilityAggregated(isVisible: Boolean) {
@@ -288,4 +322,33 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
},dex, UiThreadHandler.MODE.QUEUE,)
}
override fun onTextChange(info: String) {
ToastUtils.showShort(info)
if (acctv_search_byid.isChecked) {
acctv_search_byid.text = info
if(info.isEmpty()){
mRoutingLineList.clear()
mRoutingLineList.addAll(tempAllData)
mChooseLineListAdapter.notifyDataSetChanged()
}else{
val searchData = tempAllData.filter { it.lineId.toString().contains(info) }
mRoutingLineList.clear()
mRoutingLineList.addAll(searchData)
mChooseLineListAdapter.notifyDataSetChanged()
}
}
}
override fun onKeyVisiblityChange(b: Boolean) {
if(b){
acctv_search_byid.isChecked = true
acctv_search_byid.setBackgroundResource(R.drawable.biz_input_order_id_check)
aciv_input_icon.setImageResource(R.drawable.biz_routing_search_right_check)
}else{
acctv_search_byid.isChecked = false
acctv_search_byid.setBackgroundResource(R.drawable.biz_input_order_id_normal)
aciv_input_icon.setImageResource(R.drawable.biz_routing_search_right_normal)
}
}
}

BIN
OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_check.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

7
OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_check.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/common_color_4D000000"/>
<stroke android:color="@color/common_2EACFF" android:width="@dimen/dp_2"/>
<corners android:radius="@dimen/dp_30"/>
</shape>

6
OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_normal.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/common_color_4D000000"/>
<corners android:radius="@dimen/dp_30"/>
</shape>

8
OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_selector.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/biz_input_order_id_check"/>
<item android:state_pressed="false" android:drawable="@drawable/biz_input_order_id_normal"/>
<item android:state_checked="true" android:drawable="@drawable/biz_input_order_id_check"/>
<item android:state_checked="false" android:drawable="@drawable/biz_input_order_id_normal"/>
<item android:drawable="@drawable/biz_input_order_id_normal"/>
</selector>

32
OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml
View File

@@ -59,15 +59,43 @@
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatCheckedTextView
android:id="@+id/acctv_search_byid"
android:layout_marginStart="@dimen/dp_54"
android:layout_marginEnd="@dimen/dp_52"
android:gravity="center_vertical"
android:text=""
android:textColor="@color/common_ffffffff"
android:hint="输入ID快速检索"
android:textColorHint="@color/biz_routing_999999"
android:textSize="@dimen/dp_36"
android:paddingStart="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@+id/actv_routing_title"
android:background="@drawable/biz_input_order_id_normal"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_100"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_input_icon"
app:layout_constraintTop_toTopOf="@+id/acctv_search_byid"
app:layout_constraintBottom_toBottomOf="@+id/acctv_search_byid"
app:layout_constraintEnd_toEndOf="@+id/acctv_search_byid"
android:src="@drawable/biz_routing_search_right_normal"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_54"
android:layout_marginEnd="@dimen/dp_52"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/switch_routing_rv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0"
android:layout_marginStart="@dimen/dp_54"
android:layout_marginEnd="@dimen/dp_52"
app:layout_constraintTop_toBottomOf="@+id/actv_routing_title"
app:layout_constraintTop_toBottomOf="@+id/acctv_search_byid"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="@dimen/dp_40" />
android:layout_marginTop="@dimen/dp_20" />
<include
android:id="@+id/include_empty"

1
OCH/common/biz/src/main/res/routing/values/colors.xml
View File

@@ -10,4 +10,5 @@
<color name="biz_routing_CCFFFFFF">#CCFFFFFF</color>
<color name="biz_routing_26C14F">#26C14F</color>
<color name="biz_routing_FF852E">#FF852E</color>
<color name="biz_routing_999999">#999999</color>
</resources>

36
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/InputManager.kt Normal file
View File

@@ -0,0 +1,36 @@
package com.mogo.och.common.module.manager
import com.mogo.och.common.module.utils.CallerBase
import com.mogo.och.common.module.wigets.KeyboarView
object InputManager: CallerBase<InputTextChangeListener>() {
var inputKey: KeyboarView?=null
fun onTextChange(info:String){
M_LISTENERS.forEach {
it.value.onTextChange(info)
}
}
fun setKeyboardVisable(visible: Int) {
inputKey?.visibility = visible
}
fun keyViewVisiblityChange(b: Boolean) {
M_LISTENERS.forEach {
it.value.onKeyVisiblityChange(b)
}
}
fun clearInput() {
inputKey?.clearInput()
}
}
interface InputTextChangeListener{
fun onTextChange(info: String)
fun onKeyVisiblityChange(b: Boolean)
}

124
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/KeyboarView.kt Normal file
View File

@@ -0,0 +1,124 @@
package com.mogo.och.common.module.wigets
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.eagle.core.utilcode.util.ClickUtils
import com.mogo.och.common.module.R
import com.mogo.och.common.module.manager.InputManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import kotlinx.android.synthetic.main.common_keyboard_view.view.aciv_close_key
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_0
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_1
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_2
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_3
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_4
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_5
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_6
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_7
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_8
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_9
import kotlinx.android.synthetic.main.common_keyboard_view.view.actv_key_del
class KeyboarView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr), View.OnClickListener {
companion object {
const val TAG = "LoadingMapStatusView"
}
private val currentText = StringBuilder()
init {
LayoutInflater.from(context).inflate(R.layout.common_keyboard_view, this, true)
initView()
}
private fun initView() {
aciv_close_key.onClick {
visibility = GONE
}
actv_key_0.setOnClickListener(this)
actv_key_1.setOnClickListener(this)
actv_key_2.setOnClickListener(this)
actv_key_3.setOnClickListener(this)
actv_key_4.setOnClickListener(this)
actv_key_5.setOnClickListener(this)
actv_key_6.setOnClickListener(this)
actv_key_7.setOnClickListener(this)
actv_key_8.setOnClickListener(this)
actv_key_9.setOnClickListener(this)
actv_key_del.setOnClickListener(this)
}
override fun onClick(v: View?) {
if (ClickUtils.isClickTooFrequent(this, 100)) {
return
}
when (v?.id) {
R.id.actv_key_0 -> {changeText("0")}
R.id.actv_key_1 -> {changeText("1")}
R.id.actv_key_2 -> {changeText("2")}
R.id.actv_key_3 -> {changeText("3")}
R.id.actv_key_4 -> {changeText("4")}
R.id.actv_key_5 -> {changeText("5")}
R.id.actv_key_6 -> {changeText("6")}
R.id.actv_key_7 -> {changeText("7")}
R.id.actv_key_8 -> {changeText("8")}
R.id.actv_key_9 -> {changeText("9")}
R.id.actv_key_del -> {changeText(null)}
else -> {}
}
}
fun changeText(info: String?) {
OchChainLogManager.writeChainLogRouting("自定义键盘", "输入${info}--结果:${currentText}")
if (info.isNullOrEmpty()) {
if (currentText.isNotEmpty()) {
currentText.deleteCharAt(currentText.length - 1)
notifyDataChange(currentText.toString())
}
} else {
currentText.append(info)
notifyDataChange(currentText.toString())
}
}
private fun notifyDataChange(info: String) {
InputManager.onTextChange(info)
}
override fun onVisibilityAggregated(isVisible: Boolean) {
super.onVisibilityAggregated(isVisible)
if(isVisible){
InputManager.keyViewVisiblityChange(true)
}else{
InputManager.keyViewVisiblityChange(false)
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerLogger.d(TAG, "onAttachedToWindow")
InputManager.inputKey = this
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerLogger.d(TAG, "onDetachedFromWindow")
InputManager.inputKey = null
}
fun clearInput() {
currentText.clear()
notifyDataChange(currentText.toString())
}
}

BIN
OCH/common/common/src/main/res/drawable-nodpi/biz_routing_search_orderid_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_key_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 644 B

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_key_del_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_key_del_press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_key_press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

9
OCH/common/common/src/main/res/drawable/common_key_del_selector.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/common_key_del_press" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/common_key_del_press" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/common_key_del_press" android:state_selected="true" />
<item android:drawable="@drawable/common_key_del_press" android:state_focused="true" />
<item android:drawable="@drawable/common_key_del_normal" android:state_enabled="false" />
<item android:drawable="@drawable/common_key_del_normal" />
</selector>

5
OCH/common/common/src/main/res/drawable/common_key_normal.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/common_1fffffff"/>
<corners android:radius="@dimen/dp_62"/>
</shape>

9
OCH/common/common/src/main/res/drawable/common_key_selector.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/common_key_press" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/common_key_press" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/common_key_press" android:state_selected="true" />
<item android:drawable="@drawable/common_key_press" android:state_focused="true" />
<item android:drawable="@drawable/common_key_normal" android:state_enabled="false" />
<item android:drawable="@drawable/common_key_normal" />
</selector>

186
OCH/common/common/src/main/res/layout/common_keyboard_view.xml Normal file
View File

@@ -0,0 +1,186 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/biz_routing_search_orderid_bg"
android:layout_width="@dimen/dp_656"
android:layout_height="1007dp"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_close_key"
android:src="@drawable/common_key_close"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_58"
android:padding="@dimen/dp_20"
android:layout_width="@dimen/dp_81"
android:layout_height="@dimen/dp_81"/>
<androidx.appcompat.widget.AppCompatTextView
app:layout_constraintTop_toTopOf="@+id/aciv_close_key"
app:layout_constraintBottom_toBottomOf="@+id/aciv_close_key"
app:layout_constraintEnd_toStartOf="@+id/aciv_close_key"
android:layout_marginEnd="@dimen/dp_126"
android:textSize="@dimen/dp_40"
android:textColor="@color/common_ffffffff"
android:text="搜索"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_3"
android:text="3"
android:background="@drawable/common_key_selector"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginEnd="@dimen/dp_79"
android:layout_marginTop="@dimen/dp_203"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_2"
android:text="2"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toTopOf="@+id/actv_key_3"
app:layout_constraintBottom_toBottomOf="@+id/actv_key_3"
app:layout_constraintEnd_toStartOf="@+id/actv_key_3"
android:layout_marginEnd="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_1"
android:text="1"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toTopOf="@+id/actv_key_2"
app:layout_constraintBottom_toBottomOf="@+id/actv_key_2"
app:layout_constraintEnd_toStartOf="@+id/actv_key_2"
android:layout_marginEnd="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_6"
android:text="6"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toBottomOf="@+id/actv_key_3"
app:layout_constraintEnd_toEndOf="@+id/actv_key_3"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_5"
android:text="5"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toTopOf="@+id/actv_key_6"
app:layout_constraintBottom_toBottomOf="@+id/actv_key_6"
app:layout_constraintEnd_toStartOf="@+id/actv_key_6"
android:layout_marginEnd="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_4"
android:text="4"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toTopOf="@+id/actv_key_5"
app:layout_constraintBottom_toBottomOf="@+id/actv_key_5"
app:layout_constraintEnd_toStartOf="@+id/actv_key_5"
android:layout_marginEnd="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_9"
android:text="9"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toBottomOf="@+id/actv_key_6"
app:layout_constraintEnd_toEndOf="@+id/actv_key_6"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_8"
android:text="8"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toTopOf="@+id/actv_key_9"
app:layout_constraintBottom_toBottomOf="@+id/actv_key_9"
app:layout_constraintEnd_toStartOf="@+id/actv_key_9"
android:layout_marginEnd="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_7"
android:text="7"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toTopOf="@+id/actv_key_8"
app:layout_constraintBottom_toBottomOf="@+id/actv_key_8"
app:layout_constraintEnd_toStartOf="@+id/actv_key_8"
android:layout_marginEnd="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_key_0"
android:text="0"
android:background="@drawable/common_key_selector"
app:layout_constraintTop_toBottomOf="@+id/actv_key_8"
app:layout_constraintStart_toStartOf="@+id/actv_key_8"
app:layout_constraintEnd_toEndOf="@+id/actv_key_8"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actv_key_del"
android:background="@drawable/common_key_del_selector"
app:layout_constraintTop_toTopOf="@+id/actv_key_0"
app:layout_constraintBottom_toBottomOf="@+id/actv_key_0"
app:layout_constraintStart_toStartOf="@+id/actv_key_9"
app:layout_constraintEnd_toEndOf="@+id/actv_key_9"
android:gravity="center"
android:textSize="@dimen/dp_60"
android:textColor="@color/common_fcffffff"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_60"/>
</merge>

2
OCH/common/common/src/main/res/values/colors.xml
View File

@@ -49,7 +49,9 @@
<color name="common_3B3D44">#3B3D44</color>
<color name="common_2E323A">#2E323A</color>
<color name="common_ffffffff">#ffffffff</color>
<color name="common_fcffffff">#fcffffff</color>
<color name="common_10ffffff">#1Affffff</color>
<color name="common_1fffffff">#1fffffff</color>
<color name="common_50ffffff">#80000000</color>
<color name="common_2eacff">#2EACFF</color>
<color name="common_d4d4d4">#D4D4D4</color>

2
OCH/common/common/src/main/res/values/ids.xml
View File

@@ -2,4 +2,6 @@
<resources>
<item name="custom_full_id" type="id" />
<item name="custom_small_id" type="id" />
<item name="common_global_keyboard" type="id" />
</resources>

2
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
View File

@@ -14,7 +14,7 @@
<com.mogo.eagle.core.function.hmi.bone.BoneContainerView
android:id="@+id/boneContainerView"
android:layout_width="@dimen/dp_1046"
android:layout_width="1497dp"
android:layout_height="match_parent"
android:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"

40
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_biz.xml
View File

@@ -1,14 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_962"
android:layout_width="1477dp"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<com.mogo.och.common.module.wigets.KeyboarView
android:id="@+id/common_global_keyboard"
app:layout_constraintEnd_toEndOf="parent"
android:visibility="gone"
tools:visibility="visible"
android:layout_width="@dimen/dp_656"
android:layout_height="match_parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_bg"
android:src="@drawable/bus_biz_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -17,9 +24,24 @@
android:layout_width="@dimen/dp_962"
android:layout_height="@dimen/dp_0"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_h_top"
app:layout_constraintGuide_begin="@dimen/dp_20"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_v_left"
app:layout_constraintGuide_begin="@dimen/dp_41"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/bus_biz_bg_header"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="@+id/aciv_bg"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_42"
@@ -29,23 +51,19 @@
<com.mogo.och.weaknet.ui.bizswitch.SwitchBizView
android:id="@+id/switchOchBiz"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
android:layout_width="@dimen/dp_926"
android:layout_height="0dp"/>
<FrameLayout
android:id="@+id/routingSwitchView"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
android:layout_marginBottom="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
android:layout_width="@dimen/dp_880"
android:layout_height="0dp"/>

21
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
View File

@@ -1,14 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_962"
android:layout_width="1477dp"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<com.mogo.och.common.module.wigets.KeyboarView
android:id="@+id/common_global_keyboard"
app:layout_constraintEnd_toEndOf="parent"
android:visibility="gone"
tools:visibility="visible"
android:layout_width="@dimen/dp_656"
android:layout_height="match_parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_bg"
android:src="@drawable/taxi_biz_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -31,16 +38,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_v_right"
app:layout_constraintGuide_end="@dimen/dp_41"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/taxi_biz_bg_header"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="@+id/aciv_bg"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_42"
@@ -51,7 +52,6 @@
android:id="@+id/itinerarySwitchView"
app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
app:layout_constraintEnd_toEndOf="@+id/guideline_v_right"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_width="@dimen/dp_880"
@@ -61,7 +61,6 @@
android:id="@+id/routingSwitchView"
app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
app:layout_constraintEnd_toEndOf="@+id/guideline_v_right"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_width="@dimen/dp_880"

2
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
View File

@@ -15,7 +15,7 @@
<com.mogo.eagle.core.function.hmi.bone.BoneContainerView
android:id="@+id/boneContainerView"
android:layout_width="@dimen/dp_1046"
android:layout_width="1497dp"
android:layout_height="match_parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

10
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
View File

@@ -3,8 +3,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@drawable/bone_bg">
android:layout_gravity="center">
<androidx.appcompat.widget.AppCompatImageView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:src="@drawable/bone_bg"
android:layout_width="@dimen/dp_1046"
android:layout_height="match_parent"/>
<com.mogo.eagle.core.function.hmi.bone.BoneTopStatusLayout
android:id="@+id/boneTopStatusLayout"