fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注册/登录接口联调

Browse Source
This commit is contained in:
fengjignqi
2026-05-19 08:15:24 +08:00
parent cfa606f65e
commit c485b1e059
15 changed files with 342 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/res/layout/login_layout.xml
View File

@@ -90,7 +90,7 @@
<EditText
android:id="@+id/et_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="@null"
android:textSize="14sp"
@@ -113,8 +113,9 @@
android:layout_height="24dp"
android:src="@mipmap/icon_phone_code"/>
<EditText
android:id="@+id/ed_code_input"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2"
android:layout_marginLeft="5dp"
android:background="@null"
@@ -203,5 +204,40 @@
android:text="@string/reset_psd"
android:visibility="invisible"/>
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_100">
<RelativeLayout
android:id="@+id/realtive_read_finish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginHorizontal="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_30">
<RadioButton
android:id="@+id/checkbox_read"
android:layout_width="@dimen/dp_14"
android:layout_height="@dimen/dp_14"
android:background="@drawable/select_radio"
android:layout_centerVertical="true"
android:button="@null"
android:clickable="false"
android:visibility="visible" />
<TextView
android:id="@+id/tv_agreement_full"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12"
android:layout_toRightOf="@+id/checkbox_read"
android:autoLink="none"
android:lineSpacingExtra="4dp"
android:textColor="@color/color_gray_tab"
android:textSize="11sp" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

8
app/src/main/res/layout/register_layout.xml
View File

@@ -40,7 +40,7 @@
<EditText
android:id="@+id/et_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
@@ -65,7 +65,7 @@
<EditText
android:id="@+id/et_verfi_code"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
@@ -102,7 +102,7 @@
<EditText
android:id="@+id/et_input_psd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
@@ -127,7 +127,7 @@
<EditText
android:id="@+id/et_input_psd_agin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"

2
app/src/main/res/values-en/strings.xml
View File

@@ -18,6 +18,8 @@
<string name="login_error_phone_empty">手机号不能为空</string>
<string name="hint_input_psd_not_match">两次输入的密码不一致</string>
<string name="login_error_phone_invalid">请输入正确的手机号或邮箱</string>
<string name="login_error_psd_empty">手机号或邮箱不能为空</string>
<string name="login_error_psd_agin_empty">请再次输入密码</string>
<string name="register_title">注册用户</string>
<string name="register_title_bar">注册</string>
<string name="register_success_title">注册成功</string>

6
app/src/main/res/values/strings.xml
View File

@@ -16,7 +16,9 @@
<string name="hint_input_new_psd">请输入新密码</string>
<string name="hint_input_new_psd_agin">请再次输入新密码</string>
<string name="hint_input_psd_not_match">两次输入的密码不一致</string>
<string name="login_error_phone_empty">手机号不能为空</string>
<string name="login_error_phone_empty">手机号或邮箱不能为空</string>
<string name="login_error_psd_empty">密码不能为空</string>
<string name="login_error_psd_agin_empty">请再次输入密码</string>
<string name="login_error_phone_invalid">请输入正确的手机号或邮箱</string>
<string name="register_title">注册用户</string>
<string name="register_title_bar">注册</string>
@@ -177,7 +179,7 @@
</string>
<string name="app_name">星语明灯</string>
<string name="app_name">智能浇水</string>
<!-- ==================== 登录页 ==================== -->
<string name="login_app_name">星语明灯</string>