From cac4c5e6332b0c3a1af66b07c4d03b8ddce72b93 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 1 Aug 2025 18:27:54 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.0]=20[=E7=AE=97=E8=B7=AF]=20[=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=92=8Cid=E6=90=9C=E7=B4=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/routingselect/RoutingSelectView.kt | 67 ++++++- .../biz_routing_search_right_check.png | Bin 0 -> 1511 bytes .../biz_routing_search_right_normal.png | Bin 0 -> 1453 bytes .../drawable/biz_input_order_id_check.xml | 7 + .../drawable/biz_input_order_id_normal.xml | 6 + .../drawable/biz_input_order_id_selector.xml | 8 + .../res/routing/layout/biz_taxi_select.xml | 32 ++- .../src/main/res/routing/values/colors.xml | 1 + .../och/common/module/manager/InputManager.kt | 36 ++++ .../och/common/module/wigets/KeyboarView.kt | 124 ++++++++++++ .../biz_routing_search_orderid_bg.png | Bin 0 -> 21241 bytes .../res/drawable-nodpi/common_key_close.png | Bin 0 -> 644 bytes .../drawable-nodpi/common_key_del_normal.png | Bin 0 -> 1210 bytes .../drawable-nodpi/common_key_del_press.png | Bin 0 -> 3980 bytes .../res/drawable-nodpi/common_key_press.png | Bin 0 -> 13149 bytes .../res/drawable/common_key_del_selector.xml | 9 + .../main/res/drawable/common_key_normal.xml | 5 + .../main/res/drawable/common_key_selector.xml | 9 + .../main/res/layout/common_keyboard_view.xml | 186 ++++++++++++++++++ .../common/src/main/res/values/colors.xml | 2 + OCH/common/common/src/main/res/values/ids.xml | 2 + .../res/layout/shuttle_weak_base_fragment.xml | 2 +- .../src/main/res/layout/shuttle_weak_biz.xml | 40 ++-- .../main/res/layout/unmanned_switch_biz.xml | 21 +- .../layout/unmanned_taxi_base_fragment.xml | 2 +- .../main/res/layout/view_bone_container.xml | 10 +- 26 files changed, 539 insertions(+), 30 deletions(-) create mode 100644 OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_check.png create mode 100644 OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_normal.png create mode 100644 OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_check.xml create mode 100644 OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_normal.xml create mode 100644 OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_selector.xml create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/manager/InputManager.kt create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/KeyboarView.kt create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/biz_routing_search_orderid_bg.png create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/common_key_close.png create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/common_key_del_normal.png create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/common_key_del_press.png create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/common_key_press.png create mode 100644 OCH/common/common/src/main/res/drawable/common_key_del_selector.xml create mode 100644 OCH/common/common/src/main/res/drawable/common_key_normal.xml create mode 100644 OCH/common/common/src/main/res/drawable/common_key_selector.xml create mode 100644 OCH/common/common/src/main/res/layout/common_keyboard_view.xml diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt index 8abbc106a1..fef22376f0 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt @@ -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() 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) { 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) + } + } + } diff --git a/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_check.png b/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_check.png new file mode 100644 index 0000000000000000000000000000000000000000..31ec237fb7cf56cb55c63fad2fd68bbaff8e3cdf GIT binary patch literal 1511 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHQAtEWRA>d&Sx;yjRT$6C?ouQQ zLhU6zwt}@MFFh%NJz1or9!f8QF8NPL4rvb>ZA@ZQ724c_*`y%|3RVxMkRl=k(pC@E zXhqOVOGU|E+KSaCvTWk|`%T~M&b;@%%}jP@T0i)9-uIjD@67u*Z&NJ|(89vPljU;x zrAnpp0^GFucsJU2!9{W^m0H8~YBrm_l+Wk?M7wE}it1^8e*THg&COR~cNE+X&P4FB z3EdU&VkVRMu(PxC?+CV{YUlzAg+dk{dcmXMJ)*a0;BBZ+fD667z2#`8HSJIZ%*@Pm zpc|Zn*}j@-(^@yt1yA(#^0cMS>hFIq)v9m7sSKlfo+l0|WQ1 zO4<#v049$?b{V?QY5G+W!LA|cvl!4{gbAp89){gX*d3}mG8^B+XL}f*G&Kr<^VHnj z+~>I3p8O5ijbPw?X2uSOpt~G{<{9vQ$%1d9ySw{kTr1LjKbH0jY`3+wP2$q6<4V4; zzP|qA;NakomiwXLrKP2xbGh7kbkV1glB9~@nxNB700-)=6aHzG zi51_#nR;L^2^LZVNL*Cffcny9zLFhE9^3!ow zb_-B@8)RaLxS6D+k0YJs&_QX#am8Tzb+YTz` z$B0hLVV82Sp6(dnhATi&UI_pR3zqmso=l5_Sh}&6aL#%-DZZ4aTmZMk zy2m7COMGhq`~VLS_wxZDVZjprDJczhAtPCSj7Z8!VV3xRN%2{L(OuM+l%$^sW{Gb+ zXeJ{T0DNyEnc9O$@$X3LVgXprjg?t4jti6GV`{xF#dDy1MYxgUH>`li4ym{~J&@x# z-{=@+hsS-m^2E$fyYNwe*bgMtR&kBf3yh1er5qe}R%xufcrzy@gSatE+;98)`+t>U za}1CcA6#m`=yQkE=|K&Qxy5*lD}*^OU@qhqz=Kvuw*{p$Q&Urq33$^X6^BPHI^8do zN}uSUC%XlxQ{o8^^j-J2wze+#eN8T zn4tDP32a2i zmCTd5{B}+)wgH%ZUUeJk$@_KRz{7pd5BS?g0eA}!{cO~qplVx-Fbbf-Lq44r@^>Mz z2(bXKh@}4?ux0MUjUucC(1_h>c6RnOnzk|F^PN~TP(*bWlEPyas9*rSi9&d=Bu%lB zSyb#6;v50Rh%7lbai$8@xLg58RH++XEA#{5B|MaEPgpQHuf*^{{Z;3E=_C!gTw#; N002ovPDHLkV1iQ7#3KLz literal 0 HcmV?d00001 diff --git a/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_normal.png b/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_right_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..e37ce032e3fb1420409dfc871d00a8ca96f740a3 GIT binary patch literal 1453 zcmV;e1ycHnP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NH7fD1xRA>dwS<7n`R~XN|x#iL% zf>5(*$s)wO8Yl?Cl@f?6kt&*ei`YxO3(0}$Y!&*8XFs5AzwC1MYS|LJG-M;EcT^RsUGNdA!Q=i*nsR9 z^hcn7y{)ZnHG-}v8XCaV)YK=nwYA6K_$(~di`JqsUjWG9+S=OBot>TkM^oLB4g~vIgVWdy^C%!&O466Z=cQWhzQMmIM%k9Kr)*-SRPq2&!{$%ai7gLM|3ao8 zWA+cH*C=_+sb1JQ4?DYk^hR4-Tfc=&(Wl;KdjP1h*l$a?GdHmkeb>;?@W#!KURqjO z`V=eBHE14|vo2wZ2IR9w33 z`C2`I7TAFrZYZuDmJ_z7rsk`1jCqe|gTXnmzP|pCFtJ}ivh64XRzNFEdXd~9?VRd1nQ4oDotZy%E}-27Z>@&XUU{_Bu0)qrAfmk zqe5lLZ@=glK=fjg{6x&jR4m&X$)WmKF_o|Wei;$_67dttY7Q?b;t^2@W8 zNm86u1i%BANn<9X!ez<76sIo$o+^_h$$umOyvrs@l7C+SJh!_D%N8%>iII>0T~a`t z1D;^9ad<#U%5m|0{J)m`5kTnfk_^PelZK0@q3PQX0Iz{blH~uT6p$YPX=j%7M#mq@ryh!i@UU5=>J+Bv-*bk&&((0{J z+WGi;kOWD7|7veJAUP!5_x;O)lK$5oRbN11-;Pq2Ndxw%=~#3*Y4 zV1}>6`0!qA(h>D)VDigWR`!nw2LHpQ{<6TgSvCOmbaC9Sac2hN0-@{? zD2yUxFJO+I)Uts+poRF2;Vf3-}5WZ&6H-5%@U&yJ1L5PbLuAq6i?S zN&>Luvi!M_Aaa3|xcp&-w}=Dg8Au0CY|MjO+qMTZ)PSCt#y-`xZF@iiU{7HF@Nea& z=HWYmSL_2kW^el*&_OROEPT1Kv9S*e!BR_0%N-1#x2$^ygzy9`6P8n500000NkvXX Hu0mjf2@#bD literal 0 HcmV?d00001 diff --git a/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_check.xml b/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_check.xml new file mode 100644 index 0000000000..2ef62beeac --- /dev/null +++ b/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_check.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_normal.xml b/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_normal.xml new file mode 100644 index 0000000000..5121d1a6be --- /dev/null +++ b/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_normal.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_selector.xml b/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_selector.xml new file mode 100644 index 0000000000..2c6b39bf80 --- /dev/null +++ b/OCH/common/biz/src/main/res/routing/drawable/biz_input_order_id_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml index 29a172b06c..d04b040bcd 100644 --- a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml +++ b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml @@ -59,15 +59,43 @@ android:layout_height="wrap_content"/> + + + + + android:layout_marginTop="@dimen/dp_20" /> #CCFFFFFF #26C14F #FF852E + #999999 \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/InputManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/InputManager.kt new file mode 100644 index 0000000000..aed49d981c --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/InputManager.kt @@ -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() { + + 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) +} diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/KeyboarView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/KeyboarView.kt new file mode 100644 index 0000000000..624f9734fd --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/KeyboarView.kt @@ -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()) + } + + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable-nodpi/biz_routing_search_orderid_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/biz_routing_search_orderid_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..3230b7a125e29032c775c037e88412a68c41ece0 GIT binary patch literal 21241 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 literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_key_close.png b/OCH/common/common/src/main/res/drawable-nodpi/common_key_close.png new file mode 100644 index 0000000000000000000000000000000000000000..fefe722be8505764820e74acc1f6ff6c2e49c8c9 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^njp-<1|(M`Fnj}2jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(KYWH5pNgZKwE#X+QMjAs|DY&^Lz>_AFDc0%q7aRVu?f>}G1Pu)6UwSqO-_^6ZE zpSky58&|IPIUZ58U|s~nm&ul!Ki%KL7kK4NgXjY7CL0}rSVjasz=3>q#%SG2a QtplY1Pgg&ebxsLQ0DTGjX#fBK literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_key_del_normal.png b/OCH/common/common/src/main/res/drawable-nodpi/common_key_del_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..52ba81284b58f6022e4d5d5bd545fa505fbedca3 GIT binary patch literal 1210 zcmV;r1V#IaP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91WS|281ONa40RR91JOBUy04La5O8@`_BuPX;RCodHoQZCnFc5}Ino7OW zD|!DHY|^I9wuzLLw*S9js9_D*gAD^~OUUN%cxFC)U<}o(1;XKQxJ0oZvAxB{^aZwa z2?rRu$M%G6S5?)sYk1}E%#j9+&nV{;w%N;`!#+hB56E*5Fa$NPQvl-zWxi*@CA2)i z+VY)HW@{=6j23|I4x8>TJU9!G0;B7H@BS71^yanqRKkM=Mw~OV0x2-!VBqSDY$F}O zxJCgVqE$NY42LX03Jm>Sl^jTcp@+eoNr4m?(_kb8QeaGnK?zBoLjdC&WR(s)0h7s1 zRtqu&T1e=U~q=?4wG_!X%Ted#3i49)OJyh6LQOU zih4<^6gL8c7TgL9u?)JsLz=V7D%(U3V#1*ON9UM8r~E7-x>GjSH z@lzZ+C9jm9Ebi??0E6#%E%g~gM)StHQ8ZtsV9-Es4XI&psm|I$jDu<0$#aHla1D5< zsdFz+l0E^lVi@9(P$=@uBKcbJ5-_Mh3&;jwh*L+Q$c4UmDHznH0kR<&;$sz*C1FtU zW2X)!WO=6;vxS&9+h9lEHF9Yf)TgRp5Xe?TP))G_g8+Jmy<4SY-L7LFvf)}1R67Kc zg<5i~A(->|1*LwAVjGF0V9@5sxvwm4YDQU^dhJhAUvnn$iM7r8WR% z6h`fEsSz%VCcPAt6Cf*x5(-0J!P=iXky~ViH6;dy+=!Yy;-V~Z@30pg+&xO<_it+m zTE`O1;KSqG9lhKsy-r6>;d^w;)9_jtuFWZAxboELQ6Q9T7)nYah` zV&7u(#YJ+hbyKe1kt3zh=IhQaBXv3m2n#g`#k(#`925ydvV}mgvo5QKvJ>sC#!47s z&L|YQFh?9*L!@v(`GK?rDBg8h6Ja!FBHZVbivO~}%#7}*h* z#nuAG2o$O#Yi)Dgxw++wOaH&ZZH`1H3_*$1+~(!#Cd)OaKyke>Egjvd`--bO`aiyN z5;cVjk;})Q;t)lg6bQ>NP!trLEXjcsD2{g($t*w$6a|TwEcyN@hmM|; zaL2D>)#{yJ#(k1eR-fMhg&$uQD18n(J^qvx2+J!_PQ5;GWS1RCfimF!_NfQlyw9@$ zDNx#;_w4aEv0TG2eJ;x*eDDySQ)H!mwh`W-0`^YwP3$s1QWjqT3TI_Gbzgop-ucz| YKWn4pdF#HSQ~&?~07*qoM6N<$f)RoR8~^|S literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_key_del_press.png b/OCH/common/common/src/main/res/drawable-nodpi/common_key_del_press.png new file mode 100644 index 0000000000000000000000000000000000000000..d8eb58d2a1f6854676b2bf0b6371415a531f5853 GIT binary patch literal 3980 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�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 literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable/common_key_del_selector.xml b/OCH/common/common/src/main/res/drawable/common_key_del_selector.xml new file mode 100644 index 0000000000..bf9fc1893c --- /dev/null +++ b/OCH/common/common/src/main/res/drawable/common_key_del_selector.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable/common_key_normal.xml b/OCH/common/common/src/main/res/drawable/common_key_normal.xml new file mode 100644 index 0000000000..f8352f8655 --- /dev/null +++ b/OCH/common/common/src/main/res/drawable/common_key_normal.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable/common_key_selector.xml b/OCH/common/common/src/main/res/drawable/common_key_selector.xml new file mode 100644 index 0000000000..bc40b0d49c --- /dev/null +++ b/OCH/common/common/src/main/res/drawable/common_key_selector.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/layout/common_keyboard_view.xml b/OCH/common/common/src/main/res/layout/common_keyboard_view.xml new file mode 100644 index 0000000000..53d222b599 --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_keyboard_view.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index 80f2ebb605..975ee81bf3 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -49,7 +49,9 @@ #3B3D44 #2E323A #ffffffff + #fcffffff #1Affffff + #1fffffff #80000000 #2EACFF #D4D4D4 diff --git a/OCH/common/common/src/main/res/values/ids.xml b/OCH/common/common/src/main/res/values/ids.xml index 3b52790d4e..e9e7393dc5 100644 --- a/OCH/common/common/src/main/res/values/ids.xml +++ b/OCH/common/common/src/main/res/values/ids.xml @@ -2,4 +2,6 @@ + + \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index ca6121f7c8..6cace80b45 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -14,7 +14,7 @@ + + + + + + + diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml index fa28d9a246..d59b4bb9f4 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml @@ -1,14 +1,21 @@ + + - diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml index 2f2f5e8065..904c162dc4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml @@ -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"> + +