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

version:1.3.9

Browse Source 
fix:
update:优化退出界面
This commit is contained in:
Fanhuitong
2023-05-24 10:15:42 +08:00
parent 3e44bb0c63
commit c4f694f4de
25 changed files with 1080 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/control_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 250 KiB

BIN
app/src/main/res/drawable-hdpi/icon_lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 900 B

206
app/src/main/res/layout-land/activity_screen_lock.xml
View File

@@ -4,65 +4,76 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/float_window_color">
android:background="@drawable/control_background">
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退出系统"
android:textStyle="bold"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
<ImageView
android:id="@+id/imageView5"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_lock"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.065" />
app:layout_constraintVertical_bias="0.11" />
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView" />
app:layout_constraintBottom_toTopOf="@+id/ll_keyboard"
app:layout_constraintTop_toBottomOf="@+id/imageView5"
app:layout_constraintVertical_bias="0.347"
tools:layout_editor_absoluteX="0dp">
<com.tuo.customview.VerificationCodeView
android:id="@+id/icv"
android:layout_width="wrap_content"
android:layout_height="@dimen/sp_32"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_16"
app:icv_et_bg_focus="@drawable/shape_icv_et_bg_focus1"
app:icv_et_bg_normal="@drawable/shape_icv_et_bg_normal1"
app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
app:icv_et_number="6"
app:icv_et_pwd_radius="10dp"
app:icv_et_text_color="#000000"
app:icv_et_width="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView4" />
<com.tuo.customview.VerificationCodeView
android:id="@+id/icv"
android:layout_width="wrap_content"
android:layout_height="@dimen/sp_32"
android:layout_centerHorizontal="true"
app:icv_et_bg_focus="@color/transparent"
app:icv_et_bg_normal="@color/transparent"
app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
app:icv_et_number="6"
app:icv_et_pwd="true"
app:icv_et_pwd_radius="@dimen/dp_4"
app:icv_et_text_color="@color/transparent"
app:icv_et_width="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/icv"
app:layout_constraintStart_toStartOf="@+id/icv"
app:layout_constraintTop_toBottomOf="@+id/icv" />
<TextView
android:id="@+id/tv_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="@+id/icv"
app:layout_constraintStart_toStartOf="@+id/icv"
app:layout_constraintTop_toBottomOf="@+id/icv" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_48"
android:layout_marginEnd="@dimen/dp_48"
android:gravity="center"
android:maxLines="2"
android:minLines="2"
android:text="退出系统"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_keyboard"
@@ -73,7 +84,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_hint">
app:layout_constraintTop_toBottomOf="@+id/imageView5"
app:layout_constraintVertical_bias="0.796">
<LinearLayout
android:layout_width="match_parent"
@@ -81,35 +93,35 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="1"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="2"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="3"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
@@ -118,35 +130,35 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_4"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="4"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="5"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="6"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
@@ -155,35 +167,35 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_7"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="7"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_8"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="8"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_9"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="9"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
@@ -192,34 +204,34 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_0"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="0"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_del"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="清除"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<Button
<TextView
android:id="@+id/bt_confirm"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="确认"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</LinearLayout>

210
app/src/main/res/layout-port/activity_screen_lock.xml
View File

@@ -1,79 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/float_window_color">
android:background="@drawable/control_background">
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退出系统"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold"
<ImageView
android:id="@+id/imageView5"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_lock"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.219" />
app:layout_constraintVertical_bias="0.11" />
<TextView
android:id="@+id/textView4"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_40"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView" />
app:layout_constraintBottom_toTopOf="@+id/ll_keyboard"
app:layout_constraintTop_toBottomOf="@+id/imageView5"
app:layout_constraintVertical_bias="0.347"
tools:layout_editor_absoluteX="0dp">
<com.tuo.customview.VerificationCodeView
android:id="@+id/icv"
android:layout_width="wrap_content"
android:layout_height="@dimen/sp_32"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_16"
app:icv_et_bg_focus="@drawable/shape_icv_et_bg_focus1"
app:icv_et_bg_normal="@drawable/shape_icv_et_bg_normal1"
app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
app:icv_et_number="6"
app:icv_et_pwd_radius="10dp"
app:icv_et_text_color="#000000"
app:icv_et_width="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView4" />
<com.tuo.customview.VerificationCodeView
android:id="@+id/icv"
android:layout_width="wrap_content"
android:layout_height="@dimen/sp_32"
android:layout_centerHorizontal="true"
app:icv_et_bg_focus="@color/transparent"
app:icv_et_bg_normal="@color/transparent"
app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
app:icv_et_number="6"
app:icv_et_pwd="true"
app:icv_et_pwd_radius="@dimen/dp_4"
app:icv_et_text_color="@color/transparent"
app:icv_et_width="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/icv"
app:layout_constraintStart_toStartOf="@+id/icv"
app:layout_constraintTop_toBottomOf="@+id/icv" />
<TextView
android:id="@+id/tv_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="@+id/icv"
app:layout_constraintStart_toStartOf="@+id/icv"
app:layout_constraintTop_toBottomOf="@+id/icv" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_48"
android:layout_marginEnd="@dimen/dp_48"
android:gravity="center"
android:maxLines="2"
android:minLines="2"
android:text="退出系统"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_keyboard"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_200"
android:layout_marginBottom="@dimen/dp_32"
android:layout_height="@dimen/dp_160"
android:orientation="vertical"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView5"
app:layout_constraintVertical_bias="0.796">
<LinearLayout
android:layout_width="match_parent"
@@ -81,35 +93,35 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="1"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="2"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="3"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
@@ -118,35 +130,35 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_4"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="4"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="5"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="6"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
@@ -155,35 +167,35 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_7"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="7"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_8"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="8"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_9"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="9"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
@@ -192,34 +204,34 @@
android:layout_weight="1"
android:orientation="horizontal">
<Button
<TextView
android:id="@+id/bt_0"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="0"
android:textSize="@dimen/sp_14" />
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<Button
<TextView
android:id="@+id/bt_del"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="清除"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<Button
<TextView
android:id="@+id/bt_confirm"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/shape_bt_bg"
android:gravity="center"
android:text="确认"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</LinearLayout>

BIN
app/src/main/res/raw/click.mp3 Normal file
View File

Binary file not shown.

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

@@ -1,7 +1,5 @@
<resources>
<!-- <string name="app_name">教育中心</string>-->
<!-- <string name="app_name">智慧课堂</string>-->
<string name="app_name">学习课堂</string>
<string name="privacy_agreement"><u>隐私协议</u></string>
<string name="privacy_agreement_title">服务协议和隐私政策</string>
<string name="privacy_agreement_content">\t\t\t\t请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了向你提供即时通讯，内容分享等服务，