From 53eddf92156a33af346b4a9e0ddda191d9e88b89 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Tue, 2 Apr 2024 16:21:31 +0800 Subject: [PATCH] =?UTF-8?q?version:1.7.6=20fix:=20update:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BB=91=E5=AE=9A=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../uiui/zyos/fragment/user/UserFragment.java | 12 +++++ .../res/drawable-hdpi/icon_device_bind.png | Bin 0 -> 3780 bytes .../res/drawable-hdpi/icon_device_unbind.png | Bin 0 -> 3869 bytes .../main/res/layout-land/fragment_user.xml | 41 ++++++++++++++++-- .../main/res/layout-sw800dp/fragment_user.xml | 41 ++++++++++++++++-- 6 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/icon_device_bind.png create mode 100644 app/src/main/res/drawable-hdpi/icon_device_unbind.png 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 0000000000000000000000000000000000000000..2c5e89e4eaec12c0bb5fa1cfb864a38dedcf2e08 GIT binary patch literal 3780 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 + + + + + + + + + + + + + + + +