version:2.1.0

bugfixes:
update:默认头像优化，信息显示优化

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

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<UserViewModel, ActivityUserBi
             startActivity(new Intent(UserActivity.this, PermissionActivity.class));
         }
 
+        public void openService(View view) {
+            startActivity(new Intent(UserActivity.this, ServiceActivity.class));
+        }
+
         public void exitDesktop(View view) {
             Intent intent = new Intent("Receiver_Refresh_Password_Action");
             intent.setPackage("com.uiui.zy");
@@ -295,4 +300,6 @@ public class UserActivity extends BaseMvvmActivity<UserViewModel, ActivityUserBi
             }
         }
     }
+
+
 }

app/src/main/java/com/uiui/zyos/fragment/usercenter/device/DeviceFragment.java

@@ -6,8 +6,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 
+import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.R;
+import com.uiui.zyos.activity.permission.PermissionActivity;
 import com.uiui.zyos.activity.service.ServiceActivity;
+import com.uiui.zyos.activity.user.UserActivity;
 import com.uiui.zyos.base.mvvm.fragment.BaseMvvmFragment;
 import com.uiui.zyos.databinding.FragmentDeviceBinding;
 import com.uiui.zyos.manager.RemoteManager;
@@ -38,7 +41,7 @@ public class DeviceFragment extends BaseMvvmFragment<DeviceViewModel, FragmentDe
     @Override
     protected void initView(Bundle bundle) {
         mViewDataBinding.tvModel.setText(Build.MODEL);
-        mViewDataBinding.tvVersion.setText(Utils.getCustomVersion());
+        mViewDataBinding.tvVersion.setText(BuildConfig.VERSION_NAME);
         mViewDataBinding.tvMac.setText(RemoteManager.getInstance().getSerial());
     }
 
@@ -57,5 +60,9 @@ public class DeviceFragment extends BaseMvvmFragment<DeviceViewModel, FragmentDe
         public void openService(View view) {
             startActivity(new Intent(mContext, ServiceActivity.class));
         }
+
+        public void checkPermission(View view) {
+            startActivity(new Intent(mContext, PermissionActivity.class));
+        }
     }
 }

app/src/main/res/drawable/ic_wechat_logo.xml

