androidcode
/
yijianlianUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

一键连新UI

This commit is contained in:
level 2025-10-15 19:05:01 +08:00
parent c000d45c85
commit d82d815f92
12 changed files with 173 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/com/yingmao/clash/act/LoginActivity.kt
View File

@ -58,8 +58,6 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
private lateinit var splashAtyVM: SplashAtyVM
private lateinit var usernameEt: EditText
private lateinit var passwordEt: EditText
private lateinit var usernameErrorTv: TextView
private lateinit var passwordErrorTv: TextView
private lateinit var rxDialogShapeLoading: RxDialogShapeLoading
private lateinit var rememberPasswordCB: CheckBox
private lateinit var userAgreementCB: CheckBox
@ -259,8 +257,6 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
passwordEt = findViewById(R.id.et_password)
passwordEt.transformationMethod = PasswordTransformationMethodBigDot()
passwordEt.setText(password)
usernameErrorTv = findViewById(R.id.tv_username_error)
passwordErrorTv = findViewById(R.id.tv_password_error)
val isChecked =
MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_REMEMBER_IS_CHECKED, true)
rememberPasswordCB = findViewById(R.id.cb_remember_password)
@ -312,23 +308,11 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
forgetPwdTv.setOnClickListener(this)
findViewById<TextView>(R.id.tv_kefu).setOnClickListener(this)
if (Utils.isHarmonyOs()) {
findViewById<TextView>(R.id.tv_hongmeng_tip).visibility = View.VISIBLE
}
tvRegister = findViewById(R.id.tvRegister)
tvRegister.setOnClickListener {
if (BuildConfig.is_free && BuildConfig.productId.isNotEmpty()) {
val intent = Intent(applicationContext, SplashActivity::class.java)
startActivity(intent)
} else {
if (TextUtils.isEmpty(registerHost)) {
val intent = Intent(applicationContext, RegisterActivity::class.java)
startActivity(intent)
finish()
} else {
startActivity(Intent(Intent.ACTION_VIEW, registerHost.toUri()))
}
}
val intent = Intent(applicationContext, RegisterActivity::class.java)
startActivity(intent)
finish()
}
}
@ -443,29 +427,22 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
R.id.tv_login -> {
val username = usernameEt.text.toString().trim()
if (username.isBlank()) {
usernameErrorTv.visibility = View.VISIBLE
usernameErrorTv.text = getString(R.string.please_input_username)
getFocusAndShowSoftInput(usernameEt)
return
}
if (!CommonUtils.checkUsername(username)) {
usernameErrorTv.visibility = View.VISIBLE
usernameErrorTv.text = getString(R.string.username_input_error)
getFocusAndShowSoftInput(usernameEt)
return
}
usernameErrorTv.visibility = View.INVISIBLE
usernameErrorTv.text = ""
val password = passwordEt.text.toString().trim()
if (password.isBlank()) {
passwordErrorTv.visibility = View.VISIBLE
passwordErrorTv.text = getString(R.string.please_input_password)
getFocusAndShowSoftInput(passwordEt)
return
}
passwordErrorTv.visibility = View.INVISIBLE
passwordErrorTv.text = ""
if (rememberPasswordCB.isChecked) {
MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_REMEMBER_USERNAME, username)
MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_REMEMBER_PASSWORD, password)

7
app/src/main/java/com/yingmao/clash/act/RegisterActivity.kt
View File

