xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/res/layout/adapter_sign.xml
This commit is contained in:
squallzhjch
2023-06-02 14:17:05 +08:00
parent d68e7bd768 5f953aa816
commit ebc4ddf5a9
13 changed files with 131 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-xhdpi/icon_evaluation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 704 B

BIN
app/src/main/res/drawable-xxhdpi/icon_evaluation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 988 B

2
app/src/main/res/layout/activity_login.xml
View File

@@ -117,6 +117,8 @@
tools:ignore="TouchTargetSizeCheck" />
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/tv_login_forget_passwd"
android:layout_width="match_parent"

11
app/src/main/res/layout/adapter_sign.xml
View File

@@ -62,4 +62,15 @@
android:layout_toRightOf="@id/sign_main_bg"
android:background="@drawable/icon_sign_info"
android:visibility="gone" />
<ImageView
android:id="@+id/sign_main_fast_error"
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:background="@drawable/icon_evaluation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>

2
app/src/main/res/values-w1024dp/dimens.xml
View File

@@ -1,5 +1,5 @@
<resources>
<dimen name="fab_margin">200dp</dimen>
<dimen name="fab_margin">48dp</dimen>
<dimen name="top_right_drawer_btns_wh" comment="地图主页右上角抽屉按钮的大小">54dp</dimen>
<dimen name="top_right_drawer_wh" comment="地图主页右上角抽屉的把手按钮的大小">42dp</dimen>
<dimen name="top_right_drawer_btns_mr" comment="地图主页右上角抽屉按钮距离右侧间距">44dp</dimen>