@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="216.32812dp"
+    android:height="60dp"
+    android:viewportWidth="3692"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M876.09,737.47a11.79,11.79 0,0 0,2.48 2.29,151.55 151.55,0 0,1 45.03,80.98 49.1,49.1 0,0 0,1.65 9.99,49.1 49.1,0 0,0 12.69,21.86c19.26,19.25 50.47,19.25 69.73,0 19.26,-19.26 19.26,-50.48 0,-69.73a49.08,49.08 0,0 0,-29.69 -14.16,151.55 151.55,0 0,1 -84.37,-46.97h-0.01a11.79,11.79 0,0 0,-17.51 15.75"
+      android:fillColor="#FB6500"/>
+  <path
+      android:pathData="M1031.99,775.35a11.79,11.79 0,0 0,2.29 -2.48,151.55 151.55,0 0,1 80.98,-45.03 49.1,49.1 0,0 0,9.99 -1.65,49.1 49.1,0 0,0 21.85,-12.69c19.25,-19.26 19.25,-50.47 0,-69.73 -19.26,-19.26 -50.47,-19.26 -69.73,0a49.08,49.08 0,0 0,-14.17 29.69,151.55 151.55,0 0,1 -46.97,84.37l0,0.01a11.79,11.79 0,0 0,15.75 17.51"
+      android:fillColor="#0082EF"/>
+  <path
+      android:pathData="M1069.87,619.46a11.79,11.79 0,0 0,-2.48 -2.29,151.55 151.55,0 0,1 -45.03,-80.98 49.1,49.1 0,0 0,-1.65 -9.99,49.1 49.1,0 0,0 -12.69,-21.85c-19.26,-19.25 -50.48,-19.25 -69.73,0 -19.25,19.26 -19.25,50.47 0,69.73a49.08,49.08 0,0 0,29.7 14.17,151.55 151.55,0 0,1 84.37,46.97l0.01,-0a11.79,11.79 0,0 0,17.5 -15.75"
+      android:fillColor="#2DBC00"/>
+  <path
+      android:pathData="M913.97,581.57a11.79,11.79 0,0 0,-2.29 2.48,151.55 151.55,0 0,1 -80.98,45.03 49.1,49.1 0,0 0,-9.99 1.65,49.1 49.1,0 0,0 -21.86,12.69c-19.25,19.26 -19.25,50.48 0,69.73 19.26,19.25 50.48,19.25 69.73,0a49.08,49.08 0,0 0,14.16 -29.7,151.55 151.55,0 0,1 46.97,-84.37v-0.01a11.79,11.79 0,0 0,-15.75 -17.5"
+      android:fillColor="#FFCC00"/>
+  <path
+      android:pathData="M987.29,340.66c-13.72,-28.18 -32.14,-54.34 -54.77,-77.75 -57.17,-59.13 -137.22,-97.22 -225.38,-107.24A415.09,415.09 0,0 0,660.51 152.96c-14.4,0 -29.42,0.84 -44.64,2.49 -88.56,9.63 -169.05,47.52 -226.64,106.69 -22.73,23.35 -41.26,49.45 -55.07,77.55C315.42,377.84 305.93,418.32 305.93,460.04c0,53.69 16.34,106.63 47.25,153.11 17.48,26.28 47.38,60.25 72.96,81.07l-14.17,58.61 -4.08,16.51c-0.72,1.62 -1.27,3.32 -1.67,5.1 -0.24,1.07 -0.31,2.21 -0.42,3.34 -0.08,0.85 -0.25,1.68 -0.25,2.56a27.29,27.29 0,0 0,27.29 27.29c4.93,0 9.48,-1.4 13.47,-3.69 0.13,-0.07 0.26,-0.14 0.38,-0.21 0.58,-0.34 1.18,-0.65 1.73,-1.03l101.21,-50.8c21.78,6.25 43.4,10.25 66.19,12.76 14.81,1.63 29.85,2.46 44.69,2.46 15.13,0 30.82,-0.91 46.63,-2.71a396.72,396.72 0,0 0,89.36 -20.88,49.14 49.14,0 0,1 -9,-4.02c-17.36,-9.93 -26.35,-28.82 -24.56,-47.52a333.39,333.39 0,0 1,-63.35 13.55,346.92 346.92,0 0,1 -39.07,2.28c-12.42,0 -25.01,-0.69 -37.4,-2.06 -2.59,-0.28 -5.16,-0.68 -7.74,-1.02 -17.04,-2.27 -33.87,-5.74 -50.14,-10.51a34.23,34.23 0,0 0,-10.42 -1.59c-5.61,0 -11.06,1.49 -16.57,4.35 -0.72,0.37 -1.43,0.68 -2.15,1.1l-64.94,38.27 -0.07,0.04c-1.35,0.78 -2.11,1.07 -2.8,1.07 -2.28,0 -4.13,-1.93 -4.13,-4.3l2.4,-9.7 2.76,-10.54 9.6,-36.58c0.62,-2.24 1.26,-4.94 1.26,-7.96a26.17,26.17 0,0 0,-10.66 -21.11,275.49 275.49,0 0,1 -26.02,-21.85c-14.09,-13.37 -26.47,-27.97 -36.87,-43.6 -24.48,-36.8 -37.42,-78.56 -37.42,-120.78 0,-32.76 7.49,-64.62 22.26,-94.68 11.03,-22.46 25.9,-43.37 44.18,-62.16 47.34,-48.64 113.91,-79.83 187.46,-87.83a347.37,347.37 0,0 1,37.41 -2.1c12.62,0 25.77,0.76 39.07,2.28 73.2,8.33 139.39,39.67 186.38,88.27 18.19,18.83 32.98,39.79 43.93,62.3 14.53,29.87 21.9,61.47 21.9,93.92 0,3.37 -0.21,6.73 -0.38,10.1 18.99,-11.62 44.08,-9.34 60.52,7.1 0.83,0.83 1.53,1.74 2.29,2.61 0.54,-6.91 0.85,-13.85 0.85,-20.8 0,-41.32 -9.35,-81.48 -27.79,-119.37"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M1560.45,539.13h143.33v-50.15h-143.33V370.85H1508.21v283.54h-86.9v-207.94h-51.19v207.94h-79.29v50.65h450.77v-50.65h-181.15z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M1538.17,234.51c65.77,72.5 142.44,130.27 227.85,171.68l6.68,3.23 -27.41,48.5 -5.94,-3.06c-84.21,-43.11 -158.17,-100.75 -219.91,-171.37 -56.43,66.03 -131.12,123.83 -222.08,171.88l-6.04,3.19 -26.73,-48.56 6.46,-3.25c90.64,-45.31 167.86,-103.24 229.49,-172.19l2.07,-2.32h33.5l2.07,2.28zM2144.85,235.9h-52.24v417.44h-60.65V235.9h-52.24v417.44h-156.47v50.67h479.12v-50.67h-157.52z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M1907.43,591.98l1.57,6.99 48.18,-12.41 -1.53,-6.63c-21.22,-90.54 -46.05,-172.99 -73.8,-245.06l-2.37,-6.17 -45.14,14.79 2.46,6.75c28.13,77.13 51.9,158.47 70.63,241.73M2208.25,590.76c31.82,-68.33 58.66,-149.53 79.75,-241.32l1.5,-6.47 -46.99,-13.21 -1.64,7.08c-22.26,94.78 -48.95,174.13 -79.29,235.85l-3.45,7.02 47.46,16.78 2.67,-5.74zM2773.82,362.7c-1.69,55.52 -8.11,105.71 -19.11,149.51 -10.64,-34.91 -19.72,-74.97 -27.03,-119.35 2,-7.44 3.79,-15.1 5.82,-23.73l1.51,-6.42h38.8zM2781.17,582.89c23.37,-60.39 36.53,-134.45 39.13,-220.19h21.18L2841.48,313.61h-96.91c4.51,-26.88 7.85,-49.1 10.75,-71.43l0.85,-6.59 -46.96,-8.21 -0.79,7.41c-8.74,83.73 -24.02,154.75 -45.46,211.56v-17.21h-177.73v47.5h165.09c-1.22,2.66 -2.46,5.28 -3.72,7.86l-1.92,3.95 30.4,38 4.93,-9.42a560.68,560.68 0,0 0,21.77 -46.42c8.86,39.74 19.18,75.86 30.76,107.56 -18.19,41.5 -43.15,75.99 -74.23,102.56l-4.58,3.91 27.56,43.52 6.12,-5.46c27.26,-24.34 50.61,-53.69 69.5,-87.36 16.83,34.53 36.86,63.28 59.63,85.56l5.97,5.84 29.54,-43.95 -4.46,-4.05c-25.39,-22.9 -47.73,-55.15 -66.42,-95.86zM2369.69,409.3c50.49,-44.12 87.69,-95.36 110.57,-152.3l2.46,-6.1 -45.29,-21.19 -2.67,7c-17.7,46.54 -46.62,88.77 -85.95,125.51l-3.18,2.99 16.05,51.07 8.02,-6.99z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M2668.21,259.02h-44.89v90.83h-22.85V230.65h-45.93v119.19h-22.85V259.02H2486.28v137.29h181.93zM2484.62,391.63l-44.17,-21.37 -2.6,7.3c-18.09,50.65 -46.56,94.44 -87.04,133.88l-3.05,2.96 15.47,50.78 8.12,-7.39c13.17,-11.97 24.9,-23.72 35.63,-35.69v205h49.08v-272.87c9.92,-17.09 18.79,-36.16 26.34,-56.68l2.2,-5.93z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M2694.13,622.55l2.61,-2.76 -11.72,-47.69 -8.73,8.71a1049.89,1049.89 0,0 1,-33.81 32.31V504.22h-138.35v64.64c-0.51,51.44 -14.14,91.16 -40.54,118.06l-5.19,5.27 38.35,33.29 4.57,-4.66c33.35,-33.88 50.81,-84.96 51.88,-151.89v-16.67h41.75l0.04,105.21 28.41,27.11 2.87,-2.07c23.41,-16.92 46.25,-37.1 67.85,-59.96M3044.08,245.4l-48.06,-22.22 -2.24,7.78c-23.43,81.22 -60.8,153.89 -111.08,215.97l-2.32,2.85 16.66,55.83 8.3,-9.22c13.55,-15.07 26.93,-31.64 39.86,-49.39v276.9h51.18V364.78c18.08,-35.33 33.09,-72.48 45.9,-113.57l1.79,-5.81z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M3237.5,299.97l-0.97,-2.56c-6.62,-20.45 -15.14,-41.5 -26.06,-64.37L3207.97,227.78 3157.8,241.6l4.02,7.65a519.13,519.13 0,0 1,23.33 50.73H3026.6v49.6h355.72V299.97H3237.5z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M3064.93,428.1h281.69V380.05h-281.69z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M3064.93,504.05h281.69V455.48h-281.69z"
+      android:fillColor="#0079DE"/>
+  <path
+      android:pathData="M3346.61,535.17v187.33h-281.69v-187.33h281.69zM3295.96,584.27h-180.37v88.48h180.37v-88.48z"
+      android:fillColor="#0079DE"/>
+</vector>

