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

[6.7.0]

Browse Source 
[fea]
[commondialog]
This commit is contained in:
yangyakun
2024-10-21 10:39:59 +08:00
parent cfcd54a93b
commit 68cc976956
9 changed files with 48 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonDialogStatus.kt
View File

@@ -43,7 +43,7 @@ class CommonDialogStatus: BaseFloatDialog, LifecycleObserver {
private var showCloseView:Boolean = false
@ColorRes
private var cancelTextColor:Int = R.color.white
private var cancelTextColor:Int = R.color.common_ffffffff
private var status: Status = Status.ask
@@ -59,7 +59,7 @@ class CommonDialogStatus: BaseFloatDialog, LifecycleObserver {
cancelTextColor = builder.cancelTextColor
this.clickListener = builder.clickListener
commonCancel?.setTextColor(ResourcesUtils.getColors(cancelTextColor))
commonCancel?.setTextColor(ResourcesUtils.getColor(cancelTextColor))
when (status) {
Status.ask -> {
@@ -180,7 +180,7 @@ class CommonDialogStatus: BaseFloatDialog, LifecycleObserver {
var cancelStr:String = ""
var countDownValue: Int = 0
var showClose:Boolean =false
var cancelTextColor:Int = Color.WHITE
var cancelTextColor:Int = R.color.common_ffffffff
var clickListener:ClickListener?=null
fun title(title: String) : Builder {

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

@@ -38,4 +38,5 @@
<color name="common_f7151d41">#F7151D41</color>
<color name="common_3B3D44">#3B3D44</color>
<color name="common_2E323A">#2E323A</color>
<color name="common_ffffffff">#ffffffff</color>
</resources>

2
OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
View File

@@ -269,7 +269,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
statusBarView.tag = "status_bar"
val statusBarLP = FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
AutoSizeUtils.dp2px(it, 72.0f),
AutoSizeUtils.dp2px(it, 67.0f),
)
statusBarLP.topMargin = 0
statusBarLP.gravity = Gravity.TOP

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManager.kt
View File

@@ -51,7 +51,7 @@ object RunningTaskManager : LifecycleEventObserver{
})
enqueuePop(
badCaseConfigView,
AutoSizeUtils.dp2px(context, 960f),
AutoSizeUtils.dp2px(context, 1046f),
WindowManager.LayoutParams.MATCH_PARENT,
key = "BadCaseConfigView"
).also {

BIN
OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_local_submit_bg.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_localtask_panel.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 640 KiB

84
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
View File

@@ -1,22 +1,29 @@
<?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="960dp"
android:layout_width="@dimen/dp_1046"
android:layout_height="match_parent"
android:background="#F0151D41"
android:layout_marginTop="@dimen/dp_status_bar_height"
android:id="@+id/clLayout"
>
android:background="@drawable/bus_localtask_panel"
android:layout_marginTop="@dimen/dp_67"
android:id="@+id/clLayout">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_v_right"
app:layout_constraintGuide_end="@dimen/dp_46"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/ivTaskRunningClose"
android:layout_width="107dp"
android:layout_height="107dp"
android:layout_marginTop="66dp"
android:layout_marginEnd="40dp"
android:src="@drawable/icon_close_nor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="@dimen/dp_87"
android:layout_height="@dimen/dp_85"
android:padding="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_40"
android:src="@drawable/common_dialog_close"
app:layout_constraintEnd_toEndOf="@+id/guideline_v_right"
app:layout_constraintTop_toTopOf="@+id/tvManagerTitle"
app:layout_constraintBottom_toBottomOf="@+id/tvManagerTitle"
/>
<View
@@ -56,9 +63,10 @@
android:id="@+id/actvCurrentDate"
app:layout_constraintTop_toBottomOf="@+id/ivTaskRunningClose"
android:layout_marginTop="@dimen/dp_53"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="@color/shuttle_color_80203076"
app:layout_constraintStart_toStartOf="@id/viewManagerTitleLine"
app:layout_constraintEnd_toEndOf="@id/guideline_v_right"
android:background="@color/shuttle_driver_80000000"
android:layout_marginEnd="@dimen/dp_60"
android:text="时间"
android:textColor="@color/white"
android:textSize="@dimen/dp_32"
@@ -70,7 +78,7 @@
android:id="@+id/rvDataLiet"
app:layout_constraintTop_toBottomOf="@+id/actvCurrentDate"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_v_right"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="@dimen/dp_41"
android:layout_width="0dp"
@@ -80,11 +88,9 @@
<LinearLayout
android:id="@+id/upload_btn_commit"
android:layout_width="match_parent"
android:layout_marginStart="@dimen/dp_85"
android:layout_marginEnd="@dimen/dp_85"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_126"
android:background="@drawable/bus_switch_line_btn_commit"
android:background="@drawable/bus_local_submit_bg"
android:gravity="center"
android:layout_marginBottom="@dimen/dp_73"
app:layout_constraintBottom_toBottomOf="parent"
@@ -107,35 +113,15 @@
android:gravity="center" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
app:layout_constraintTop_toBottomOf="@+id/tvManagerTitle"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
<com.mogo.och.common.module.wigets.commonview.EmptyView
android:id="@+id/no_order_data_view"
android:visibility="gone">
<ImageView
android:id="@+id/no_order_data_iv"
android:layout_width="@dimen/dp_386"
android:layout_height="@dimen/dp_350"
android:src="@drawable/no_order_data"
android:scaleType="fitXY"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
<TextView
android:id="@+id/no_order_data_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#9099BF"
android:textSize="46dp"
android:gravity="center"
android:layout_marginTop="58dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv"
android:text="@string/bus_no_running_task"/>
</androidx.constraintlayout.widget.ConstraintLayout>
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:empty_title="@string/bus_no_running_task"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>

8
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running_item.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/clLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_180"
android:background="#F0151D41">
android:background="@color/transparent">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="@dimen/dp_30"
@@ -26,7 +26,7 @@
android:layout_marginEnd="@dimen/dp_80"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/shuttle_color_8E9DD4"
android:textColor="@color/white"
android:textSize="@dimen/dp_38"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -50,10 +50,10 @@
<View
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_80"
android:layout_marginEnd="@dimen/dp_80"
android:background="@color/bus_station_tag_txt_un_color"
android:background="@color/shuttle_driver_99FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

3
OCH/shuttle/driver_weaknet/src/main/res/values/colors.xml
View File

@@ -75,8 +75,11 @@
<color name="shuttle_driver_bf1e2e89">#BF1E2E89</color>
<color name="shuttle_driver_D4D4D4">#D4D4D4</color>
<color name="shuttle_driver_80FFFFFF">#80FFFFFF</color>
<color name="shuttle_driver_99FFFFFF">#99FFFFFF</color>
<color name="shuttle_driver_4DFFFFFF">#4D000000</color>
<color name="shuttle_driver_1970FF">#1970FF</color>
<color name="shuttle_driver_19FF7F">#19FF7F</color>
<color name="shuttle_driver_B3FFFFFF">#B3FFFFFF</color>
<color name="shuttle_driver_ffffffff">#ffffffff</color>
<color name="shuttle_driver_80000000">#80000000</color>
</resources>