tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.4.0521 优化开机动画 控制主页控件显示

Browse Source
This commit is contained in:
Fanhuitong
2024-05-25 09:47:05 +08:00
parent 367832516f
commit 2f8a9e6f07
31 changed files with 1029 additions and 1873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app/src/main/res/layout-port/activity_main.xml
View File

@@ -9,6 +9,18 @@
<variable
name="click"
type="com.aoleyun.sn.activity.main.MainActivity.BtnClick" />
<variable
name="studentsInfo"
type="com.aoleyun.sn.bean.StudentsInfo" />
<variable
name="appSettings"
type="com.aoleyun.sn.bean.AppSettings" />
<import type="android.text.TextUtils" />
<import type="android.view.View" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -71,6 +83,7 @@
android:text="日志上传"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
android:visibility="@{appSettings==null||appSettings.logs_control==0?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -142,13 +155,13 @@
android:id="@+id/tv_activation_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="激活时间"
android:textColor="@color/text_gray"
android:textSize="@dimen/sp_9"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_name" />
app:layout_constraintTop_toBottomOf="@+id/tv_name"
tools:text="激活时间" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -167,20 +180,22 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_weight="1"
android:visibility="@{appSettings==null||appSettings.custom_batch_control==0?View.GONE:View.VISIBLE}">
<TextView
android:id="@+id/textView11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:text="设备批次"
android:text="@{appSettings==null||TextUtils.isEmpty(appSettings.custom_batch_name)?`设备批次`:appSettings.custom_batch_name }"
android:textColor="@color/black"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/dp_16" />
app:layout_goneMarginStart="@dimen/dp_16"
tools:text="设备批次" />
<TextView
android:id="@+id/tv_batch"
@@ -190,12 +205,13 @@
android:ellipsize="end"
android:maxLength="30"
android:singleLine="true"
android:text="@string/unknown"
android:text="@{studentsInfo==null||TextUtils.isEmpty(studentsInfo.batch)?@string/unknown:studentsInfo.batch }"
android:textColor="@color/text_gray"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/unknown" />
<View
android:layout_width="0dp"
@@ -203,28 +219,32 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@color/text_gray"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_number"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_weight="1"
android:visibility="@{appSettings==null||appSettings.custom_number_control==0?View.GONE:View.VISIBLE}">
<TextView
android:id="@+id/textView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:text="设备学号"
android:text="@{appSettings==null||TextUtils.isEmpty(appSettings.custom_number_name)?`设备学号`:appSettings.custom_number_name }"
android:textColor="@color/black"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/dp_16" />
app:layout_goneMarginStart="@dimen/dp_16"
tools:text="设备学号" />
<TextView
android:id="@+id/tv_number"
@@ -247,28 +267,31 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@color/text_gray"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_class"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_weight="1"
android:visibility="@{appSettings==null||appSettings.custom_class_control==0?View.GONE:View.VISIBLE}">
<TextView
android:id="@+id/textView9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:text="设备班级"
android:text="@{appSettings==null||TextUtils.isEmpty(appSettings.custom_class_name)?`设备学号`:appSettings.custom_class_name }"
android:textColor="@color/black"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/dp_16" />
app:layout_goneMarginStart="@dimen/dp_16"
tools:text="设备班级" />
<TextView
android:id="@+id/tv_class"
@@ -285,6 +308,15 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="0dp"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@color/text_gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
@@ -301,6 +333,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:layout_weight="4"
android:background="@drawable/card_background">
@@ -561,11 +594,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bindinfo"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:layout_weight="4"
android:background="@drawable/card_background">
android:background="@drawable/card_background"
android:visibility="gone">
<TextView
android:id="@+id/tv_bind_statu"
@@ -611,6 +648,8 @@
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/aoleyun_qrcode"
app:error="@{@drawable/aoleyun_qrcode}"
app:imageUrl="@{appSettings.mini_qrcode}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />