From adba037d593cae303557bb686025b8ccc3bdf418 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 12 九月 2023 13:58:19 +0800
Subject: [PATCH] 澳斯迪去除申请密钥等功能

---
 HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java |   66 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index 73cae8c..9764b67 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -1,7 +1,10 @@
 package com.hdl.hdlsdk;
 
 import android.Manifest;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -40,17 +43,13 @@
 import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
 import com.hdl.sdk.connect.callback.HDLLinkCallBack;
 import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
-import com.hdl.sdk.connect.cloud.CallBackListener;
-import com.hdl.sdk.connect.cloud.HDLException;
 import com.hdl.sdk.connect.config.HDLLinkConfig;
 import com.hdl.sdk.connect.socket.HDLAuthSocket;
-import com.hdl.sdk.connect.utils.AesUtil;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 
@@ -83,7 +82,7 @@
         infoBean.setAccessMode("WIFI");
         infoBean.setIPGateway("192.168.1.1");
         infoBean.setIPAddress("192.168.1.103");
-        infoBean.setGateway_type("screen.touch");
+        infoBean.setGateway_type("screen.touch");//spk
         infoBean.setHw_version("HW2.0");
         infoBean.setFw_version("Fw1.0");
         infoBean.setOID("010105000000FE11");//姣忎釜璁惧oid閮借涓嶄竴鏍�
@@ -92,7 +91,7 @@
         HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
     }
 
-    void applyDeviceSecret() {
+    /*void applyDeviceSecret() {
         tv.setText("寮�濮嬬敵璇疯澶囧瘑閽�...");
         responseTv.setText("");
 
@@ -133,6 +132,32 @@
         });
 
     }
+
+    void checkAppVersion() {
+        tv.setText("寮�濮嬫娴嬫洿鏂�...");
+        responseTv.setText("");
+
+//        //姝ｅ紡鏈嶅姟鍣�
+        String appKey = "i8hR07jzrIS";//appkey
+        String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret
+
+        String appCode = "1697150870315999233";//appCode
+
+        HDLLink.getInstance().checkAppVersion(this, appKey, appSecret, getAppVersionName(this), appCode, new CheckAppVersionListener() {
+            @Override
+            public void onSuccess(UpdateInfo info) {
+                tv.setText("鏈夋柊鏇存柊");
+                responseTv.setText(info.toString());
+            }
+
+            @Override
+            public void onError(HDLException e) {
+                tv.setText("妫�娴嬫洿鏂板け璐�");
+                responseTv.setText(e.getMsg());
+            }
+        });
+
+    }*/
 
     /**
      * 鍏ョ綉璁よ瘉
@@ -265,6 +290,7 @@
         beans.add(new DemoBean("UDP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�"));
         beans.add(new DemoBean("TCP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�"));
         beans.add(new DemoBean("閫�缃�"));
+        beans.add(new DemoBean("妫�娴嬫洿鏂�"));
         demoAdapter = new DemoAdapter(beans);
         rv.setAdapter(demoAdapter);
 
@@ -281,7 +307,7 @@
                 switch (position) {
                     case 0:
                         //鐢宠璁惧瀵嗛挜
-                        applyDeviceSecret();
+//                        applyDeviceSecret();
                         break;
                     case 1:
                         //鍏ョ綉璁よ瘉
@@ -342,6 +368,10 @@
                     case 15:
                         //閫�缃�
                         deleteNetwork();
+                        break;
+                    case 16:
+                        //妫�娴嬫洿鏂�
+//                        checkAppVersion();
                         break;
                 }
             }
@@ -787,4 +817,26 @@
             }
         });
     }
+
+    /**
+     * 鑾峰彇APP鐗堟湰
+     *
+     * @param context
+     * @return
+     */
+    public static String getAppVersionName(Context context) {
+        String versionName = "0";
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
+            versionName = packageInfo.versionName;
+            if (TextUtils.isEmpty(versionName)) {
+                versionName = "0";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return versionName;
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.8.0