From 409c13d0886117d5ee4ff42186d90b19a692b804 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 二月 2023 14:06:36 +0800
Subject: [PATCH] 增加品牌认证

---
 AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java                                                            |    9 +++++++++
 AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java        |   13 +++++++++++++
 AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java                         |   18 ++++++++++++++++++
 AndroidOpenDemo/DeviceAddModule/src/main/AndroidManifest.xml                                                             |    2 +-
 AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java |    1 +
 AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/data/BindDeviceData.java            |    2 ++
 AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java                   |    4 +++-
 AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java               |    4 +++-
 8 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/AndroidManifest.xml b/AndroidOpenDemo/DeviceAddModule/src/main/AndroidManifest.xml
index d9b390f..0fbc7f0 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/AndroidManifest.xml
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />    <!--鍏佽搴旂敤绋嬪簭璁块棶棰濆鐨勪綅缃彁渚涘懡浠わ紝鐧婚檰銆佽澶囨坊鍔犵瓑锛燂紵锛�-->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />  <!--鍏佽绋嬪簭鏀瑰彉缃戠粶鐘舵��,濡傛槸鍚﹁仈缃戯紝閰嶇綉锛燂紵锛�-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />  <!--鍏佽搴旂敤绋嬪簭璇锋眰瀹夎鍖呫�傞拡瀵笰PI澶т簬22蹇呴』鎸佹湁璇ヨ鍙娇鐢ˋCTION_INSTALL_PACKAGE搴旂敤銆傚簲璇ユ病鍦ㄧ敤锛燂紵锛�-->
+<!--    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />  &lt;!&ndash;鍏佽搴旂敤绋嬪簭璇锋眰瀹夎鍖呫�傞拡瀵笰PI澶т簬22蹇呴』鎸佹湁璇ヨ鍙娇鐢ˋCTION_INSTALL_PACKAGE搴旂敤銆傚簲璇ユ病鍦ㄧ敤锛燂紵锛�&ndash;&gt;-->
     <uses-permission android:name="android.permission.VIBRATE" />
     <application
         android:allowBackup="false"
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java
index b8053a0..929a4fb 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java
@@ -1,6 +1,7 @@
 package com.mm.android.deviceaddmodule;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -40,6 +41,16 @@
     public CommonParam commonParam;
     public String userId = "";
     private String homeId;
