From a1b1c07059d0fef513bf0feb6fc4b05dfced5ac0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 24 十一月 2022 14:07:45 +0800
Subject: [PATCH] Merge branch 'master' into wxr-sdk-test
---
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java | 26 ++++
AndroidOpenDemo/app/src/main/java/com/.DS_Store | 0
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java | 8
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java | 2
AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml | 1
AndroidOpenDemo/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java | 16 +++
AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml | 4
AndroidOpenDemo/app/src/main/res/values/strings.xml | 1
AndroidOpenDemo/.idea/misc.xml | 3
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 22 +++
AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store | 0
AndroidOpenDemo/DeviceAddModule/src/main/res/layout/fragment_bind_success.xml | 2
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java | 22 ++++
AndroidOpenDemo/app/src/main/java/com/common/openapi/MethodConst.java | 2
AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 20 +++
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java | 12 ++
AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java | 12 +
AndroidOpenDemo/app/src/main/res/values-en/strings.xml | 1
AndroidOpenDemo/app/src/main/AndroidManifest.xml | 19 ++-
AndroidOpenDemo/app/src/main/res/.DS_Store | 0
AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 6
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java | 19 ++-
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java | 2
AndroidOpenDemo/.idea/caches/build_file_checksums.ser | 0
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java | 3
AndroidOpenDemo/app/build.gradle | 2
AndroidOpenDemo/.DS_Store | 0
AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceDetailService.java | 34 ++++++
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java | 2
29 files changed, 205 insertions(+), 36 deletions(-)
diff --git a/AndroidOpenDemo/.DS_Store b/AndroidOpenDemo/.DS_Store
index fa68a13..c04119c 100644
--- a/AndroidOpenDemo/.DS_Store
+++ b/AndroidOpenDemo/.DS_Store
Binary files differ
diff --git a/AndroidOpenDemo/.idea/caches/build_file_checksums.ser b/AndroidOpenDemo/.idea/caches/build_file_checksums.ser
index edd70ff..6399dbe 100644
--- a/AndroidOpenDemo/.idea/caches/build_file_checksums.ser
+++ b/AndroidOpenDemo/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/AndroidOpenDemo/.idea/misc.xml b/AndroidOpenDemo/.idea/misc.xml
index 41d4729..17007bd 100644
--- a/AndroidOpenDemo/.idea/misc.xml
+++ b/AndroidOpenDemo/.idea/misc.xml
@@ -3,8 +3,11 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
+ <entry key="../../../../../layout/custom_preview.xml" value="0.33645833333333336" />
+ <entry key="DeviceAddModule/src/main/res/layout/activity_device_add.xml" value="0.16666666666666666" />
<entry key="app/src/main/res/layout/activity_device_detail.xml" value="0.16666666666666666" />
<entry key="app/src/main/res/layout/activity_device_list.xml" value="0.16666666666666666" />
+ <entry key="app/src/main/res/layout/activity_device_online_media_play.xml" value="0.16666666666666666" />
<entry key="app/src/main/res/layout/activity_device_record_list.xml" value="0.17552083333333332" />
<entry key="app/src/main/res/layout/fragment_device_detail_main.xml" value="0.17552083333333332" />
<entry key="app/src/main/res/layout/item_device_list.xml" value="0.17552083333333332" />
diff --git a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
index be0a4c6..07bcc74 100644
--- a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
+++ b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
@@ -22,7 +22,6 @@
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
- <option name="PROJECT_TYPE" value="1" />
</configuration>
</facet>
</component>
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 8373403..bd08b21 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
@@ -327,7 +327,7 @@
new BusinessRunnable(handler) {
@Override
public void doBusiness() throws BusinessException {
- DeviceBindResult deviceBindResult = deviceAddService.userDeviceBind( sn, devPwd, DMS_TIMEOUT);
+ DeviceBindResult deviceBindResult = deviceAddService.hdlUserDeviceBind( sn, devPwd, DMS_TIMEOUT);
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/CONST.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java
index 58e9be1..f14fabf 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java
@@ -34,6 +34,8 @@
//娣诲姞瀛愯处鎴锋潈闄�
public static String ADD_POLICY = "addPolicy";
+ public static String INDEPENDENT_REGISTER ="independentRegister";
+
// URL鍦板潃
public static String HOST = "";
// 濡傛灉涓嶇煡閬揳ppid锛岃鐧诲綍open.lechange.com锛屽紑鍙戣�呮湇鍔℃ā鍧椾腑鍒涘缓搴旂敤
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 93d7dd6..a4d95bb 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
@@ -108,6 +108,24 @@
HashMap<String, Object> paramsMap = new HashMap<String, Object>();
paramsMap.put("token", bindDeviceData.data.token);
paramsMap.put("deviceId", bindDeviceData.data.deviceId);
+ JsonObject json = HttpSend.execute(paramsMap, CONST.METHOD_BINDDEVICE,DMS_TIME_OUT);
+ BindDeviceData.Response response = new BindDeviceData.Response();
+ response.parseData(json);
+ return response;
+ }
+
+ /**
+ * 缁戝畾璁惧
+ *
+ * @param bindDeviceData
+ * @return
+ * @throws BusinessException
+ */
+ public static BindDeviceData.Response hdlUserDeviceBind(BindDeviceData bindDeviceData) throws BusinessException {
+ HashMap<String, Object> paramsMap = new HashMap<String, Object>();
+ paramsMap.put("extDevId", bindDeviceData.data.deviceId);
+ paramsMap.put("spk","security.ipcam.imou");
+ paramsMap.put("sid","8D00708PAGA01ED");
paramsMap.put("code", bindDeviceData.data.code);
JsonObject json = HttpSend.execute(paramsMap, CONST.METHOD_BINDDEVICE,DMS_TIME_OUT);
BindDeviceData.Response response = new BindDeviceData.Response();
@@ -248,10 +266,10 @@
// HttpSend.execute(jsonParam, CONST.ADD_POLICY,TIME_OUT);
// return true;
- final Map<String, Object> map = new Gson().fromJson(new Gson().toJson(req), new TypeToken<Map<String, String>>() {
- }.getType());
-
- JsonObject json = HttpSend.execute(map, CONST.CREATE_SUB_ACCOUNT, TIME_OUT);
+// final Map<String, Object> map = new Gson().fromJson(new Gson().toJson(req), new TypeToken<Map<String, Object>>() {
+// }.getType());
+//
+// JsonObject json = HttpSend.execute(map, CONST.CREATE_SUB_ACCOUNT, TIME_OUT);
return true;
}
}
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
index e0bc9ad..d08582c 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
@@ -35,7 +35,11 @@
Map<String, Object> map = paramsInit(paramsMap);
JsonObject jsonResult = null;
if (CONST.isHdlServer()) {
- jsonResult = doPost(CONST.HOST + "/home-wisdom/imou/openapi/" + method, map, timeOut);
+ if (method.equals("bindDevice")) {
+ jsonResult = doPost(CONST.HOST + "/home-wisdom/app/device/independentRegister", map, timeOut);
+ } else {
+ jsonResult = doPost(CONST.HOST + "/home-wisdom/imou/openapi/" + method, map, timeOut);
+ }
} else {
jsonResult = doPost(CONST.HOST + "/openapi/" + method, map, timeOut);
if (jsonResult == null) {
@@ -52,26 +56,29 @@
String msg = jsonResult.get("msg").getAsString();
throw new BusinessException(code + msg);
}
+
+ JsonObject jsonData = new JsonObject();
try {
- JsonObject jsonData = jsonResult.getAsJsonObject("data");
+ jsonData = jsonResult.getAsJsonObject("data");
if (jsonData == null) {
jsonData = new JsonObject();
}
- return jsonData;
+
} catch (Throwable e) {
- BusinessException businessException = new BusinessException(e);
- throw businessException;
+// BusinessException businessException = new BusinessException(e);
+// throw businessException;
}
+ return jsonData;
}
private static JsonObject doPost(String url, Map<String, Object> map, int timeOut) throws BusinessException {
Gson gson = new Gson();
- map.put("homeId", LCDeviceEngine.newInstance().getHomeId());
String json;
JsonObject jsonObject;
if(CONST.isHdlServer()) {
+ map.put("homeId", LCDeviceEngine.newInstance().getHomeId());
if (map.containsKey("params")) {
Map<String, Object> tempMap = (Map<String, Object>) map.get("params");
map.remove("params");
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java
index 1d0369d..d8d0ace 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java
@@ -194,7 +194,8 @@
public void onClick(View v) {
int id = v.getId();
if (id == R.id.tv_next) {
- mPresenter.modifyDevName();
+ completeAction();
+ //mPresenter.modifyDevName();
}
}
}
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java
index 6be6ab2..8c6b649 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java
@@ -138,7 +138,7 @@
PageNavigationHelper.gotoManualInputPage(this);
return;
}
-
+ //鎵弿浜岀淮鐮�--kaede
mPresenter.getDeviceInfo(scanResult.getSn().trim(), scanResult.getMode());
}
}
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 9f7bf87..98d6dd6 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,6 +127,18 @@
return deviceBindResult;
}
+ public DeviceBindResult hdlUserDeviceBind(String deviceId, String code, int timeout) throws BusinessException {
+ BindDeviceData req=new BindDeviceData();
+ req.data.deviceId = deviceId;
+ req.data.code = code;
+ 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);
+ return deviceBindResult;
+ }
+
/**
* openApi
* 淇敼璁惧鎴栬�呴�氶亾鍚嶏紝channelId涓虹┖鍒欎负淇敼璁惧鍚嶏紝涓嶄负绌轰负淇敼閫氶亾鍚�
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/res/layout/fragment_bind_success.xml b/AndroidOpenDemo/DeviceAddModule/src/main/res/layout/fragment_bind_success.xml
index 24647ac..1ae9fd8 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/res/layout/fragment_bind_success.xml
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/res/layout/fragment_bind_success.xml
@@ -60,6 +60,7 @@
android:textSize="20dp" />
<TextView
+ android:visibility="invisible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -69,6 +70,7 @@
android:textSize="15sp" />
<com.mm.android.deviceaddmodule.mobilecommon.widget.ClearEditText
+ android:visibility="invisible"
android:id="@+id/device_name_input"
android:layout_width="match_parent"
android:layout_height="@dimen/add_device_common_edit_height"
diff --git a/AndroidOpenDemo/app/build.gradle b/AndroidOpenDemo/app/build.gradle
index 3d8be28..ddafcf2 100644
--- a/AndroidOpenDemo/app/build.gradle
+++ b/AndroidOpenDemo/app/build.gradle
@@ -83,7 +83,7 @@
//// implementation("com.android.support:support-v4:28.0.0")
//}
-apply plugin: 'com.android.library'
+apply plugin: 'com.android.application'
repositories {
flatDir {
dirs 'libs'
diff --git a/AndroidOpenDemo/app/src/main/AndroidManifest.xml b/AndroidOpenDemo/app/src/main/AndroidManifest.xml
index 7452388..f4f2a99 100644
--- a/AndroidOpenDemo/app/src/main/AndroidManifest.xml
+++ b/AndroidOpenDemo/app/src/main/AndroidManifest.xml
@@ -6,33 +6,43 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <application>
+ <application
+ android:name=".App"
+ android:debuggable="false"
+ android:allowBackup="false"
+ android:icon="@mipmap/sdk_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/sdk_launcher"
+ android:supportsRtl="false"
+ android:theme="@style/AppTheme"
+ tools:replace="android:allowBackup,android:label,android:supportsRtl">
<activity
android:name=".ui.EnvGuideActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:screenOrientation="portrait">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
</activity>
<activity
android:name=".ui.DeviceListActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:exported="false"
- android:theme="@style/device_page_style"
android:screenOrientation="portrait"></activity>
<activity
android:name=".ui.DeviceDetailActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:exported="false"
- android:theme="@style/device_page_style"
android:screenOrientation="portrait"></activity>
<activity
android:name=".ui.DeviceOnlineMediaPlayActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:exported="false"
- android:theme="@style/device_page_style"
android:screenOrientation="portrait"></activity>
<activity
android:name=".ui.DeviceRecordListActivity"
@@ -45,7 +55,6 @@
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:exported="false"
- android:theme="@style/device_page_style"
android:screenOrientation="portrait"></activity>
</application>
</manifest>
\ No newline at end of file
diff --git a/AndroidOpenDemo/app/src/main/java/com/.DS_Store b/AndroidOpenDemo/app/src/main/java/com/.DS_Store
new file mode 100644
index 0000000..26c154e
--- /dev/null
+++ b/AndroidOpenDemo/app/src/main/java/com/.DS_Store
Binary files differ
diff --git a/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceDetailService.java b/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceDetailService.java
index 8e22f63..4a888a2 100644
--- a/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceDetailService.java
+++ b/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceDetailService.java
@@ -292,4 +292,38 @@
};
}
+ /**
+ * 鏍煎紡鍖朣D鍗�
+ * @param deviceId
+ * @param iRecoverSDCardCallBack
+ */
+ public void recoverSDCard(final String deviceId, final IGetDeviceInfoCallBack.IRecoverSDCardCallBack iRecoverSDCardCallBack){
+ final LCBusinessHandler handler = new LCBusinessHandler() {
+ @Override
+ public void handleBusiness(Message msg) {
+ if (iRecoverSDCardCallBack == null) {
+ return;
+ }
+ if (msg.what == HandleMessageCode.HMC_SUCCESS) {
+ //鎴愬姛
+ iRecoverSDCardCallBack.onSuccess("Success");
+ } else {
+ //澶辫触
+ iRecoverSDCardCallBack.onError(BusinessErrorTip.throwError(msg));
+ }
+ }
+ };
+ new BusinessRunnable(handler) {
+ @Override
+ public void doBusiness() throws BusinessException {
+ try {
+ boolean b = DeviceInfoOpenApiManager.recoverSDCard(deviceId);
+ handler.obtainMessage(HandleMessageCode.HMC_SUCCESS, b).sendToTarget();
+ } catch (BusinessException e) {
+ throw e;
+ }
+ }
+ };
+ }
+
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java b/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java
index 3ceda8d..3283b52 100644
--- a/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java
+++ b/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java
@@ -14,11 +14,7 @@
import com.google.gson.JsonObject;
import com.mm.android.deviceaddmodule.LCDeviceEngine;
import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.BusinessException;
-import com.mm.android.deviceaddmodule.mobilecommon.common.Constants;
-import com.mm.android.deviceaddmodule.mobilecommon.utils.PreferencesHelper;
import com.mm.android.deviceaddmodule.openapi.HttpSend;
-
-import org.json.JSONObject;
import java.util.HashMap;
@@ -127,6 +123,14 @@
return true;
}
+ public static boolean recoverSDCard(String deviceId) throws BusinessException{
+ HashMap<String, Object> paramsMap = new HashMap<String, Object>();
+ paramsMap.put("token", LCDeviceEngine.newInstance().accessToken);
+ paramsMap.put("deviceId", deviceId);
+ HttpSend.execute(paramsMap, MethodConst.RECOVER_SDCARD,TIME_OUT);
+ return true;
+ }
+
/**
* 鑾峰彇璁惧鐗堟湰鍜屽彲鍗囩骇淇℃伅
*
diff --git a/AndroidOpenDemo/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java b/AndroidOpenDemo/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java
index 5d0b016..236b583 100644
--- a/AndroidOpenDemo/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java
+++ b/AndroidOpenDemo/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java
@@ -214,6 +214,22 @@
void onError(Throwable throwable);
}
+ public interface IRecoverSDCardCallBack {
+ /**
+ * 鎴愬姛
+ *
+ * @param result
+ */
+ void onSuccess(String result);
+
+ /**
+ * 閿欒鍥炶皟
+ *
+ * @param throwable
+ */
+ void onError(Throwable throwable);
+ }
+
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/common/openapi/MethodConst.java b/AndroidOpenDemo/app/src/main/java/com/common/openapi/MethodConst.java
index 94e3517..d87da16 100644
--- a/AndroidOpenDemo/app/src/main/java/com/common/openapi/MethodConst.java
+++ b/AndroidOpenDemo/app/src/main/java/com/common/openapi/MethodConst.java
@@ -38,6 +38,8 @@
public static String DELETE_DEVICE_PERMISSION = "deleteDevicePermission";
+ public static String RECOVER_SDCARD = "recoverSDCard";
+
public static String SD_STATUE_QUERY = "deviceSdcardStatus";
public static String GET_DEVICE_CLOUD = "getDeviceCloud";
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store
new file mode 100644
index 0000000..7d59bac
--- /dev/null
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store
Binary files differ
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
index f593375..db12d50 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
@@ -55,6 +55,7 @@
private IGetDeviceInfoCallBack.IModifyDeviceName modifyNameListener;
private String fromWhere;
private TextView tvDeploymentTip;
+ private TextView tvFormat_sd;
public static DeviceDetailMainFragment newInstance() {
DeviceDetailMainFragment fragment = new DeviceDetailMainFragment();
@@ -92,11 +93,13 @@
tvDeviceVersion = view.findViewById(R.id.tv_device_version);
tvCurrentWifi = view.findViewById(R.id.tv_current_wifi);
rlCurWifi = view.findViewById(R.id.rl_cur_wifi);
+ tvFormat_sd =view.findViewById(R.id.tvFormat_sd);
rlDeployment.setOnClickListener(this);
rlDetele.setOnClickListener(this);
rlDeviceDetail.setOnClickListener(this);
rlCurWifi.setOnClickListener(this);
+ tvFormat_sd.setOnClickListener(this);
DeviceDetailActivity deviceDetailActivity = (DeviceDetailActivity) getActivity();
deviceDetailActivity.tvTitle.setText(getResources().getString(R.string.lc_demo_device_detail_title));
if (arguments == null) {
@@ -271,6 +274,25 @@
deviceDetailService.unBindDevice(deviceUnBindData, this);*/
deviceDetailService.deletePermission(deviceListBean.deviceId,null,this);
}
+ else if(id==R.id.tvFormat_sd){
+ deviceDetailActivity.rlLoading.setVisibility(View.VISIBLE);
+ DeviceDetailService deviceDetailService = ClassInstanceManager.newInstance().getDeviceDetailService();
+ /* DeviceUnBindData deviceUnBindData = new DeviceUnBindData();
+ deviceUnBindData.data.deviceId = deviceListBean.deviceId;
+ deviceDetailService.unBindDevice(deviceUnBindData, this);*/
+ deviceDetailService.recoverSDCard(deviceListBean.deviceId, new IGetDeviceInfoCallBack.IRecoverSDCardCallBack() {
+ @Override
+ public void onSuccess(String result) {
+ deviceDetailActivity.rlLoading.setVisibility(View.GONE);
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ deviceDetailActivity.rlLoading.setVisibility(View.GONE);
+ }
+ });
+
+ }
}
@Override
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
index 08de111..ecdcd9a 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
@@ -577,7 +577,7 @@
mLayoutParams.addRule(RelativeLayout.BELOW, R.id.rl_title);
frLiveWindow.setLayoutParams(mLayoutParams);
MediaPlayHelper.quitFullScreen(DeviceOnlineMediaPlayActivity.this);
- llController.setVisibility(View.VISIBLE);
+ llController.setVisibility(View.GONE);
rlTitle.setVisibility(View.VISIBLE);
llSpeak1.setVisibility(View.GONE);
llCloudStage1.setVisibility(View.GONE);
@@ -601,10 +601,10 @@
MediaPlayHelper.setFullScreen(DeviceOnlineMediaPlayActivity.this);
llController.setVisibility(View.GONE);
rlTitle.setVisibility(View.GONE);
- llSpeak1.setVisibility(View.VISIBLE);
+ llSpeak1.setVisibility(View.GONE);
llCloudStage1.setVisibility(View.VISIBLE);
- llVideo1.setVisibility(View.VISIBLE);
- llScreenShot1.setVisibility(View.VISIBLE);
+ llVideo1.setVisibility(View.GONE);
+ llScreenShot1.setVisibility(View.GONE);
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(frRecord
.getLayoutParams());
layoutParams.removeRule(RelativeLayout.BELOW);
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
index 807af2e..7a55de5 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
@@ -7,6 +7,7 @@
import android.widget.TextView;
import android.widget.Toast;
+import com.callBack.IAddCamera;
import com.lechange.demo.R;
import com.lechange.demo.tools.RootUtil;
import com.mm.android.deviceaddmodule.utils.SDsolutionUtility;
@@ -70,12 +71,27 @@
HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com");
HdlToLcUtils.getInstance().setHomeId("1547099040465408002");
- HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0YTJhNzZiYTUxNzU0ZmFmODZlYjhhNDZiODUzZWRjMCIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkyMDEzODYsIm5iZiI6MTY2OTE5NDE4Nn0.jlXwyCbdy41f4tkObmnKup6r2xGRzk5fLtHfNgaNSdJ6deyzKFVLQcDH3FMW_AntAo2ghkTQLZGnMXt8k7uoC0fa6XLHA8bTNYvjx4-2X1ky2FMcvv_sDTmmPMo6EbqOeRNkCoiLly2iTB4Ch6FJRSQo0UFkpOJtJJuCCo92B5c");
+ HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJjZmQ1NzM3NTk4YjA0YjQ3YTQyOTQ4YzczNTNkODk3MCIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkyNzI5MDAsIm5iZiI6MTY2OTI2NTcwMH0.LX4HmxmxuH80eNpBuDurp8POOGwX2hhqcLR4ULCCSnGhhYH61OaTYym4rn_CGM2J15EBVg0EpcJAfabePtQAS6pbeNv60jf-5s-V4zCPyqGKatduFbx1uG1Bw3TPiPCoTdhKkWb_pwRAfchhFMeibMrbS9W3JSs6eJ1mpZODOtM");
HdlToLcUtils.getInstance().setSubAccessToken("St_00003ee84eda32b14126af958052f20a");
// HdlToLcUtils.getInstance().openActivity();
- //HdlToLcUtils.getInstance().addCamera();
- HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
+ HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
+ @Override
+ public void success(String deviceId) {
+
+ }
+
+ @Override
+ public void onError(String errMsg) {
+
+ }
+
+ @Override
+ public void back() {
+
+ }
+ });
+// HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index 75d5ed4..0fdee9f 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -66,9 +66,9 @@
// mUrl = CONST.Envirment.CHINA_TEST.url;
// ProviderManager.getAppProvider().setAppType(0);
// } else {
-// mAppSecret = "017fc27bb987496f9a677e4e6f0c88";
-// mAppid = "lc0285433bc7e8423d";
-// mUrl = CONST.Envirment.OVERSEAS_PRO.url;
+// secretKey = "017fc27bb987496f9a677e4e6f0c88";
+// appKey = "lc0285433bc7e8423d";
+// url = CONST.Envirment.OVERSEAS_PRO.url;
ProviderManager.getAppProvider().setAppType(1);
// }
diff --git a/AndroidOpenDemo/app/src/main/res/.DS_Store b/AndroidOpenDemo/app/src/main/res/.DS_Store
new file mode 100644
index 0000000..eeff520
--- /dev/null
+++ b/AndroidOpenDemo/app/src/main/res/.DS_Store
Binary files differ
diff --git a/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml b/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml
index e00bd8f..6aaf1d6 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml
@@ -180,7 +180,8 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/lc_demo_color_442c2c2c"
- android:gravity="center">
+ android:gravity="center"
+ android:visibility="gone">
<ImageView
android:id="@+id/iv_sound"
@@ -277,6 +278,7 @@
android:layout_height="@dimen/px_140"
android:layout_marginBottom="@dimen/px_20"
android:background="@color/lc_demo_color_ffffff"
+ android:visibility="gone"
android:paddingLeft="@dimen/px_30"
android:paddingRight="@dimen/px_30">
diff --git a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
index 6dc6914..a1502d7 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
@@ -122,6 +122,23 @@
android:src="@mipmap/lc_demo_common_btn_next"></ImageView>
</RelativeLayout>
<RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/px_130"
+ android:background="@color/lc_demo_color_ffffff"
+ android:gravity="center_vertical"
+ android:paddingLeft="@dimen/px_30"
+ android:paddingRight="@dimen/px_30">
+
+ <TextView
+ android:id="@+id/tvFormat_sd"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:text="@string/format_sd"
+ android:textColor="@color/lc_demo_color_2c2c2c"
+ android:textSize="@dimen/px_36"></TextView>
+ </RelativeLayout>
+ <RelativeLayout
android:visibility="gone"
android:layout_marginTop="@dimen/px_1"
android:id="@+id/rl_cur_wifi"
@@ -167,7 +184,8 @@
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/px_50"
android:background="@color/lc_demo_color_ffffff"
- android:gravity="center_vertical">
+ android:gravity="center_vertical"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
diff --git a/AndroidOpenDemo/app/src/main/res/values-en/strings.xml b/AndroidOpenDemo/app/src/main/res/values-en/strings.xml
index c09df0b..461165a 100644
--- a/AndroidOpenDemo/app/src/main/res/values-en/strings.xml
+++ b/AndroidOpenDemo/app/src/main/res/values-en/strings.xml
@@ -78,4 +78,5 @@
<string name="lc_demo_device_today_no_record">today no record</string>
<string name="lc_demo_device_local_sd">No storage medium</string>
<string name="lc_demo_device_cloud_not_open">Cloud storage is not enabled</string>
+ <string name="format_sd">Format sd card</string>
</resources>
diff --git a/AndroidOpenDemo/app/src/main/res/values/strings.xml b/AndroidOpenDemo/app/src/main/res/values/strings.xml
index 4278f8c..fdfcdf3 100644
--- a/AndroidOpenDemo/app/src/main/res/values/strings.xml
+++ b/AndroidOpenDemo/app/src/main/res/values/strings.xml
@@ -78,4 +78,5 @@
<string name="lc_demo_device_today_no_record">浠婃棩鏆傛棤褰曞儚</string>
<string name="lc_demo_device_local_sd">鏃犲瓨鍌ㄤ粙璐�</string>
<string name="lc_demo_device_cloud_not_open">浜戝瓨鍌ㄦ湭寮�閫�</string>
+ <string name="format_sd">鏍煎紡鍖朣D鍗�</string>
</resources>
--
Gitblit v1.8.0