From 26075a148615a621384edccf7682d90f55115548 Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Fri, 19 Aug 2022 10:17:45 +0800 Subject: [PATCH] =?UTF-8?q?version:=20fix:=20update:=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 + .../sn/activity/main/MainAContact.java | 5 + .../sn/activity/main/MainAPresenter.java | 12 + .../sn/activity/main/MainActivity.java | 28 +- .../com/aoleyun/sn/comm/CommonConfig.java | 2 + .../com/aoleyun/sn/utils/AES/CXAESUtil.java | 19 +- .../main/java/com/aoleyun/sn/utils/Utils.java | 16 +- app/src/main/res/drawable-hdpi/head.png | Bin 4371 -> 4950 bytes .../{background.xml => background_main.xml} | 0 .../main/res/layout-port/activity_main.xml | 507 +++++++++--------- app/src/main/res/values/styles.xml | 2 +- 11 files changed, 316 insertions(+), 276 deletions(-) rename app/src/main/res/drawable/{background.xml => background_main.xml} (100%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4683f4..fb1e616 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -171,6 +171,7 @@ diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java index 95af7eb..f894ccb 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java @@ -1,5 +1,6 @@ package com.aoleyun.sn.activity.main; +import android.graphics.Bitmap; import android.view.View; import com.aoleyun.sn.base.BasePresenter; @@ -11,6 +12,8 @@ public class MainAContact { public interface Presenter extends BasePresenter { /*获取设备锁定状态*/ void getLockedState(); + /*获取设备二维码*/ + void getQRCode(boolean loocked); /*获取学生信息*/ void getStudesInfo(boolean refresh); /*手动获取设备信息更新*/ @@ -20,6 +23,8 @@ public class MainAContact { public interface MainView extends BaseView { /*获取设备锁定状态*/ void setLockedState(boolean loocked); + /*获取设备二维码*/ + void setQRCode(Bitmap qrcode); /*获取学生信息*/ void setStudesInfo(StudentsInfo studesInfo); /*手动获取设备信息更新*/ diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java index 669568c..44018d8 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java @@ -3,6 +3,7 @@ package com.aoleyun.sn.activity.main; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.graphics.Bitmap; import android.provider.Settings; import android.util.Log; import android.view.View; @@ -11,9 +12,12 @@ import com.aoleyun.sn.BuildConfig; import com.aoleyun.sn.bean.AppUpdateInfo; import com.aoleyun.sn.bean.BaseResponse; import com.aoleyun.sn.bean.StudentsInfo; +import com.aoleyun.sn.comm.CommonConfig; import com.aoleyun.sn.comm.JGYActions; import com.aoleyun.sn.network.NetInterfaceManager; +import com.aoleyun.sn.utils.AES.CXAESUtil; import com.aoleyun.sn.utils.JGYUtils; +import com.aoleyun.sn.utils.Utils; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -79,6 +83,14 @@ public class MainAPresenter implements MainAContact.Presenter { }); } + @Override + public void getQRCode(boolean loocked) { + String encryptString = CXAESUtil.encrypt(CommonConfig.AES_KEY, Utils.getSerial()); + Log.e("getQRCode", "setImageAndText: " + encryptString); + Bitmap bitmap = Utils.createQRImage(encryptString, 400, 400); + mView.setQRCode(bitmap); + } + /** * 通过sn获取用户信息 */ diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java index 751f718..c70af34 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java @@ -9,6 +9,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; +import android.graphics.Bitmap; import android.os.IBinder; import android.os.SystemClock; import android.provider.Settings; @@ -79,10 +80,12 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, TextView tv_number; @BindView(R.id.tv_name) TextView tv_name; + @BindView(R.id.tv_wifi) + TextView tv_wifi; @BindView(R.id.chkupd) Button bt_checkupdate; - @BindView(R.id.checkupdate) - ConstraintLayout checkupdate; + // @BindView(R.id.checkupdate) +// ConstraintLayout checkupdate; @BindView(R.id.iv_back) ImageView back; @BindView(R.id.iv_locked) @@ -97,6 +100,8 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, ConstraintLayout cl_imei; @BindView(R.id.tv_customversion) TextView tv_customversion; + @BindView(R.id.iv_qrcode) + ImageView iv_qrcode; @OnClick({R.id.iv_back, R.id.tv_title, R.id.chkupd}) public void onClick(View view) { @@ -155,6 +160,11 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, mMainAPresenter.setLifecycle(lifecycleSubject); JGYUtils.startServices(MainActivity.this); getDevicesInfo(); + if (Utils.isWifiAvailable(MainActivity.this)) { + tv_wifi.setText(Utils.obtainWifiInfo(MainActivity.this) + "dbm"); + }else { + tv_wifi.setText("未连接"); + } setStoreUpdateListener(bt_checkupdate); } @@ -305,6 +315,12 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, setBatchText("", View.GONE); SysSettingUtils.setEnableSetting(this); } + mMainAPresenter.getQRCode(loocked); + } + + @Override + public void setQRCode(Bitmap qrcode) { + iv_qrcode.setImageBitmap(qrcode); } @Override @@ -361,22 +377,22 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, public void setBatchText(String text, int visibility) { tv_batch.setText(text); - tv_batch.setVisibility(visibility); +// tv_batch.setVisibility(visibility); } public void setClassText(String text, int visibility) { tv_class.setText(text); - layout_class.setVisibility(visibility); +// layout_class.setVisibility(visibility); } public void setNumberText(String text, int visibility) { tv_number.setText(text); - layout_number.setVisibility(visibility); +// layout_number.setVisibility(visibility); } public void setNameText(String text, int visibility) { tv_name.setText(text); - layout_name.setVisibility(visibility); +// layout_name.setVisibility(visibility); } public void setHead(String url) { diff --git a/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java b/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java index 05f984e..6e465f0 100644 --- a/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java +++ b/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java @@ -2,6 +2,8 @@ package com.aoleyun.sn.comm; public class CommonConfig { + public static String AES_KEY = "0123456789ABCDEF"; + /*爱华解锁标识*/ public final static String AIHUA_UNLOCK = "Aihua_unlock_state"; diff --git a/app/src/main/java/com/aoleyun/sn/utils/AES/CXAESUtil.java b/app/src/main/java/com/aoleyun/sn/utils/AES/CXAESUtil.java index 56e6559..7b58684 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/AES/CXAESUtil.java +++ b/app/src/main/java/com/aoleyun/sn/utils/AES/CXAESUtil.java @@ -30,19 +30,22 @@ public class CXAESUtil { /** * 加密 * - * @param key - * 密钥 - * @param src - * 加密文本 + * @param key 密钥 + * @param src 加密文本 * @return * @throws Exception */ - public static String encrypt(String key, String src) throws Exception { + public static String encrypt(String key, String src) { // /src = Base64.encodeToString(src.getBytes(), Base64.DEFAULT); byte[] rawKey = toMakekey(key, keyLenght, defaultV).getBytes();// key.getBytes(); - byte[] result = encrypt(rawKey, src.getBytes("utf-8")); - // result = Base64.encode(result, Base64.DEFAULT); - return toHex(result); + try { + byte[] result = encrypt(rawKey, src.getBytes("utf-8")); + // result = Base64.encode(result, Base64.DEFAULT); + return toHex(result); + } catch (Exception e) { + e.printStackTrace(); + return ""; + } } /** diff --git a/app/src/main/java/com/aoleyun/sn/utils/Utils.java b/app/src/main/java/com/aoleyun/sn/utils/Utils.java index 75ca35a..3d3d3c0 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/Utils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/Utils.java @@ -1475,6 +1475,7 @@ public class Utils { /** * 获取电池容量 + * * @param context * @return */ @@ -1690,6 +1691,7 @@ public class Utils { /** * 获取自定义版本号 或者版本号 + * * @return */ public static String getCustomVersion() { @@ -1706,12 +1708,13 @@ public class Utils { /** * 获取系统版本号 + * * @return */ public static String getRomVersion() { if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform) { return getProperty("ro.build.id", "获取失败"); - }else if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.CubePlatform) { + } else if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.CubePlatform) { return Utils.getProperty("ro.build.id", "获取失败"); } else if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.MTKPlatform) { return Utils.getProperty("ro.build.id", "获取失败"); @@ -1794,6 +1797,17 @@ public class Utils { } } + public static boolean isWifiAvailable(Context context) { + ConnectivityManager conMan = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo.State wifi = conMan.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState(); + if (NetworkInfo.State.CONNECTED == wifi) { + return true; + } else { + return false; + } + } + + public static String getWifiAlias(Context context) { WifiManager wifiManager = (WifiManager) context.getSystemService(WIFI_SERVICE); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); diff --git a/app/src/main/res/drawable-hdpi/head.png b/app/src/main/res/drawable-hdpi/head.png index cd65693749128bd6496d1e2cb48914add5adcae6..3e60edefd78ac5a156bd911ef068791e6441840e 100644 GIT binary patch literal 4950 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 bE&wtOOHlq{!ppz@bQ$WI>Q-I8b@zV&{qo6U literal 4371 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 N002ovPDHLkV1fs;Y99aq diff --git a/app/src/main/res/drawable/background.xml b/app/src/main/res/drawable/background_main.xml similarity index 100% rename from app/src/main/res/drawable/background.xml rename to app/src/main/res/drawable/background_main.xml diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml index 046eb40..eb92f39 100644 --- a/app/src/main/res/layout-port/activity_main.xml +++ b/app/src/main/res/layout-port/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#ffffff" + android:background="#F4F5F7" android:fitsSystemWindows="true" tools:context=".activity.main.MainActivity"> @@ -25,6 +25,7 @@ android:adjustViewBounds="true" android:scaleType="centerCrop" android:src="@drawable/back" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -55,244 +56,95 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/tv_title" app:layout_constraintTop_toTopOf="parent" /> + + - - - + app:layout_constraintTop_toBottomOf="@+id/bannerLayout"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.096" /> - + + - - - - - + android:layout_height="@dimen/dp_36" + android:visibility="visible"> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +