version:1.7.6

fix:
update:增加绑定状态

app/build.gradle

@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 67
+        versionCode 68
-        versionName "1.7.5"
+        versionName "1.7.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java

@@ -103,6 +103,10 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
     ImageView iv_nodata;
     @BindView(R.id.tv_activation)
     TextView tv_activation;
+    @BindView(R.id.cl_bind_statu)
+    ConstraintLayout cl_bind_statu;
+    @BindView(R.id.iv_bind)
+    ImageView iv_bind;
 
     private AppAdapter mAppAdapter;
 
@@ -263,6 +267,12 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
                 startActivity(new Intent(mContext, MoreAppActivity.class));
             }
         });
+        cl_bind_statu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity");
+            }
+        });
 
         rv_app.setLayoutManager(new GridLayoutManager(mContext, 4));
         HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
@@ -392,6 +402,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
 
                     cl_nodata.setVisibility(View.GONE);
                     cl_usedata.setVisibility(View.VISIBLE);
+                    iv_bind.setImageDrawable(mContext.getDrawable(R.drawable.icon_device_bind));
                     break;
                 case 300: //设备没有绑定
                 case 400://没有授权的设备
@@ -401,6 +412,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
                     tv_grade.setText(getString(R.string.notset));
                     cl_nodata.setVisibility(View.VISIBLE);
                     cl_usedata.setVisibility(View.GONE);
+                    iv_bind.setImageDrawable(mContext.getDrawable(R.drawable.icon_device_unbind));
                     break;
 //                    ToastUtil.show(getString(R.string.device_unauthorized));
 //                    Log.e(TAG, "setSnInfo: " + getString(R.string.device_unauthorized));

app/src/main/res/layout-land/fragment_user.xml

@@ -86,7 +86,7 @@
                 android:id="@+id/iv_speaker"
                 android:layout_width="@dimen/dp_16"
                 android:layout_height="@dimen/dp_16"
-                android:layout_marginStart="@dimen/dp_36"
+                android:layout_marginStart="@dimen/dp_12"
                 android:src="@drawable/user_speaker"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/tv_exit"
@@ -94,10 +94,9 @@
 
             <TextView
                 android:id="@+id/tv_notification"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_4"
-                android:layout_marginEnd="@dimen/dp_32"
                 android:ellipsize="marquee"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -107,10 +106,44 @@
                 android:textColor="@color/lightGray"
                 android:textSize="@dimen/sp_8"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/iv_speaker"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_bind_statu"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/tv_notification"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/imageView15"
+                    android:layout_width="@dimen/dp_20"
+                    android:layout_height="@dimen/dp_20"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/com_uiui_sn"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/iv_bind"
+                    android:layout_width="@dimen/dp_50"
+                    android:layout_height="@dimen/dp_16"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/icon_device_unbind"
+                    app:layout_constraintBottom_toBottomOf="@+id/imageView15"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/imageView15"
+                    app:layout_constraintTop_toTopOf="@+id/imageView15" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout-sw800dp/fragment_user.xml

@@ -86,7 +86,7 @@
                 android:id="@+id/iv_speaker"
                 android:layout_width="@dimen/dp_16"
                 android:layout_height="@dimen/dp_16"
-                android:layout_marginStart="@dimen/dp_36"
+                android:layout_marginStart="@dimen/dp_24"
                 android:src="@drawable/user_speaker"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/tv_exit"
@@ -94,7 +94,7 @@
 
             <TextView
                 android:id="@+id/tv_notification"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_4"
                 android:ellipsize="marquee"
@@ -106,10 +106,45 @@
                 android:textColor="@color/lightGray"
                 android:textSize="@dimen/sp_8"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/iv_speaker"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_bind_statu"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:onClick="@{click.onClick}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/tv_notification"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/imageView15"
+                    android:layout_width="@dimen/dp_20"
+                    android:layout_height="@dimen/dp_20"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/com_uiui_sn"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/iv_bind"
+                    android:layout_width="@dimen/dp_50"
+                    android:layout_height="@dimen/dp_16"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/icon_device_unbind"
+                    app:layout_constraintBottom_toBottomOf="@+id/imageView15"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/imageView15"
+                    app:layout_constraintTop_toTopOf="@+id/imageView15" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout