renkang/xj-android
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1.0.8] 1.手表接口替换 2.登录页面UI修改 3.修改密码逻辑

Browse Source
This commit is contained in:
zhanglei
2026-01-22 16:05:36 +08:00
parent 73f25d9e18
commit e8118708c3
10 changed files with 219 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_login_new.xml
+47 -80
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
@@ -48,7 +49,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="38dp"
android:layout_marginTop="40dp">
android:layout_marginTop="40dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_login_platform"
@@ -73,22 +75,32 @@
android:textSize="16sp" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="平台统一认证"
android:textColor="@color/theme_color"
android:textSize="20sp"
android:textStyle="bold" />
<EditText
android:id="@+id/login_et_user_name"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_marginLeft="@dimen/dp_38"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_38"
android:background="@drawable/bg_grey_background_shap_radius23"
android:drawableLeft="@mipmap/ic_login_phone"
android:drawablePadding="6dp"
android:hint="请输入员工编号或用户名"
android:longClickable="false"
android:maxLength="20"
android:maxLines="1"
android:drawablePadding="6dp"
android:paddingLeft="@dimen/dp_18"
android:drawableLeft="@mipmap/ic_login_phone"
android:singleLine="true"
android:textColor="@color/text_black_33"
android:textColorHint="@color/text_black_99"
@@ -115,97 +127,52 @@
app:shapeCornersRadius="24dp"
app:shapeSolidColor="@color/theme_color" />
<TextView
android:id="@+id/login_retrieve_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_10"
android:text="统一认证找回密码"
android:textColor="@color/text_black_99"
android:textSize="@dimen/txt14" />
<TextView
android:id="@+id/test_btn"
android:layout_width="80dp"
android:layout_height="40dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/text_black_99"
android:textSize="@dimen/txt14" />
<RelativeLayout
android:id="@+id/test_layout"
<LinearLayout
android:id="@+id/login_agreement_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:visibility="gone">
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginRight="@dimen/dp_35"
android:layout_marginBottom="@dimen/dp_35"
android:orientation="horizontal">
<ImageView
android:id="@+id/login_iv_read_state"
android:layout_width="@dimen/dp_14"
android:layout_height="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_2"
android:src="@drawable/ic_login_no_select" />
<TextView
android:id="@+id/tv_debug"
android:id="@+id/login_tv_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:text="开发"
android:textColor="@color/text_black_99"
android:textSize="@dimen/txt14" />
android:layout_marginLeft="@dimen/dp_5"
android:lineSpacingExtra="@dimen/dp_8"
android:textColor="#B6B6B6"
android:textSize="@dimen/txt13"
tools:text="已阅读并同意用户协议和隐私政策" />
<TextView
android:id="@+id/tv_test"
android:layout_width="wrap_content"
android:id="@+id/login_retrieve_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="测试"
android:textColor="@color/text_black_99"
android:textSize="@dimen/txt14" />
<TextView
android:id="@+id/tv_prod"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_gravity="center_horizontal"
android:layout_marginRight="30dp"
android:text="正式"
android:textColor="@color/text_black_99"
android:textSize="@dimen/txt14" />
</RelativeLayout>
android:layout_gravity="end"
android:layout_marginTop="@dimen/dp_10"
android:gravity="end"
android:text="找回密码"
android:textColor="#B6B6B6"
android:textSize="@dimen/txt13" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/login_agreement_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginRight="@dimen/dp_35"
android:layout_marginBottom="@dimen/dp_35"
android:orientation="horizontal">
<ImageView
android:id="@+id/login_iv_read_state"
android:layout_width="@dimen/dp_14"
android:layout_height="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_2"
android:src="@drawable/ic_login_no_select" />
<TextView
android:id="@+id/login_tv_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:lineSpacingExtra="@dimen/dp_8"
android:textColor="@color/text_black_99"
android:textSize="@dimen/txt12" />
</LinearLayout>
</RelativeLayout>
</layout>