tt/Xuewang365OSHonor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.2.0

Browse Source 
fix:
update:优化登录和激活逻辑
This commit is contained in:
tongtongstudio
2026-01-06 09:34:39 +08:00
parent ee4c05b438
commit 6c28512c1a
64 changed files with 1570 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_home.xml
View File

@@ -146,7 +146,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_tab"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@@ -152,7 +152,7 @@
android:layout_height="match_parent"
android:background="@drawable/edit_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView10"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -194,19 +194,23 @@
app:layout_constraintStart_toEndOf="@+id/view2"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_get_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:maxLines="1"
android:gravity="center"
android:onClick="@{click::getCode}"
android:singleLine="true"
android:text="获取"
android:textColor="@color/default_blue"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/et_code"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView10"
android:layout_width="96dp"
android:layout_height="29dp"
android:adjustViewBounds="true"
android:onClick="@{click::getCode}"
android:scaleType="centerCrop"
android:src="@drawable/icon_login_sms_code_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/activity_login_successful.xml
View File

@@ -34,7 +34,8 @@
app:layout_constraintBottom_toTopOf="@+id/constraintLayout17"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.333" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout17"
@@ -106,6 +107,7 @@
android:layout_width="110dp"
android:layout_height="25dp"
android:adjustViewBounds="true"
android:onClick="@{click::toHome}"
android:scaleType="centerCrop"
android:src="@drawable/icon_activation_confirm"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -51,5 +51,16 @@
android:layout_marginTop="9dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="6dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:maxLines="1"
android:singleLine="true"
android:text="支付成功后，请先下载上述软件，保证系统正常运行。"
android:textColor="@color/red"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout/fragment_dialog_login_statu.xml
View File

@@ -50,6 +50,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginBottom="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout15">
@@ -78,6 +79,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="16dp">
<TextView
@@ -100,6 +102,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:visibility="gone"
android:layout_marginBottom="12dp">
<TextView
@@ -123,6 +126,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
android:layout_marginStart="4dp"
android:layout_marginBottom="16dp"
android:maxLines="1"

70
app/src/main/res/layout/fragment_mine.xml
View File

@@ -9,6 +9,12 @@
<variable
name="click"
type="com.xwad.os.fragment.mine.MineFragment.BtnClick" />
<variable
name="userAvatarInfo"
type="com.xwad.os.bean.UserAvatarInfo" />
<import type="android.text.TextUtils" />
</data>
<!--基数3.2，图片宽高直接除-->
@@ -60,6 +66,8 @@
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:src="@drawable/default_avatar"
app:error="@{@drawable/default_avatar}"
app:imageUrl="@{userAvatarInfo.avatar}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -98,9 +106,10 @@
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/default_nickname"
android:text="@{userAvatarInfo==null?@string/default_nickname:userAvatarInfo.sn_name}"
android:textColor="@color/white"
android:textSize="9sp" />
android:textSize="9sp"
tools:text="@string/default_nickname" />
</LinearLayout>
<LinearLayout
@@ -344,8 +353,8 @@
android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent"
android:onClick="onClick"
android:visibility="gone"
android:tag="@string/tag_args_new_arzd">
android:tag="@string/tag_args_new_arzd"
android:visibility="gone">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
@@ -383,11 +392,54 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent"
android:onClick="@{click::register}"
android:tag="@string/tag_args_jxw_main">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/app_icon12"
android:layout_width="@dimen/mine_icon_height"
android:layout_height="@dimen/mine_icon_height"
android:layout_gravity="center_horizontal"
android:src="@drawable/icon_bbx_yygx"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/app_name12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:singleLine="true"
android:text="许可证"
android:textColor="@color/white"
android:textSize="@dimen/mine_app_name_size"
app:layout_constraintEnd_toEndOf="@+id/app_icon12"
app:layout_constraintStart_toStartOf="@+id/app_icon12"
app:layout_constraintTop_toBottomOf="@+id/app_icon12" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent"
android:onClick="onClick"
android:tag="@string/tag_args_updae">
android:tag="@string/tag_args_updae"
android:visibility="gone">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
@@ -429,8 +481,8 @@
android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent"
android:onClick="onClick"
android:visibility="gone"
android:tag="@string/tag_args_new_jzgk">
android:tag="@string/tag_args_new_jzgk"
android:visibility="gone">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
@@ -472,8 +524,8 @@
android:layout_width="@dimen/mine_icon_width"
android:layout_height="match_parent"
android:onClick="onClick"
android:visibility="gone"
android:tag="@string/tag_args_new_yjjs">
android:tag="@string/tag_args_new_yjjs"
android:visibility="gone">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"

31
app/src/main/res/layout/item_dialog_app.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rl_root"
android:layout_width="match_parent"
android:layout_height="69dp">
@@ -8,17 +9,33 @@
android:id="@+id/iv_app_icon"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_centerHorizontal="true" />
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_download"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/ic_download"
app:layout_constraintStart_toStartOf="@+id/iv_app_icon"
app:layout_constraintTop_toTopOf="@+id/iv_app_icon" />
<TextView
android:id="@+id/tv_app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_app_icon"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="当前壁纸"
android:textColor="#333333"
android:textSize="9sp" />
</RelativeLayout>
android:textSize="9sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_app_icon" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/item_tab.xml
View File

@@ -4,8 +4,8 @@
android:layout_width="wrap_content"
android:layout_height="34dp"
android:orientation="vertical"
android:paddingStart="9dp"
android:paddingRight="9dp">
android:paddingStart="6dp"
android:paddingRight="6dp">
<ImageView
android:id="@+id/tv_tab_icon"