@ -53,7 +53,6 @@ class RegisterActivity : BaseActivity(), View.OnClickListener {
private var countDownTimer: CountDownTimer? = null
private var registerKey = ""
private var registerIV2 = ""
private lateinit var aiBack:AppCompatImageView
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -157,12 +156,6 @@ class RegisterActivity : BaseActivity(), View.OnClickListener {
passwordErrorTv = findViewById(R.id.tv_password_error)
tvSmSCode=findViewById(R.id.tv_sms_code)
etSmSCode=findViewById(R.id.et_sms_code)
aiBack=findViewById(R.id.aiBack)
aiBack.setOnClickListener {
val intent = Intent(this@RegisterActivity, LoginActivity::class.java)
startActivity(intent)
finish()
}
rxDialogShapeLoading = RxDialogShapeLoading(this)

4
app/src/main/res/drawable/login_et_bg_selector.xml
View File

@ -11,7 +11,7 @@
<solid android:color="@android:color/transparent" />
<stroke
android:width="1dp"
android:color="@color/blue_4072FE" />
android:color="#009AEF" />
<padding android:bottom="4dp" android:top="4dp"/>
</shape>
</item>
@ -28,7 +28,7 @@
<solid android:color="@android:color/transparent" />
<stroke
android:width="1dp"
android:color="@color/gray_BDBDBD" />
android:color="#CBC9C9" />
<padding android:bottom="4dp" android:top="4dp"/>
</shape>
</item>

15
app/src/main/res/drawable/oc_login_bg.xml
View File

@ -1,18 +1,23 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- This is the main color -->
<item>
<shape>
<!-- 边框颜色 -->
<solid android:color="#5A2B31"/>
<corners android:radius="16dp"/>
<gradient android:startColor="#FF757EFF" android:endColor="#FF009AEF" android:angle="0"/>
<corners android:radius="21dp"/>
</shape>
</item>
<!-- 给View的上 左 右设置8dp的边框 -->
<item android:top="1dp" android:left="1dp" android:right="3dp" android:bottom="3dp" >
<item
android:bottom="3dp"
android:left="1dp"
android:right="3dp"
android:top="1dp">
<shape>
<!-- View填充颜色 -->
<solid android:color="#FF8A04" />
<corners android:radius="16dp"/>
<gradient android:startColor="#FF757EFF" android:endColor="#FF009AEF" android:angle="0"/>
<corners android:radius="21dp" />
</shape>
</item>

2
app/src/main/res/drawable/oc_login_hide.xml
View File

@ -5,5 +5,5 @@
android:viewportHeight="80">
<path
android:pathData="M36.667,53.243C33.85,53.053 31.1,52.576 28.466,51.843L23.013,63.536C22.828,63.931 22.566,64.285 22.244,64.579C21.921,64.872 21.544,65.099 21.134,65.246C20.723,65.393 20.288,65.457 19.853,65.436C19.417,65.414 18.99,65.307 18.597,65.12C17.8,64.749 17.183,64.078 16.878,63.254C16.573,62.43 16.607,61.52 16.97,60.72L22.203,49.496C17.754,47.404 13.792,44.406 10.57,40.693C8.188,37.941 6.321,34.783 5.056,31.37C4.906,30.959 4.838,30.522 4.856,30.085C4.874,29.647 4.978,29.218 5.162,28.821C5.347,28.424 5.607,28.067 5.929,27.77C6.251,27.474 6.629,27.244 7.04,27.093C7.451,26.942 7.887,26.874 8.325,26.892C8.762,26.911 9.192,27.015 9.589,27.199C9.986,27.383 10.343,27.644 10.639,27.966C10.936,28.288 11.166,28.665 11.316,29.076C12.307,31.74 13.768,34.203 15.63,36.35C21.143,42.776 29.923,46.676 39.51,46.676C49.1,46.676 57.88,42.773 63.393,36.35C65.255,34.203 66.716,31.74 67.706,29.076C68.011,28.246 68.632,27.571 69.434,27.199C70.236,26.827 71.153,26.789 71.983,27.093C72.813,27.397 73.489,28.019 73.86,28.821C74.232,29.623 74.271,30.54 73.966,31.37C72.702,34.783 70.835,37.941 68.453,40.693C67.982,41.242 67.493,41.776 66.987,42.293L75.14,50.446C75.755,51.074 76.097,51.918 76.092,52.796C76.088,53.674 75.737,54.515 75.117,55.136C74.811,55.447 74.446,55.693 74.045,55.863C73.643,56.032 73.212,56.12 72.776,56.122C72.341,56.124 71.909,56.04 71.505,55.875C71.102,55.71 70.735,55.467 70.426,55.16L61.86,46.593C60.26,47.693 58.56,48.67 56.78,49.516L62.007,60.716C62.371,61.517 62.404,62.428 62.1,63.253C61.795,64.078 61.177,64.749 60.38,65.12C59.986,65.307 59.559,65.414 59.124,65.436C58.688,65.457 58.253,65.393 57.842,65.246C57.432,65.099 57.055,64.872 56.732,64.579C56.41,64.285 56.148,63.931 55.963,63.536L50.516,51.853C48.166,52.505 45.762,52.945 43.333,53.166V63.373C43.325,64.252 42.971,65.092 42.346,65.711C41.722,66.329 40.879,66.676 40,66.676C38.146,66.676 36.667,65.196 36.667,63.376V53.243Z"
android:fillColor="#E59E4D"/>
android:fillColor="#000000"/>
</vector>

2
app/src/main/res/drawable/oc_login_visible.xml
View File

@ -5,5 +5,5 @@
android:viewportHeight="80">
<path
android:pathData="M40,60.01C25.667,60.01 14.333,53.343 6.667,40.01C14.333,26.676 25.667,20.01 40,20.01C54.333,20.01 65.666,26.676 73.333,40.01C65.666,53.343 54.333,60.01 40,60.01ZM40.667,26.676C30.667,26.676 20.667,31.01 15,40.01C20.667,49.01 30.667,53.343 40.667,53.343C50.667,53.343 59.333,49.01 65,40.01C59.333,31.01 50.667,26.676 40.667,26.676ZM40,50.01C34.333,50.01 30,45.676 30,40.01C30,34.343 34.333,30.01 40,30.01C45.667,30.01 50,34.343 50,40.01C50,45.676 45.667,50.01 40,50.01ZM40,43.343C42,43.343 43.333,42.01 43.333,40.01C43.333,38.01 42,36.676 40,36.676C38,36.676 36.667,38.01 36.667,40.01C36.667,42.01 38,43.343 40,43.343Z"
android:fillColor="#E59E4D"/>
android:fillColor="#000000"/>
</vector>

13
app/src/main/res/drawable/yjl_login_bg.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#BFD5D5D5" >
<item>
<shape>
<gradient
android:angle="360"
android:endColor="@color/white"
android:startColor="@color/white" />
<corners android:topRightRadius="30dp" android:topLeftRadius="30dp" android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"/>
</shape>
</item>
</ripple>

24
app/src/main/res/drawable/yjl_register_login_bg.xml Normal file
View File

@ -0,0 +1,24 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- This is the main color -->
<item>
<shape>
<!-- 边框颜色 -->
<gradient android:startColor="#FFE9E9E9" android:endColor="#FFE9E9E9" android:angle="0"/>
<corners android:radius="21dp"/>
</shape>
</item>
<!-- 给View的上 左 右设置8dp的边框 -->
<item
android:bottom="3dp"
android:left="1dp"
android:right="3dp"
android:top="1dp">
<shape>
<!-- View填充颜色 -->
<solid android:color="#FF8A04" />
<gradient android:startColor="#FFE9E9E9" android:endColor="#FFE9E9E9" android:angle="0"/>
<corners android:radius="21dp" />
</shape>
</item>
</layer-list>

74
app/src/main/res/layout/activity_register.xml
View File

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".act.LoginActivity"
android:background="@mipmap/oc_index_bg"
android:background="#FF6FA2FA"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clTitle"
@ -14,55 +14,65 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="43dp"
android:layout_marginStart="37dp"
>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aiBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_mode_back"
android:padding="5dp"
android:layout_marginStart="15dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#B36C1B"
app:layout_constraintStart_toStartOf="parent"
android:id="@+id/dogHead"
android:layout_width="166dp"
android:layout_height="166dp"
android:src="@mipmap/login_earth_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:text="@string/register"
android:textSize="18sp"
android:layout_marginEnd="16dp"
/>
<TextView
android:id="@+id/tv_welcome_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/HelloWelcomeRegister"
android:textColor="@color/white"
android:textSize="@dimen/layout_login_welcome_textsize"
android:textStyle="bold"
android:layout_marginTop="90dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clTitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/yjl_login_bg"
android:layout_marginTop="13dp">
<TextView
android:id="@+id/tv_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_register_username_title_text_top_margin"
android:layout_marginTop="24dp"
android:text="@string/username"
android:textColor="@color/black_4F4F4F"
android:textSize="@dimen/layout_login_username_title_textsize"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
android:layout_marginStart="35dp"
android:layout_marginStart="28dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clTitle" />
app:layout_constraintTop_toTopOf="parent"
/>
<EditText
android:id="@+id/et_username"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_register_et_start_margin"
android:layout_marginTop="@dimen/layout_register_et_top_margin"
android:layout_marginEnd="@dimen/layout_register_et_end_margin"
android:layout_marginTop="12dp"
android:layout_marginEnd="35dp"
android:autofillHints=""
android:background="@drawable/login_et_bg_selector"
android:hint="@string/phone_and_email"
android:hint="@string/InputUserPhone"
android:inputType="textPersonName"
android:maxLines="1"
android:textColor="@color/black_4F4F4F"
@ -72,7 +82,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_username"
app:layout_constraintTop_toBottomOf="@+id/tv_username" />
<TextView
@ -277,6 +287,8 @@
android:textColor="#B36C1B"
android:textSize="16sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

171
app/src/main/res/layout/layout_activity_login.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/oc_index_bg">
android:background="#6FA2FA">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -12,35 +12,35 @@
tools:context=".ui.login.LoginActivity"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clwe"
android:id="@+id/clTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="35dp"
android:layout_marginStart="37dp"
>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/dogHead"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/oc_dog_head"
app:layout_constraintStart_toStartOf="parent"
android:layout_width="166dp"
android:layout_height="166dp"
android:src="@mipmap/login_earth_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginEnd="16dp"
/>
<TextView
android:id="@+id/tv_welcome_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/WelcomeBack"
android:textColor="@color/orange_B36C1B"
android:text="@string/HelloWelcomeLogin"
android:textColor="@color/white"
android:textSize="@dimen/layout_login_welcome_textsize"
android:textStyle="bold"
android:layout_marginTop="5dp"
android:layout_marginTop="90dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dogHead"
app:layout_constraintTop_toTopOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
@ -50,111 +50,93 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clwe"
app:layout_constraintTop_toBottomOf="@+id/clTitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/yjl_login_bg"
android:layout_marginTop="13dp"
>
<TextView
android:id="@+id/tv_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginStart="35dp"
android:layout_marginTop="24dp"
android:layout_marginStart="28dp"
android:text="@string/phone_and_email"
android:textColor="@color/black_4F4F4F"
android:textSize="13dp"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
<LinearLayout
android:id="@+id/llUserName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="35dp"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="35dp"
android:layout_marginTop="5dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_username"
app:layout_constraintTop_toBottomOf="@+id/tv_username"
android:background="@drawable/oc_login_username_edit_bg"
>
app:layout_constraintTop_toBottomOf="@+id/tv_username">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/et_username"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:background="@null"
android:background="@drawable/login_et_bg_selector"
android:hint="@string/username_input_error1"
android:inputType="textPersonName"
android:maxLines="1"
android:textColor="@color/black_4F4F4F"
android:textColor="@color/black"
android:textColorHint="@color/gray_BDBDBD"
android:textSize="@dimen/layout_login_et_textsize"
android:hint="@string/username_input_error1"
android:textStyle="bold"
/>
android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/tv_username_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textColor="@color/orange_B36C1B"
android:textSize="@dimen/layout_login_username_input_err_tip_textsize"
app:layout_constraintStart_toStartOf="@+id/llUserName"
app:layout_constraintTop_toBottomOf="@+id/llUserName" />
<TextView
android:id="@+id/tv_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginTop="18dp"
android:text="@string/password"
android:textColor="@color/black_4F4F4F"
android:textSize="@dimen/layout_login_pwd_title_textsize"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/tv_username"
app:layout_constraintTop_toBottomOf="@+id/tv_username_error" />
app:layout_constraintStart_toStartOf="@+id/llUserName"
app:layout_constraintTop_toBottomOf="@+id/llUserName" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/llPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="35dp"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginEnd="35dp"
android:layout_marginTop="5dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_password"
app:layout_constraintTop_toBottomOf="@+id/tv_password"
android:background="@drawable/oc_login_username_edit_bg"
android:background="@drawable/login_et_bg_selector"
>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/et_password"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_height="match_parent"
android:layout_marginEnd="10dp"
android:background="@null"
android:hint="@string/please_input_password"
android:inputType="textPassword"
android:maxLines="1"
android:textColor="@color/black_4F4F4F"
android:textColor="@color/black"
android:textColorHint="@color/gray_BDBDBD"
android:textSize="@dimen/layout_login_et_textsize"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/cb_password_hide"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -171,28 +153,17 @@
app:layout_constraintTop_toTopOf="@+id/et_password" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_password_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_login_username_input_err_tip_text_top_margin"
android:textColor="@color/orange_B36C1B"
android:textSize="@dimen/layout_login_username_input_err_tip_textsize"
app:layout_constraintStart_toStartOf="@+id/tv_password"
app:layout_constraintTop_toBottomOf="@+id/llPassword" />
<CheckBox
android:id="@+id/cb_remember_password"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginStart="10dp"
android:button="@null"
android:checked="true"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/remember_password"
android:visibility="gone"
android:textColor="@color/black_4F4F4F"
android:textSize="14sp"
app:drawableLeftCompat="@drawable/checked_selector"
@ -203,14 +174,16 @@
android:id="@+id/cb_user_agreement"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:button="@null"
android:checked="true"
android:gravity="center"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
app:drawableLeftCompat="@drawable/checked_selector"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/cb_remember_password"
app:layout_constraintTop_toBottomOf="@+id/cb_remember_password"
/>
app:layout_constraintTop_toBottomOf="@+id/tv_forget_pwd" />
<TextView
android:id="@+id/tv_login"
@ -230,20 +203,7 @@
android:textSize="@dimen/layout_login_tv_login_textsize"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@+id/cb_user_agreement" />
<TextView
android:id="@+id/tv_hongmeng_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="10"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/LoginTips2"
android:textColor="@color/forget_pwd_text_color"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@+id/loginTips"
tools:ignore="MissingConstraints"
tools:layout_editor_absoluteX="0dp" />
<TextView
android:id="@+id/tvTips"
@ -275,30 +235,35 @@
<TextView
android:id="@+id/tvRegister"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="18dp"
android:background="@drawable/yjl_register_login_bg"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:layout_marginEnd="20dp"
android:textColor="@color/orange_B36C1B"
android:padding="5dp"
android:textSize="16sp"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:text="@string/register"
android:textColor="@color/orange_B36C1B"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@+id/tv_login"
app:layout_constraintStart_toStartOf="@+id/tv_login"
app:layout_constraintTop_toBottomOf="@+id/tv_login" />
<TextView
android:id="@+id/loginTips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/loginTips"
android:textColor="#828282"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/tvRegister"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvRegister" />
<TextView
@ -319,14 +284,14 @@
android:id="@+id/tv_forget_pwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/forget_pwd"
android:textColor="@color/orange_B36C1B"
android:layout_marginTop="20dp"
android:padding="5dp"
android:textSize="16sp"
android:text="@string/forget_pwd"
android:textColor="#FFA19C9C"
android:textSize="14sp"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/tv_login"
app:layout_constraintTop_toBottomOf="@+id/tv_login" />
app:layout_constraintStart_toStartOf="@+id/tv_password"
app:layout_constraintTop_toBottomOf="@+id/llPassword" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

BIN
app/src/main/res/mipmap-hdpi/login_earth_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

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

@ -19,7 +19,7 @@
<string name="password_check">再次输入密码</string>
<string name="login">登录</string>
<string name="register">注册</string>
<string name="forget_pwd">忘记密码</string>
<string name="forget_pwd">忘记密码?</string>
<string name="please_input_password">请输入密码</string>
<string name="please_input_password_check">请输入确认密码</string>
<string name="please_input_password_double_err">两次输入密码不一致</string>
@ -438,4 +438,8 @@
<string name="MembershipValidityPeriod">会员有效期：</string>
<string name="Gift">赠送</string>
<string name="closeRunningChoose">请断开连接后在进行模式切换</string>
<string name="HelloWelcomeLogin">Hello\n欢迎登陆</string>
<string name="HelloWelcomeRegister">Hello\n欢迎注册</string>
<string name="InputUserPhone">请输入您的手机号或邮箱</string>
</resources>