From 0a7db7243a33a54d3733f60179185ee63599d397 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期四, 24 十一月 2022 12:47:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wxr-app' --- AndroidOpenDemo/.idea/misc.xml | 3 +++ AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java | 8 ++++++-- AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java | 6 +++++- AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 20 ++++++++++++++++++-- AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java | 2 +- AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java | 8 ++++---- AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 3 ++- AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml | 4 +++- 8 files changed, 42 insertions(+), 12 deletions(-) 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/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 10b9757..8f7bb31 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 @@ -106,9 +106,13 @@ */ 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("deviceId", bindDeviceData.data.deviceId); +// 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); 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 12a46fc..d538b63 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) { 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/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 91306bf..282fa4e 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; @@ -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"); } 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 a46d781..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 @@ -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" -- Gitblit v1.8.0