app/src/main/res/layout/activity_service.xml

@@ -14,8 +14,8 @@
 
         <ImageView
             android:id="@+id/iv_qrcode"
-            android:layout_width="@dimen/dp_200"
-            android:layout_height="@dimen/dp_314"
+            android:layout_width="@dimen/dp_159"
+            android:layout_height="@dimen/dp_250"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
             android:src="@drawable/wechat_service"

app/src/main/res/layout/activity_user.xml

@@ -67,7 +67,7 @@
                 android:text="退出桌面"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_10"
-                android:visibility="gone"
+                android:visibility="visible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -169,7 +169,7 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
-                        app:layout_constraintBottom_toTopOf="@+id/tv_permission"
+                        app:layout_constraintBottom_toTopOf="@+id/imageView26"
                         app:layout_constraintTop_toBottomOf="@+id/cl_avatar">
 
                         <RadioGroup
@@ -229,6 +229,19 @@
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
+                    <ImageView
+                        android:id="@+id/imageView26"
+                        android:layout_width="@dimen/dp_72"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_marginBottom="@dimen/dp_4"
+                        android:adjustViewBounds="true"
+                        android:onClick="@{click::openService}"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/ic_wechat_logo"
+                        app:layout_constraintBottom_toTopOf="@+id/tv_permission"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent" />
+
                     <TextView
                         android:id="@+id/tv_permission"
                         android:layout_width="wrap_content"
@@ -240,6 +253,7 @@
                         android:text="权限设置"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_10"
+                        android:visibility="gone"
                         app:layout_constraintBottom_toTopOf="@+id/tv_version"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent" />
@@ -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" />

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" />
 
                     <ImageView
                         android:id="@+id/iv3"
@@ -197,13 +197,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:onClick="@{click::openService}">
+                    android:onClick="@{click::checkPermission}">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_16"
-                        android:text="问题反馈"
+                        android:text="权限检查"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_10"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -217,6 +217,7 @@
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/wechat_service_qrcode"
+                        android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/iv4"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -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" />
 
                     <ImageView
                         android:id="@+id/iv4"

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <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请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了向你提供即时通讯，内容分享等服务，