diff --git a/app/build.gradle b/app/build.gradle index 62e530b..e13b0c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 67 - versionName "1.7.5" + versionCode 68 + versionName "1.7.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java index 4559ba2..f39b82b 100644 --- a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java +++ b/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 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)); diff --git a/app/src/main/res/drawable-hdpi/icon_device_bind.png b/app/src/main/res/drawable-hdpi/icon_device_bind.png new file mode 100644 index 0000000..2c5e89e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_device_bind.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_device_unbind.png b/app/src/main/res/drawable-hdpi/icon_device_unbind.png new file mode 100644 index 0000000..1e79e1a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_device_unbind.png differ diff --git a/app/src/main/res/layout-land/fragment_user.xml b/app/src/main/res/layout-land/fragment_user.xml index d1c594b..bedc29f 100644 --- a/app/src/main/res/layout-land/fragment_user.xml +++ b/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 @@ + + + + + + + + + + + + + + + +