diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt new file mode 100644 index 0000000000..feb181b90d --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt @@ -0,0 +1,28 @@ +package com.mogo.och.bus.passenger.model + +/** + * Created on 2022/08/19 + * + * + * 0 初始状态, + * 10 已登录, + * 20 已登出, + */ +enum class OrderStatusEnum(val code: Int) { + NoOrderUnuse( 0 ), //无订单车闲置 m1_order_noorder.xml 无订单页面 + OrderNoLine( 10), //有订单无线路 m1_order_lineside 选择线路页面 + OrdersWithLine( 20), //有订单有线路 m1_order_lineside 选择线路页面隐藏掉确定取消 + NoOrderUse( 30),; //无订单车不闲置 m1_order_end.xml 开门关门页面 + + companion object { + @JvmStatic + fun valueOf(code: Int): OrderStatusEnum? { + for (value in values()) { + if (value.code == code) { + return value + } + } + return NoOrderUnuse + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt new file mode 100644 index 0000000000..fb1cbc1752 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt @@ -0,0 +1,61 @@ +package com.mogo.och.bus.passenger.ui.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.response.LineInfoResponse + +/** + * Created by adityagohad on 06/06/17. + */ +class OrderLineItemAdapter(private val context: Context, private val dataList: List) : RecyclerView.Adapter() { + + private var checkIndex = -1 + + var checkChangeListener:CheckListener?=null + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH { + val view: View + val inflater = LayoutInflater.from(context) + view = inflater.inflate(R.layout.m1_order_line_item, parent, false) + return TextVH(view) + } + + override fun onBindViewHolder(holder: TextVH, position: Int) { + val lineInfo = dataList[holder.bindingAdapterPosition] + if (position==checkIndex){ + holder.lineNameTextView.setBackgroundResource(R.drawable.m1_order_line_checked_shape) + }else{ + holder.lineNameTextView.setBackgroundResource(android.R.color.transparent) + } + holder.lineNameTextView.text = lineInfo.name + holder.lineNameTextView.setOnClickListener { + val preChecked = checkIndex + checkIndex = holder.bindingAdapterPosition + notifyItemChanged(preChecked) + notifyItemChanged(checkIndex) + checkChangeListener?.onCheckListener(lineInfo) + } + } + + override fun getItemCount(): Int { + return dataList.size + } + + interface CheckListener{ + fun onCheckListener(lineInfo:LineInfoResponse.Result) + } + + inner class TextVH(itemView: View) : RecyclerView.ViewHolder(itemView) { + var lineNameTextView: TextView + + init { + lineNameTextView = itemView.findViewById(R.id.tv_line_name) + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt new file mode 100644 index 0000000000..6eb4ff02fe --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt @@ -0,0 +1,88 @@ +package com.mogo.och.bus.passenger.ui.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.response.LineInfoResponse +import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse + +/** + * Created by adityagohad on 06/06/17. + */ +class OrderSiteItemAdapter(private val context: Context, private val dataList: List) : RecyclerView.Adapter() { + + private var checkIndex = -1 + private var enableIndex = -1 + + var checkChangeListener:CheckListener?=null + + fun setEnableIndex(enableIndex:Int){ + this.enableIndex = enableIndex + notifyDataSetChanged() + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH { + val view: View + val inflater = LayoutInflater.from(context) + view = inflater.inflate(R.layout.m1_order_site_item, parent, false) + return TextVH(view) + } + + override fun onBindViewHolder(holder: TextVH, position: Int) { + val siteInfo = dataList[holder.bindingAdapterPosition] + if(holder.bindingAdapterPosition>enableIndex){ + if (position == checkIndex) { + holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_checked) + } else { + holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check) + } + holder.tv_site_site_name.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_2C2D31)) + }else { + holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check) + holder.tv_site_site_name.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_662C2D31)) + } + holder.tv_site_site_name.text = siteInfo.lineName + holder.itemView.setOnClickListener { + if(holder.bindingAdapterPosition>enableIndex) { + val preChecked = checkIndex + checkIndex = holder.bindingAdapterPosition + notifyItemChanged(preChecked) + notifyItemChanged(checkIndex) + checkChangeListener?.onCheckListener(siteInfo) + }else{ + ToastUtils.showShort("请选择可选站点") + } + } + } + + override fun getItemCount(): Int { + return dataList.size + } + + fun clearCheck() { + val temp = checkIndex + checkIndex = -1 + notifyItemChanged(temp) + } + + interface CheckListener{ + fun onCheckListener(siteInfo:SiteInfoResponse.SiteInfo) + } + + inner class TextVH(itemView: View) : RecyclerView.ViewHolder(itemView) { + var tv_site_site_name: TextView + var iv_site_checked: ImageView + + init { + tv_site_site_name = itemView.findViewById(R.id.tv_site_site_name) + iv_site_checked = itemView.findViewById(R.id.iv_site_checked) + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index 00c6dd6613..93760cd843 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -1,18 +1,146 @@ package com.mogo.och.bus.passenger.ui.view +import android.animation.ObjectAnimator import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View +import android.view.animation.LinearInterpolator import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView +import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.response.LineInfoResponse +import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse +import com.mogo.och.bus.passenger.ui.adapter.OrderLineItemAdapter +import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter +import com.mogo.och.bus.passenger.view.BottomDecoration +import com.mogo.och.bus.passenger.view.RecyclerViewCornerRadius +import kotlinx.android.synthetic.m1.m1_order_lineside.view.* +import kotlinx.android.synthetic.m1.m1_soft_fragment.* +import me.jessyan.autosize.utils.AutoSizeUtils class LineSiteView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr) { + + private var checkLine: LineInfoResponse.Result?=null + private var checkSite: SiteInfoResponse.SiteInfo?=null + + private var tempCheckLine: LineInfoResponse.Result?=null + private var tempCheckSite: SiteInfoResponse.SiteInfo?=null + + + private val lineList = mutableListOf() + private val siteList = mutableListOf() + + private var lineAdapter: OrderLineItemAdapter + private var siteAdapter: OrderSiteItemAdapter + + private val loadingAni = ObjectAnimator.ofFloat(iv_loading_wait_driver, "rotation", 0f, 90f ,180f, 270f, 360f).apply { + repeatCount = -1 + interpolator = LinearInterpolator() + duration = 1000 + } + + init { LayoutInflater.from(context).inflate(R.layout.m1_order_lineside, this, true) + lineAdapter = OrderLineItemAdapter(context,lineList) + siteAdapter = OrderSiteItemAdapter(context,siteList) + loadingAni.target = iv_loading_wait_driver + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + lineList.add(LineInfoResponse.Result("路线名称1",1)) + lineList.add(LineInfoResponse.Result("路线名称2",2)) + lineList.add(LineInfoResponse.Result("路线名称3",3)) + lineList.add(LineInfoResponse.Result("路线名称4",4)) + lineList.add(LineInfoResponse.Result("路线名称5",5)) + lineList.add(LineInfoResponse.Result("路线名称6",6)) + lineList.add(LineInfoResponse.Result("路线名称7",7)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",1,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",2,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",3,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",4,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",5,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",6,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",7,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",8,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",9,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",10,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",11,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",12,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + siteList.add(SiteInfoResponse.SiteInfo(1,"线路id",13,"站点名称",0.0,0.0,0.0,0.0,0.0,0)) + + rlv_line_list.layoutManager = LinearLayoutManager(context,LinearLayoutManager.VERTICAL,false) + rlv_line_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context,60f))) + rlv_line_list.adapter = lineAdapter + + rv_site_list.layoutManager = LinearLayoutManager(context,LinearLayoutManager.VERTICAL,false) + rv_site_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context,60f))) + rv_site_list.adapter = siteAdapter + + initListener() + + } + + private fun initListener() { + lineAdapter.checkChangeListener = object :OrderLineItemAdapter.CheckListener{ + override fun onCheckListener(lineInfo: LineInfoResponse.Result) { + ToastUtils.showLong("选中线路${lineInfo} 对比当前坐标计算需要禁用的站点") + tempCheckLine = lineInfo + siteAdapter.clearCheck() + siteAdapter.setEnableIndex(3) + } + } + siteAdapter.checkChangeListener = object :OrderSiteItemAdapter.CheckListener{ + override fun onCheckListener(siteInfo: SiteInfoResponse.SiteInfo) { + // 设置临时选中的 + tempCheckSite = siteInfo + } + + } + tv_line_cancle.onClick { + ToastUtils.showLong("取消切换") + } + tv_line_submit.onClick { + ToastUtils.showLong("向司机端确认弹出loading 并启动轮询查看是否正常连接司机端、等待结果") + startAni() + } + tv_site_cancle.onClick { + ToastUtils.showLong("取消切换") + } + tv_site_submit.onClick { + ToastUtils.showLong("向司机端确认弹出loading 并启动轮询查看是否正常连接司机端、等待结果") + } + tv_switch_line.onClick { + ToastUtils.showLong("判断速度是否为0,开始查询线路信息") + } + tv_loading_wait_driver_title.onClick { + endAni() + } + } + + fun startAni(){ + g_lines_sites_data.visibility = View.GONE + g_loading_group.visibility = View.VISIBLE + if(!loadingAni.isRunning) { + loadingAni.start() + } + } + + fun endAni(){ + g_lines_sites_data.visibility = View.VISIBLE + g_loading_group.visibility = View.GONE + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + loadingAni.cancel() } } \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java new file mode 100644 index 0000000000..78ec3608db --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java @@ -0,0 +1,43 @@ +package com.mogo.och.bus.passenger.view; + +import android.graphics.Rect; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.mogo.commons.AbsMogoApplication; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.och.bus.passenger.ui.adapter.TemperatureAdapter; + +public class BottomDecoration extends RecyclerView.ItemDecoration { + /** + * 第一个视图和最后一个视图偏移的距离 + */ + public static int distance = 0; + + /** + * 设置RecyclerView子视图的边距，本示例仅用于定义两个子视图之间的边距，为space*2 + */ + public BottomDecoration(int distance) { + this.distance = distance; + } + + @Override + public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { + int pos = parent.getChildAdapterPosition(view); + RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams)view.getLayoutParams(); + + /** + * 通过设置Item左右边距实现第一个左侧和最后一个右侧设置边距,确保显示的视图位于屏幕中间 + */ + int itemCount = parent.getAdapter().getItemCount(); + if(pos == itemCount-1){ + layoutParams.setMargins(0,0,0,distance); + }else { + layoutParams.setMargins(0,0,0,0); + } + view.setLayoutParams(layoutParams); + super.getItemOffsets(outRect, view, parent, state); + } +} diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java new file mode 100644 index 0000000000..1d84288d1c --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java @@ -0,0 +1,70 @@ +package com.mogo.och.bus.passenger.view; +import android.graphics.Canvas; +import android.graphics.Path; +import android.graphics.RectF; +import android.graphics.Region; +import android.os.Build; +import android.view.ViewTreeObserver; + +import androidx.recyclerview.widget.RecyclerView; + +/** + * 为RecyclerView设置圆角 + */ +public class RecyclerViewCornerRadius extends RecyclerView.ItemDecoration { + public static final String TAG = "RecyclerViewCornerRadius"; + + private RectF rectF; + private Path path; + + private int topLeftRadius = 0; + private int topRightRadius = 0; + private int bottomLeftRadius = 0; + private int bottomRightRadius = 0; + + public RecyclerViewCornerRadius(final RecyclerView recyclerView) { + recyclerView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + rectF = new RectF(0, 0, recyclerView.getMeasuredWidth(), recyclerView.getMeasuredHeight()); + + path = new Path(); + path.reset(); + path.addRoundRect(rectF, new float[]{ + topLeftRadius, topLeftRadius, + topRightRadius, topRightRadius, + bottomLeftRadius, bottomLeftRadius, + bottomRightRadius, bottomRightRadius + }, Path.Direction.CCW); + + recyclerView.getViewTreeObserver().removeOnGlobalLayoutListener(this); + } + }); + } + + public void setCornerRadius(int radius) { + this.topLeftRadius = radius; + this.topRightRadius = radius; + this.bottomLeftRadius = radius; + this.bottomRightRadius = radius; + } + + public void setCornerRadius(int topLeftRadius, int topRightRadius, int bottomLeftRadius, int bottomRightRadius) { + this.topLeftRadius = topLeftRadius; + this.topRightRadius = topRightRadius; + this.bottomLeftRadius = bottomLeftRadius; + this.bottomRightRadius = bottomRightRadius; + } + + @Override + public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) { + c.clipRect(rectF); + + + if (Build.VERSION.SDK_INT >= 28) { + c.clipPath(path); + } else { + c.clipPath(path, Region.Op.REPLACE); + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end_car.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end_car.png new file mode 100644 index 0000000000..ba4dbadad7 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end_car.png differ diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png new file mode 100644 index 0000000000..94446335e8 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png differ diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_checked.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_checked.png new file mode 100644 index 0000000000..080a4ab088 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_checked.png differ diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_checked_shape.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_checked_shape.xml new file mode 100644 index 0000000000..138da92fa0 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_checked_shape.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_shape.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_shape.xml new file mode 100644 index 0000000000..b9db163776 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_shape.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml index e87b854288..f8a822c8c6 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml @@ -12,7 +12,7 @@ android:layout_height="@dimen/dp_172" android:layout_marginTop="@dimen/dp_63" android:layout_marginStart="@dimen/dp_56" - android:src="@drawable/m1_order_early_end" + android:src="@drawable/m1_order_end_car" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml index 67dc890500..c2bbe00149 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml @@ -18,11 +18,11 @@ app:layout_constraintWidth_percent="0.53698"> diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_line_item.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_line_item.xml new file mode 100644 index 0000000000..ea560d73ea --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_line_item.xml @@ -0,0 +1,11 @@ + + diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml index faa15c61a4..9320493d21 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml @@ -49,6 +49,8 @@ android:layout_height="@dimen/dp_16"/> @@ -154,7 +157,6 @@ @@ -181,6 +183,7 @@ android:layout_height="0dp"/> @@ -188,5 +191,41 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_site_item.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_site_item.xml new file mode 100644 index 0000000000..10a51bc373 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_site_item.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_wait_define.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_wait_define.xml deleted file mode 100644 index 9e559fcc54..0000000000 --- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_wait_define.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml index 59bc9ebb4f..685b7a7cfe 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml @@ -21,7 +21,15 @@ #3B4056 #23293B #485173 + #292C39 + #2C2D31 + #662C2D31 + #80288DFC + #3060ABFE + #0060ABFE + #00EFF6FF + #91EFF6FF #CCFFFFFF #80FFFFFF \ No newline at end of file