.DS_StoreBinary files differ
AndroidOpenDemo/.DS_StoreBinary files differ
AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_DHMobileToolset_1_1_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_DHScanner_1_0_7_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_PullToRefreshListView_release_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.xml
File was deleted AndroidOpenDemo/.idea/workspace.xml
@@ -15,23 +15,26 @@ </component> <component name="ChangeListManager"> <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/dialog/RecoverSDCardDialog.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_sd_card_reconver.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> <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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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$/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/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/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$/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" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[364c4b3158493098]" /> <component name="ExternalProjectsData"> <projectState path="$PROJECT_DIR$"> <ProjectState /> @@ -134,7 +137,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="1669278541025" /> <property name="memory.settings.postsync.last.time.stamp" value="1670203339524" /> <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" /> @@ -159,7 +162,7 @@ <recent name="com" /> </key> </component> <component name="RunManager" selected="Android App.app"> <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]"> <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> <option name="TEST_OBJECT" value="class" /> <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> @@ -373,14 +376,16 @@ </ignored-roots> </component> <component name="XDebuggerManager"> <breakpoint-manager> <breakpoints> <line-breakpoint enabled="true" suspend="THREAD" type="java-line"> <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java</url> <line>285</line> <option name="timeStamp" value="141" /> </line-breakpoint> </breakpoints> </breakpoint-manager> <watches-manager> <configuration name="app"> <watch expression="openApi" language="JAVA" /> <watch expression="new Gson().fromJson(openApi,JsonObject.class);" language="JAVA" /> <watch expression="e.getMessage()" language="JAVA" /> <watch expression="exception" language="JAVA" /> <watch expression="jsonResult.get("msg").getAsString()" language="JAVA" /> <watch expression="jsonObject" language="JAVA" /> <watch expression="jsonResult.get("code").getAsString()" language="JAVA" /> </configuration> </watches-manager> </component> </project> AndroidOpenDemo/DeviceAddModule/.DS_StoreBinary files differ
AndroidOpenDemo/DeviceAddModule/build.gradle
@@ -61,7 +61,7 @@ // compile project(':LcOpenSDk') api project(':third-zxing') api "org.greenrobot:eventbus:3.0.0" // api "org.greenrobot:eventbus:3.0.0" api 'com.google.code.gson:gson:2.8.1' api "com.android.support:recyclerview-v7:28.0.0" AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
@@ -53,8 +53,13 @@ } String code = jsonResult.get("code").getAsString(); if (!"0".equals(code)) { String msg = jsonResult.get("msg").getAsString(); throw new BusinessException(code + msg); 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); } } JsonObject jsonData = new JsonObject(); @@ -106,7 +111,11 @@ LogUtil.debugLog(TAG, "reqest: " + url + " data:" + json); String openApi = HttpClient.post(url, json, "application/json", "OpenApi",timeOut); LogUtil.debugLog(TAG, "返回结果: \r\n" + openApi); jsonObject = new JsonParser().parse(openApi).getAsJsonObject(); try { jsonObject = new JsonParser().parse(openApi).getAsJsonObject(); }catch (Exception exception){ jsonObject = new Gson().fromJson(openApi,JsonObject.class); } } catch (IOException e) { BusinessException b = new BusinessException(e); if (e instanceof ConnectTimeoutException || e instanceof SocketTimeoutException AndroidOpenDemo/app/.DS_StoreBinary files differ
AndroidOpenDemo/app/src/main/AndroidManifest.xml
@@ -7,46 +7,62 @@ <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:theme="@style/device_page_style" android:theme="@style/AppTheme" 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:theme="@style/AppTheme" 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:theme="@style/AppTheme" 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:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> <activity android:name=".ui.DeviceRecordListActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:exported="false" android:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> <activity android:name=".ui.DeviceRecordPlayActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:exported="false" android:theme="@style/device_page_style" android:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> </application> </manifest> AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
@@ -68,20 +68,20 @@ } else if (id == R.id.tv_overseas) { } HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com"); HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com"); HdlToLcUtils.getInstance().setHomeId("1547099040465408002"); HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJiZTAzNDE1MTZkMDg0YmNhOGZjM2U5ZTA3OWMzZWY5ZSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2Njk4NzAxNjQsIm5iZiI6MTY2OTg2Mjk2NH0.kCDl6u7hL4bS-tpf5f_jEQ1Hjhj2_65v3cDJBbvVpfOYE8k6NShJjyIVHLUaY0EXWygF6uc-w9izNWksGHWKPOE_7BWnwJrHAJKq6hxbhhJ-9LjU0AG2p9Wxf48CeAyHyT5l71IAoUA_25rZi4GwXB6OkGYbO4-i-L0ZjszJUJU"); HdlToLcUtils.getInstance().setSubAccessToken("St_00009ed748c2b03f4100b6ea97a37466"); HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJhZDVmZjhmMTMzNTc0NzMyOGY0YWJhZWIyZjRkZGM4NCIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInVzZXJBY2NvdW50Ijoid3hyIiwidGVuYW50SWQiOiIyMCIsInVzZXJUeXBlIjoiVVNFUl9DIiwidG9rZW5UeXBlIjoiYWNjZXNzX3Rva2VuIiwidXNlck5hbWUiOiJrYWVkZSIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NzAzMTM5NjIsIm5iZiI6MTY3MDMwNjc2Mn0.AuGLiwcFoXhhV9zGhzR50myt-o5k1gFSZ7HzXMt_t9fzEfrByM8OG1tVDOZGbCL36dmN5bQVfgzsWrpImssB4KEybyLvGnJ85qGfXSPEG08S5tMB5eI8j0dRX4LSml-K5ViWMj021oZIG-5_ZwUv6BNasnbFTW6qPh6uy-RF3QU"); HdlToLcUtils.getInstance().setSubAccessToken("St_0000sgfdc5297c88a840e59264b22681"); // HdlToLcUtils.getInstance().openActivity(); // HdlToLcUtils.getInstance().addCamera(new IAddCamera() { // @Override // public void back() { // // } // }); HdlToLcUtils.getInstance().play("8F05F83AAG05B3A","xxxx"); HdlToLcUtils.getInstance().addCamera(new IAddCamera() { @Override public void back() { } }); // HdlToLcUtils.getInstance().play("8F05F83AAG05B3A","xxxx"); }
@@ -102,6 +102,7 @@ } //开启添加页面 activity.startActivity(new Intent(activity.getApplication(), DeviceAddActivity.class)); HdlToLcUtils.getInstance().requestCameraPermissions(); } @@ -173,6 +174,47 @@ }); } public boolean checkCameraPermissions(){ boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; return isGranted; } /** * 请求摄像头全下 */ public void requestCameraPermissions(){ boolean isMinSDKM = Build.VERSION.SDK_INT < 23; boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; if (isMinSDKM || isGranted) { return; } requestRecordCameraPermission(); } private void requestRecordCameraPermission() { if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA) || ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) || ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.READ_EXTERNAL_STORAGE)) { ActivityCompat.requestPermissions(activity, new String[]{ Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, 1); } else { ActivityCompat.requestPermissions(activity, new String[]{ Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, 1); } } /** * 请求对讲权限 AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
@@ -36,6 +36,7 @@ android:layout_marginRight="@dimen/px_30" android:layout_toLeftOf="@id/iv_device_pic" android:singleLine="true" android:visibility="gone" android:textColor="@color/lc_demo_color_2c2c2c" android:textSize="@dimen/px_36"></TextView>
@@ -11,6 +11,7 @@ android:layout_height="@dimen/px_130" android:background="@color/lc_demo_color_ffffff" android:gravity="center_vertical" android:visibility="gone" android:paddingLeft="@dimen/px_30" android:paddingRight="@dimen/px_30">
@@ -1,13 +1,14 @@ <resources> <!-- Base application theme. --> <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppThemeLc" parent="Theme.AppCompat.NoActionBar"> <!-- Customize your theme here. --> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> <item name="background_color">#FFF2F3F7</item> <item name="background_color">#F2F3F7</item> <item name="android:windowNoTitle">true</item> <item name="android:windowIsTranslucent">false</item> </style> <style name="lc_demo_loading" parent="@android:style/Widget.ProgressBar"> <item name="android:indeterminateOnly">true</item> @@ -47,9 +48,9 @@ <item name="android:textCursorDrawable">@drawable/common_edit_text_cursor_bg</item> <item name="android:textSize">15sp</item> </style> <style name="device_page_style" parent="@style/Theme.AppCompat.NoActionBar"> <item name="background_color">#FFF2F3F7</item> <style name="AppTheme" parent="@style/Theme.AppCompat.NoActionBar"> <item name="background_color">#F2F3F7</item> <item name="android:windowIsTranslucent">false</item> <item name="android:statusBarColor">#FFFFFFFF</item> <item name="android:statusBarColor">#232323</item> </style> </resources> AndroidOpenDemo/third-zxing/src/main/res/values/colors_ui.xml
@@ -30,4 +30,5 @@ <!--新UI规范颜色值统一命名--> <color name="color5">#424243</color> <color name="color9">#cccccc</color> <color name="white">#FFFFFF</color> </resources>
