diff --git a/app/build.gradle b/app/build.gradle index 0000a81..1984983 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 100 - versionName "2.0.9" + versionCode 101 + versionName "2.1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java b/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java index 15f6852..d66047b 100644 --- a/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java +++ b/app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java @@ -22,6 +22,7 @@ import com.uiui.zyos.R; import com.uiui.zyos.activity.ExitActivity; import com.uiui.zyos.activity.edit.EditActivity; import com.uiui.zyos.activity.permission.PermissionActivity; +import com.uiui.zyos.activity.service.ServiceActivity; import com.uiui.zyos.activity.update.UpdateActivity; import com.uiui.zyos.base.mvvm.BaseMvvmActivity; import com.uiui.zyos.bean.AppUpdateInfo; @@ -282,6 +283,10 @@ public class UserActivity extends BaseMvvmActivity + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_service.xml b/app/src/main/res/layout/activity_service.xml index 705c0fc..fb77096 100644 --- a/app/src/main/res/layout/activity_service.xml +++ b/app/src/main/res/layout/activity_service.xml @@ -14,8 +14,8 @@ @@ -169,7 +169,7 @@ + + @@ -256,6 +270,7 @@ android:text="版本" android:textColor="@color/title_gray" android:textSize="@dimen/sp_9" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml index b615a61..8ff0367 100644 --- a/app/src/main/res/layout/fragment_device.xml +++ b/app/src/main/res/layout/fragment_device.xml @@ -165,7 +165,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/iv3" app:layout_constraintTop_toTopOf="parent" - tools:text="MAC" /> + tools:text="sn" /> + android:onClick="@{click::checkPermission}"> @@ -229,13 +230,13 @@ android:ellipsize="end" android:maxLength="30" android:singleLine="true" + android:text="设置" android:textColor="@color/black" android:textSize="@dimen/sp_10" - android:visibility="gone" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/iv4" - app:layout_constraintTop_toTopOf="parent" - tools:text="问题反馈" /> + app:layout_constraintTop_toTopOf="parent" /> - 关爱守护 + 学习精灵 隐私协议 服务协议和隐私政策 \t\t\t\t请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了向你提供即时通讯,内容分享等服务,