+    private String productBrandldentity;
+
+    private Application context;
+    public Application getContext() {
+        return context;
+    }
+
+    public void setContext(Application context) {
+        this.context = context;
+    }
 
     public static LCDeviceEngine newInstance() {
         if (lcDeviceEngine == null) {
@@ -57,6 +68,7 @@
         this.accessToken = "St_0000c3e2e772d5f74bfca2d86eaa18a6";//涓轰簡浣庡眰绌哄垽鏂紝褰撳墠token鏃犳晥
         this.userId = "";
         this.sdkHasInit = false;
+        this.context = commonParam.getContext();
         if (commonParam == null) {
             throw new Exception("commonParam must not null");
         }
@@ -156,4 +168,10 @@
     public void setHomeId(String homeId) {
         this.homeId = homeId;
     }
+
+    public String getProductBrandldentity() { return productBrandldentity == null ? "" : productBrandldentity;}
+
+    public void setProductBrandldentity(String productBrandldentity){
+        this.productBrandldentity = productBrandldentity;
+    }
 }
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java
index 2859d1b..f98ca47 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java
@@ -140,6 +140,7 @@
 
     private void registerBroadCast() {
         IntentFilter mIntentFilter = createBroadCast();
+        mIntentFilter.addAction("xxxx");
         if (mIntentFilter != null && mIntentFilter.countActions() > 0) {
             broadcastReceiver = new BaseBroadcast();
             registerReceiver(broadcastReceiver, mIntentFilter);
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java
index bd08b21..2df017f 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java
@@ -26,6 +26,7 @@
 import com.lechange.opensdk.device.LCOpenSDK_DeviceInit;
 import com.lechange.opensdk.media.DeviceInitInfo;
 import com.lechange.opensdk.searchwifi.WlanInfo;
+import com.mm.android.deviceaddmodule.LCDeviceEngine;
 import com.mm.android.deviceaddmodule.helper.DeviceAddHelper;
 import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.BusinessException;
 import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.BusinessRunnable;
@@ -327,7 +328,8 @@
         new BusinessRunnable(handler) {
             @Override
             public void doBusiness() throws BusinessException {
-                DeviceBindResult deviceBindResult = deviceAddService.hdlUserDeviceBind( sn, devPwd, DMS_TIMEOUT);
+
+                DeviceBindResult deviceBindResult = deviceAddService.hdlUserDeviceBind( sn, devPwd, LCDeviceEngine.newInstance().getProductBrandldentity());
                 mDeviceAddInfo.setDeviceDefaultName(deviceBindResult.getDeviceName());
                 mDeviceAddInfo.setBindStatus(deviceBindResult.getBindStatus());
                 mDeviceAddInfo.setBindAcount(deviceBindResult.getUserAccount());
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
index a4d95bb..e4d1790 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
@@ -1,13 +1,20 @@
 package com.mm.android.deviceaddmodule.openapi;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import com.mm.android.deviceaddmodule.LCDeviceEngine;
+import com.mm.android.deviceaddmodule.SeachDeviceService;
 import com.mm.android.deviceaddmodule.device_wifi.CurWifiInfo;
 import com.mm.android.deviceaddmodule.device_wifi.WifiConfig;
 import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.BusinessException;
+import com.mm.android.deviceaddmodule.mobilecommon.common.LCConfiguration;
 import com.mm.android.deviceaddmodule.openapi.data.AddDevicePolicyData;
 import com.mm.android.deviceaddmodule.openapi.data.BindDeviceData;
 import com.mm.android.deviceaddmodule.openapi.data.DeviceDetailListData;
@@ -126,10 +133,16 @@
         paramsMap.put("extDevId", bindDeviceData.data.deviceId);
         paramsMap.put("spk","security.ipcam.imou");
         paramsMap.put("sid","8D00708PAGA01ED");
+        paramsMap.put("productBrandldentity",bindDeviceData.data.productBrandldentity);
         paramsMap.put("code", bindDeviceData.data.code);
         JsonObject json = HttpSend.execute(paramsMap, CONST.METHOD_BINDDEVICE,DMS_TIME_OUT);
         BindDeviceData.Response response = new BindDeviceData.Response();
         response.parseData(json);
+
+        Intent intent = new Intent();
+        intent.setAction("hdlUserDeviceBind");
+        intent.putExtra("data",response.data.toString());
+
         return response;
     }
 
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/data/BindDeviceData.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/data/BindDeviceData.java
index 18ef93a..3c345ed 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/data/BindDeviceData.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/data/BindDeviceData.java
@@ -35,6 +35,7 @@
         public String code;
         public String token;
         public String deviceId;
+        public String productBrandldentity;
 
         @Override
         public String toString() {
@@ -42,6 +43,7 @@
                     "code='" + code + '\'' +
                     ", token='" + token + '\'' +
                     ", deviceId='" + deviceId + '\'' +
+                    ", productBrandldentity='" + productBrandldentity + '\'' +
                     '}';
         }
     }
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java
index 98d6dd6..117f5a7 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java
@@ -127,15 +127,17 @@
         return deviceBindResult;
     }
 
-    public DeviceBindResult hdlUserDeviceBind(String deviceId, String code, int timeout) throws BusinessException {
+    public DeviceBindResult hdlUserDeviceBind(String deviceId, String code,String productBrandldentity) throws BusinessException {
         BindDeviceData req=new BindDeviceData();
         req.data.deviceId = deviceId;
         req.data.code = code;
+        req.data.productBrandldentity =productBrandldentity;
         BindDeviceData.Response response = DeviceAddOpenApiManager.hdlUserDeviceBind(req);
         DeviceBindResult deviceBindResult = new DeviceBindResult();
         deviceBindResult.setBindStatus(response.data.bindStatus);
         deviceBindResult.setDeviceName(response.data.deviceName);
         deviceBindResult.setUserAccount(response.data.userAccount);
+        LCDeviceEngine.newInstance().getContext().registerReceiver()
         return deviceBindResult;
     }
 
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index 72f3259..09ffed0 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -31,6 +31,7 @@
     private String token;
     private String subAccessToken;
     private IAddCamera iAddCamera;
+    private String productBrandldentity;
 
     public Activity getActivity() {
         return activity;
@@ -142,6 +143,14 @@
         LCDeviceEngine.newInstance().setHomeId(homeId);
     }
 
+    public String getProductBrandldentity() { return productBrandldentity;}
+
+    public void setProductBrandldentity(String productBrandldentity){
+        this.productBrandldentity = productBrandldentity;
+        LCDeviceEngine.newInstance().setProductBrandldentity(productBrandldentity);
+
+    }
+
     public String getToken() {
         return token;
     }

--
Gitblit v1.8.0