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" /> AndroidOpenDemo/.idea/modules/LCAndroidSDKDemo.iml
@@ -3,6 +3,7 @@ <component name="FacetManager"> <facet type="java-gradle" name="Java-Gradle"> <configuration> <option name="BUILD_FOLDER_PATH" /> <option name="BUILDABLE" value="false" /> </configuration> </facet> AndroidOpenDemo/.idea/workspace.xml
@@ -16,19 +16,11 @@ </component> <component name="ChangeListManager"> <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/modules/LCAndroidSDKDemo.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/LCAndroidSDKDemo.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceDetailService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/MethodConst.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/MethodConst.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -415,10 +407,10 @@ <screen x="0" y="0" width="1280" height="800" /> </state> <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669257522604" /> <state x="332" y="155" width="708" height="490" key="find.popup" timestamp="1669259388351"> <state x="332" y="155" width="708" height="490" key="find.popup" timestamp="1669264064530"> <screen x="0" y="0" width="1280" height="800" /> </state> <state x="332" y="155" width="708" height="490" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669259388351" /> <state x="332" y="155" width="708" height="490" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669264064530" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> 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()); AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
@@ -106,8 +106,30 @@ */ public static BindDeviceData.Response userDeviceBind(BindDeviceData bindDeviceData) throws BusinessException { HashMap<String, Object> paramsMap = new HashMap<String, Object>(); paramsMap.put("token", bindDeviceData.data.token); // paramsMap.put("token", bindDeviceData.data.token); // paramsMap.put("deviceId", bindDeviceData.data.deviceId); paramsMap.put("code", bindDeviceData.data.code); paramsMap.put("spk","security.ipcam.imou"); paramsMap.put("extDevId",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("deviceId", bindDeviceData.data.deviceId); paramsMap.put("spk","security.ipcam.imou"); paramsMap.put("code", bindDeviceData.data.code); JsonObject json = HttpSend.execute(paramsMap, CONST.METHOD_BINDDEVICE,DMS_TIME_OUT); BindDeviceData.Response response = new BindDeviceData.Response(); 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) { 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()); } } 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为空则为修改设备名，不为空为修改通道名 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); 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; @@ -74,8 +75,23 @@ 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"); }
@@ -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">
@@ -184,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"
