| AndroidOpenDemo/.idea/gradle.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/.idea/workspace.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/DeviceAddModule/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/app/src/main/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
AndroidOpenDemo/.idea/gradle.xml
@@ -4,7 +4,7 @@ <component name="GradleSettings"> <option name="linkedExternalProjectsSettings"> <GradleProjectSettings> <option name="testRunner" value="PLATFORM" /> <option name="testRunner" value="GRADLE" /> <option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="modules"> @@ -16,7 +16,6 @@ </set> </option> <option name="resolveModulePerSourceSet" value="false" /> <option name="useQualifiedModuleNames" value="true" /> </GradleProjectSettings> </option> </component> AndroidOpenDemo/.idea/workspace.xml
@@ -6,7 +6,7 @@ </shared> </component> <component name="AndroidLogFilters"> <option name="TOOL_WINDOW_CUSTOM_FILTER" value="HttpSend" /> <option name="TOOL_WINDOW_CUSTOM_FILTER" value="404" /> <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" /> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" /> </component> @@ -15,20 +15,15 @@ </component> <component name="ChangeListManager"> <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHMobileToolset_1_1_1_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHScanner_1_0_7_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_PullToRefreshListView_release_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/DeviceAddModule/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java" 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/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" 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/layout/fragment_device_detail_name.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_name.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/third-zxing/src/main/res/values/colors_ui.xml" beforeDir="false" afterPath="$PROJECT_DIR$/third-zxing/src/main/res/values/colors_ui.xml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -61,24 +56,6 @@ <path> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" /> </path> <path> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" /> <item name="app" type="2d1252cf:ModuleNode" /> </path> <path> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" /> <item name="app" type="2d1252cf:ModuleNode" /> <item name="Tasks" type="e4a08cd1:TasksNode" /> </path> <path> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" /> <item name="app" type="2d1252cf:ModuleNode" /> <item name="Tasks" type="e4a08cd1:TasksNode" /> <item name="build" type="c8890929:TasksNode$1" /> </path> <path> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> @@ -137,7 +114,7 @@ <property name="cidr.known.project.marker" value="true" /> <property name="dart.analysis.tool.window.visible" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/res/layout" /> <property name="memory.settings.postsync.last.time.stamp" value="1670203339524" /> <property name="memory.settings.postsync.last.time.stamp" value="1670328675383" /> <property name="project.structure.last.edited" value="Dependencies" /> <property name="project.structure.proportion" value="0.17" /> <property name="project.structure.side.proportion" value="0.2" /> @@ -162,7 +139,7 @@ <recent name="com" /> </key> </component> <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]"> <component name="RunManager" selected="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]"> <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> <option name="TEST_OBJECT" value="class" /> <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> @@ -336,15 +313,15 @@ </configuration> <recent_temporary> <list> <item itemvalue="Gradle.AndroidOpenDemo:app [assembleRelease]" /> <item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]" /> <item itemvalue="Gradle.AndroidOpenDemo:app [assembleRelease]" /> <item itemvalue="Gradle.AndroidOpenDemo:third-zxing [assembleRelease]" /> <item itemvalue="Gradle.AndroidOpenDemo:app [assembleDebug]" /> <item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleDebug]" /> </list> </recent_temporary> </component> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="false" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SvnConfiguration"> <configuration /> </component> @@ -376,6 +353,15 @@ </ignored-roots> </component> <component name="XDebuggerManager"> <breakpoint-manager> <breakpoints> <line-breakpoint enabled="true" suspend="THREAD" type="java-line"> <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java</url> <line>56</line> <option name="timeStamp" value="6" /> </line-breakpoint> </breakpoints> </breakpoint-manager> <watches-manager> <configuration name="app"> <watch expression="openApi" language="JAVA" /> @@ -385,6 +371,7 @@ <watch expression="jsonResult.get("msg").getAsString()" language="JAVA" /> <watch expression="jsonObject" language="JAVA" /> <watch expression="jsonResult.get("code").getAsString()" language="JAVA" /> <watch expression="b" language="JAVA" /> </configuration> </watches-manager> </component> AndroidOpenDemo/DeviceAddModule/build.gradle
@@ -49,14 +49,11 @@ } dependencies { // api fileTree(include: ['*.jar'], dir: 'libs') api fileTree(include: ['imageload4dh.jar','eventbus-3.0.0.jar'], dir: 'libs') // api 'org.greenrobot:eventbus:3.3.1' api fileTree(include: ['imageload4dh.jar'], dir: 'libs') // compileOnly fileTree(include: ['eventbus:3.0.0.jar'], dir: 'libs') // compileOnly fileTree(include: ['lechangeSDK.jar'], dir: 'libs') api fileTree(include: ['lechangeSDK.jar'], dir: 'libs') compileOnly fileTree(include: ['lechangeSDK.jar'], dir: 'libs') // api fileTree(include: ['lechangeSDK.jar'], dir: 'libs') api fileTree(include: ['eventbus-3.0.0.jar'], dir: 'libs') // compile project(':LcOpenSDk')
@@ -25,6 +25,13 @@ public class HttpClient { private static final String TAG=HttpClient.class.getSimpleName(); private static boolean showErrorInfo = false; public static void SetShowErrorInfo(boolean isShow){ showErrorInfo = isShow; } /** * post * @@ -35,7 +42,7 @@ * @return */ public static String post(String urlStr, String paramStr, String contentType, String debugTag,int timeOut) throws IOException { LogUtil.debugLog(TAG,urlStr+"..."+paramStr); LogUtil.debugLog(TAG,urlStr+"..debuglogHdlkaede.."+paramStr); HttpsURLConnection conn = null; String resultData = ""; OutputStream outputStream = null; @@ -76,8 +83,11 @@ baos.flush(); if (debugTag != null) LogUtil.debugLog(debugTag, "request data " + resultData); } else throw new IOException(String.format("http_get failed: status=%d", responseCode)); } else { if(showErrorInfo) { throw new IOException(String.format("http_get failed: status=%d : url=%d", responseCode,urlStr)); } } } catch (IOException e) { throw e; } catch (Throwable e) { AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
@@ -53,13 +53,13 @@ } String code = jsonResult.get("code").getAsString(); if (!"0".equals(code)) { // try { try { String msg = jsonResult.get("msg").getAsString(); throw new BusinessException(code + msg); // }catch (Exception exception){ // String msg = jsonResult.get("message").getAsString(); // throw new BusinessException(code + msg); // } }catch (Exception exception){ String msg = jsonResult.get("message").getAsString(); throw new BusinessException(code + msg); } } JsonObject jsonData = new JsonObject(); AndroidOpenDemo/app/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@ <!-- android:roundIcon="@mipmap/sdk_launcher"--> <!-- android:supportsRtl="false"--> <!-- android:theme="@style/AppTheme"--> <!-- tools:replace="android:allowBackup,android:label,android:supportsRtl"--> <!-- >--> <!-- tools:replace="android:allowBackup,android:label,android:supportsRtl">--> <activity android:name=".ui.EnvGuideActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
@@ -191,27 +191,28 @@ } private void getCurrentWifiInfo() { //2022-12-07 11:43:33 隐藏，王赢的云端或报错 //设备才能获取WIFI DialogUtils.show(getActivity()); deviceDetailService.currentDeviceWifi(deviceListBean.deviceId, new IGetDeviceInfoCallBack.IDeviceCurrentWifiInfoCallBack() { @Override public void deviceCurrentWifiInfo(CurWifiInfo curWifiInfo) { DialogUtils.dismiss(); if (!isAdded() || curWifiInfo == null) { return; } rlCurWifi.setVisibility(View.VISIBLE); if (curWifiInfo.isLinkEnable()) { wifiInfo = curWifiInfo; tvCurrentWifi.setText(wifiInfo.getSsid()); } } @Override public void onError(Throwable throwable) { DialogUtils.dismiss(); } }); // DialogUtils.show(getActivity()); // deviceDetailService.currentDeviceWifi(deviceListBean.deviceId, new IGetDeviceInfoCallBack.IDeviceCurrentWifiInfoCallBack() { // @Override // public void deviceCurrentWifiInfo(CurWifiInfo curWifiInfo) { // DialogUtils.dismiss(); // if (!isAdded() || curWifiInfo == null) { // return; // } // rlCurWifi.setVisibility(View.VISIBLE); // if (curWifiInfo.isLinkEnable()) { // wifiInfo = curWifiInfo; // tvCurrentWifi.setText(wifiInfo.getSsid()); // } // } // // @Override // public void onError(Throwable throwable) { // DialogUtils.dismiss(); // } // }); } @Override AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
@@ -10,6 +10,7 @@ import com.callBack.IAddCamera; import com.lechange.demo.R; import com.lechange.demo.tools.RootUtil; import com.mm.android.deviceaddmodule.openapi.HttpClient; import com.mm.android.deviceaddmodule.utils.SDsolutionUtility; import com.utils.HdlToLcUtils; @@ -72,7 +73,7 @@ HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com"); HdlToLcUtils.getInstance().setHomeId("1547099040465408002"); HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJhZDVmZjhmMTMzNTc0NzMyOGY0YWJhZWIyZjRkZGM4NCIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInVzZXJBY2NvdW50Ijoid3hyIiwidGVuYW50SWQiOiIyMCIsInVzZXJUeXBlIjoiVVNFUl9DIiwidG9rZW5UeXBlIjoiYWNjZXNzX3Rva2VuIiwidXNlck5hbWUiOiJrYWVkZSIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NzAzMTM5NjIsIm5iZiI6MTY3MDMwNjc2Mn0.AuGLiwcFoXhhV9zGhzR50myt-o5k1gFSZ7HzXMt_t9fzEfrByM8OG1tVDOZGbCL36dmN5bQVfgzsWrpImssB4KEybyLvGnJ85qGfXSPEG08S5tMB5eI8j0dRX4LSml-K5ViWMj021oZIG-5_ZwUv6BNasnbFTW6qPh6uy-RF3QU"); HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJjYjRjY2JkZDgxNTQ0YzY3YWIxZDJmMjVjMmQ0NGY0NyIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInVzZXJBY2NvdW50Ijoid3hyIiwidGVuYW50SWQiOiIyMCIsInVzZXJUeXBlIjoiVVNFUl9DIiwidG9rZW5UeXBlIjoiYWNjZXNzX3Rva2VuIiwidXNlck5hbWUiOiJrYWVkZSIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NzA0MDM1OTMsIm5iZiI6MTY3MDM5NjM5M30.fi6cs3nYjsVs2aFzhcJWqTTB3D7oiGlNPLNrS0itMRlb0tQvvVU7QfZ2Oc-YYJgaQ0AsqUsItG2gI9g1tDU6xFEjcB6Pi4OFDJQp7hHEKXXLzrCtIiszoxavumqHwWKKDt6S2ERm056e12nNulAHpEV5BMWoWp8GhCdaNSX2oDQ"); HdlToLcUtils.getInstance().setSubAccessToken("St_0000sgfdc5297c88a840e59264b22681"); // HdlToLcUtils.getInstance().openActivity(); @@ -82,7 +83,6 @@ } }); // HdlToLcUtils.getInstance().play("8F05F83AAG05B3A","xxxx"); } } AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -16,6 +16,7 @@ import com.mm.android.deviceaddmodule.LCDeviceEngine; import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.ProviderManager; import com.mm.android.deviceaddmodule.openapi.CONST; import com.mm.android.deviceaddmodule.openapi.HttpClient; import com.usermodule.net.IUserDataCallBack; import com.usermodule.net.UserNetManager; @@ -100,12 +101,17 @@ if(!EventBus.getDefault().isRegistered(this)){ EventBus.getDefault().register(this); } this.iAddCamera = iAddCamera; //开启添加页面 activity.startActivity(new Intent(activity.getApplication(), DeviceAddActivity.class)); HdlToLcUtils.getInstance().requestCameraPermissions(); } public void ShowErrorInfo(boolean isShow){ HttpClient.SetShowErrorInfo(isShow); } @Subscribe(threadMode = ThreadMode.MAIN) public void onGetMessage(String obj) { if (obj.equals("backXamarin")) {
