From 85672663b8253555f28759f8670727e2c391af8b Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 06 十一月 2025 14:59:18 +0800
Subject: [PATCH] save
---
AndroidOpenDemo/build.gradle | 6
AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml | 12 -
AndroidOpenDemo/app/src/main/AndroidManifest.xml | 32 ++--
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java | 3
AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml | 12 -
AndroidOpenDemo/.idea/jarRepositories.xml | 10 +
/dev/null | 0
AndroidOpenDemo/.idea/misc.xml | 3
AndroidOpenDemo/.idea/workspace.xml | 116 +++++++--------
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 8
.idea/workspace.xml | 42 ++++-
.DS_Store | 0
AndroidOpenDemo/.idea/gradle.xml | 6
AndroidOpenDemo/app/build.gradle | 152 ++++++++++----------
AndroidOpenDemo/.DS_Store | 0
15 files changed, 205 insertions(+), 197 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 150cb97..2bf18b3 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index eccbee7..45401ff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="AutoImportSettings">
+ <option name="autoReloadType" value="NONE" />
+ </component>
<component name="ChangeListManager">
- <list default="true" id="65c1ada5-6f56-4f18-9096-9578840f8ac4" name="Default Changelist" comment="" />
+ <list default="true" id="65c1ada5-6f56-4f18-9096-9578840f8ac4" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/.idea/gradle.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/.idea/jarRepositories.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/app/build.gradle" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/app/src/main/AndroidManifest.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/AndroidOpenDemo/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/AndroidOpenDemo/build.gradle" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -10,6 +24,9 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
+ <component name="MarkdownSettingsMigration">
+ <option name="stateVersion" value="1" />
+ </component>
<component name="ProjectId" id="2Hq3DqbkspUmNCGD5OprF7fRXne" />
<component name="ProjectViewState">
<option name="autoscrollFromSource" value="true" />
@@ -17,18 +34,17 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">
- <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
- <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
- <property name="android.project.structure.last.selected" value="SDK Location" />
- <property name="android.project.structure.proportion" value="0.15" />
- <property name="android.sdk.path" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="SDK Location" />
- <property name="project.structure.proportion" value="0.17" />
- <property name="project.structure.side.proportion" value="0.0" />
- <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
- </component>
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "cidr.known.project.marker": "true",
+ "dart.analysis.tool.window.visible": "false",
+ "last_opened_file_path": "/Users/kaede/Desktop/Projcect/HdlToLc"
+ }
+}</component>
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration />
</component>
diff --git a/AndroidOpenDemo/.DS_Store b/AndroidOpenDemo/.DS_Store
index 934bb39..d8e4986 100644
--- a/AndroidOpenDemo/.DS_Store
+++ b/AndroidOpenDemo/.DS_Store
Binary files differ
diff --git a/AndroidOpenDemo/.idea/gradle.xml b/AndroidOpenDemo/.idea/gradle.xml
index 1cb3e37..63cb224 100644
--- a/AndroidOpenDemo/.idea/gradle.xml
+++ b/AndroidOpenDemo/.idea/gradle.xml
@@ -4,9 +4,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="testRunner" value="GRADLE" />
- <option name="distributionType" value="DEFAULT_WRAPPED" />
+ <option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleJvm" value="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@@ -15,7 +15,7 @@
<option value="$PROJECT_DIR$/third-zxing" />
</set>
</option>
- <option name="resolveModulePerSourceSet" value="false" />
+ <option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
diff --git a/AndroidOpenDemo/.idea/jarRepositories.xml b/AndroidOpenDemo/.idea/jarRepositories.xml
index 7da122d..6ca57f0 100644
--- a/AndroidOpenDemo/.idea/jarRepositories.xml
+++ b/AndroidOpenDemo/.idea/jarRepositories.xml
@@ -66,5 +66,15 @@
<option name="name" value="MavenLocal" />
<option name="url" value="file:/$USER_HOME$/.m2/repository" />
</remote-repository>
+ <remote-repository>
+ <option name="id" value="maven3" />
+ <option name="name" value="maven3" />
+ <option name="url" value="https://maven.aliyun.com/repository/google" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="MavenLocal" />
+ <option name="name" value="MavenLocal" />
+ <option name="url" value="file:$USER_HOME$/.m2/repository/" />
+ </remote-repository>
</component>
</project>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/misc.xml b/AndroidOpenDemo/.idea/misc.xml
index 25d9fc2..e5103b4 100644
--- a/AndroidOpenDemo/.idea/misc.xml
+++ b/AndroidOpenDemo/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
@@ -19,5 +18,5 @@
</option>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml b/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml
index bf41ec4..59d8afd 100644
--- a/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml
+++ b/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml
@@ -3,24 +3,18 @@
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
- <option name="GRADLE_PROJECT_PATH" value=":DeviceAddModule" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.2.1" />
- <option name="LAST_KNOWN_AGP_VERSION" value="3.2.1" />
+ <option name="LAST_KNOWN_AGP_VERSION" value="4.2.0" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
- <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
- <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
- <afterSyncTasks>
- <task>generateDebugSources</task>
- </afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
- <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable-hdpi;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable-xhdpi;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable-xxhdpi;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/anim;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/color;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/values;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/values-en;file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/layout;file://$MODULE_DIR$/../../../DeviceAddModule/src/debug/res;file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/res/resValues/debug" />
- <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../DeviceAddModule/src/androidTest/res;file://$MODULE_DIR$/../../../DeviceAddModule/src/androidTestDebug/res;file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/res/resValues/androidTest/debug" />
+ <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
+ <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="PROJECT_TYPE" value="1" />
</configuration>
diff --git a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
index 2b01d31..8bd9765 100644
--- a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
+++ b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
@@ -3,24 +3,18 @@
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
- <option name="GRADLE_PROJECT_PATH" value=":app" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.2.1" />
- <option name="LAST_KNOWN_AGP_VERSION" value="3.2.1" />
+ <option name="LAST_KNOWN_AGP_VERSION" value="4.2.0" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
- <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
- <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
- <afterSyncTasks>
- <task>generateDebugSources</task>
- </afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
- <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="RES_FOLDERS_RELATIVE_PATH" value="" />
+ <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 9c82473..3990dd9 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -14,21 +14,25 @@
</component>
<component name="ChangeListManager">
<list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/../.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.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/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules/app/LCAndroidSDKDemo.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/LCAndroidSDKDemo.app.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/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" 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/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/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.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$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" 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[3TG0221602005112]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -54,41 +58,7 @@
</task>
<projects_view>
<tree_state>
- <expand>
- <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="Tasks" type="e4a08cd1:TasksNode" />
- </path>
- <path>
- <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
- <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
- <item name="Tasks" type="e4a08cd1:TasksNode" />
- <item name="other" type="c8890929:TasksNode$1" />
- </path>
- <path>
- <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
- <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
- <item name="DeviceAddModule" type="2d1252cf:ModuleNode" />
- </path>
- <path>
- <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
- <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
- <item name="DeviceAddModule" 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="DeviceAddModule" type="2d1252cf:ModuleNode" />
- <item name="Tasks" type="e4a08cd1:TasksNode" />
- <item name="build" type="c8890929:TasksNode$1" />
- </path>
- </expand>
+ <expand />
<select />
</tree_state>
</projects_view>
@@ -113,27 +83,25 @@
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
+ <component name="MarkdownSettingsMigration">
+ <option name="stateVersion" value="1" />
+ </component>
<component name="ProjectId" id="2GbnTVSNHOrZKruVIHhs1dxppdJ" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">
- <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
- <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
- <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
- <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <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$" />
- <property name="memory.settings.postsync.last.time.stamp" value="1676946748415" />
- <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" />
- <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
- <property name="show.migrate.to.gradle.popup" value="false" />
- </component>
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "cidr.known.project.marker": "true",
+ "dart.analysis.tool.window.visible": "false",
+ "last_opened_file_path": "/Users/kaede/Desktop/Projcect/HdlToLc/AndroidOpenDemo",
+ "memory.settings.postsync.last.time.stamp": "1735799587531",
+ "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
+ }
+}</component>
<component name="PsdUISettings">
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
</component>
@@ -152,7 +120,7 @@
<recent name="com" />
</key>
</component>
- <component name="RunManager" selected="Gradle.AndroidOpenDemo [assembleRelease]">
+ <component name="RunManager" selected="Android App.app">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -160,24 +128,28 @@
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method>
</configuration>
- <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+ <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="LCAndroidSDKDemo.app" />
+ <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
<option name="DEPLOY" value="true" />
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="ALL_USERS" value="false" />
- <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+ <option name="ALWAYS_INSTALL_WITH_PM" value="true" />
+ <option name="ALLOW_ASSUME_VERIFIED" value="false" />
+ <option name="CLEAR_APP_STORAGE" value="false" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
+ <option name="RESTORE_ENABLED" value="false" />
+ <option name="RESTORE_FILE" value="" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+ <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+ <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />
<Auto>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -185,6 +157,8 @@
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
+ <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+ <option name="DEBUG_SANDBOX_SDK" value="false" />
</Auto>
<Hybrid>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -192,14 +166,21 @@
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
+ <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+ <option name="DEBUG_SANDBOX_SDK" value="false" />
</Hybrid>
- <Java />
+ <Java>
+ <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+ <option name="DEBUG_SANDBOX_SDK" value="false" />
+ </Java>
<Native>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
<option name="SHOW_STATIC_VARS" value="true" />
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
+ <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+ <option name="DEBUG_SANDBOX_SDK" value="false" />
</Native>
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
@@ -210,6 +191,7 @@
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
</Profilers>
<option name="DEEP_LINK" value="" />
+ <option name="ACTIVITY" value="" />
<option name="ACTIVITY_CLASS" value="" />
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
@@ -236,6 +218,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
+ <RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:DeviceAddModule [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -257,6 +240,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
+ <RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:app [assembleDebug]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -278,6 +262,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
+ <RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:app [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -299,6 +284,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
+ <RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:third-zxing [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -320,8 +306,17 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
+ <RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
+ <list>
+ <item itemvalue="Android App.app" />
+ <item itemvalue="Gradle.AndroidOpenDemo [assembleRelease]" />
+ <item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]" />
+ <item itemvalue="Gradle.AndroidOpenDemo:app [assembleDebug]" />
+ <item itemvalue="Gradle.AndroidOpenDemo:app [assembleRelease]" />
+ <item itemvalue="Gradle.AndroidOpenDemo:third-zxing [assembleRelease]" />
+ </list>
<recent_temporary>
<list>
<item itemvalue="Gradle.AndroidOpenDemo [assembleRelease]" />
@@ -356,7 +351,6 @@
</entry>
</map>
</option>
- <option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<ignored-roots>
diff --git a/AndroidOpenDemo/DeviceAddModule/.DS_Store b/AndroidOpenDemo/DeviceAddModule/.DS_Store
deleted file mode 100644
index 8670191..0000000
--- a/AndroidOpenDemo/DeviceAddModule/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/AndroidOpenDemo/DeviceAddModule/libs/.DS_Store b/AndroidOpenDemo/DeviceAddModule/libs/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
--- a/AndroidOpenDemo/DeviceAddModule/libs/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/AndroidOpenDemo/app/.DS_Store b/AndroidOpenDemo/app/.DS_Store
deleted file mode 100644
index 3aa2362..0000000
--- a/AndroidOpenDemo/app/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/AndroidOpenDemo/app/build.gradle b/AndroidOpenDemo/app/build.gradle
index ae6d3c1..96617d7 100644
--- a/AndroidOpenDemo/app/build.gradle
+++ b/AndroidOpenDemo/app/build.gradle
@@ -1,5 +1,5 @@
//杩愯
-/*apply plugin: 'com.android.application'
+apply plugin: 'com.android.application'
repositories {
flatDir {
dirs 'libs'
@@ -71,80 +71,80 @@
// annotationProcessor 'com.alibaba:arouter-compiler:1.2.2'
implementation("com.android.support:support-v4:28.0.0")
-}*/
+}
//鎵撳寘
-apply plugin: 'com.android.library'
-repositories {
- flatDir {
- dirs 'libs'
- }
-}
-android {
- compileSdkVersion 29
- buildToolsVersion "30.0.1"
- defaultConfig {
-// applicationId "com.lechange.demo.a"
- minSdkVersion 21
- //noinspection ExpiredTargetSdkVersion
- targetSdkVersion 26
- versionCode 1
- versionName "1.0"
- testInstrumentationRunner "android.test.runner.AndroidJUnitRunner"
- ndk{
- abiFilters "arm64-v8a"
- }
-
- javaCompileOptions {
- annotationProcessorOptions {
- arguments = [ AROUTER_MODULE_NAME : project.getName() ]
- }
- }
- }
- signingConfigs {
- debug {
- keyAlias 'key'
- keyPassword 'lcmobile'
- storeFile file('demo.keystore')
- storePassword 'lcmobile'
- }
- release {
- keyAlias 'key'
- keyPassword 'lcmobile'
- storeFile file('demo.keystore')
- storePassword 'lcmobile'
- }
- }
- buildTypes {
- release {
- minifyEnabled false
- signingConfig signingConfigs.getByName('release')
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- android {
- lintOptions {
- abortOnError false
- }
- }
-
-}
-
-
-def releaseTime() {
- return new Date().format("yyyyMMdd")
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
- api project(':DeviceAddModule')
- //api 'com.alibaba:arouter-compiler:1.2.2'
-
-// annotationProcessor 'com.alibaba:arouter-compiler:1.2.2'
-
- implementation("com.android.support:support-v4:28.0.0")
-}
-
+//apply plugin: 'com.android.library'
+//repositories {
+// flatDir {
+// dirs 'libs'
+// }
+//}
+//android {
+// compileSdkVersion 29
+// buildToolsVersion "30.0.1"
+// defaultConfig {
+//// applicationId "com.lechange.demo.a"
+// minSdkVersion 21
+// //noinspection ExpiredTargetSdkVersion
+// targetSdkVersion 26
+// versionCode 1
+// versionName "1.0"
+// testInstrumentationRunner "android.test.runner.AndroidJUnitRunner"
+// ndk{
+// abiFilters "arm64-v8a"
+// }
+//
+// javaCompileOptions {
+// annotationProcessorOptions {
+// arguments = [ AROUTER_MODULE_NAME : project.getName() ]
+// }
+// }
+// }
+// signingConfigs {
+// debug {
+// keyAlias 'key'
+// keyPassword 'lcmobile'
+// storeFile file('demo.keystore')
+// storePassword 'lcmobile'
+// }
+// release {
+// keyAlias 'key'
+// keyPassword 'lcmobile'
+// storeFile file('demo.keystore')
+// storePassword 'lcmobile'
+// }
+// }
+// buildTypes {
+// release {
+// minifyEnabled false
+// signingConfig signingConfigs.getByName('release')
+// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+// }
+// }
+// android {
+// lintOptions {
+// abortOnError false
+// }
+// }
+//
+//}
+//
+//
+//def releaseTime() {
+// return new Date().format("yyyyMMdd")
+//}
+//
+//dependencies {
+// implementation fileTree(dir: 'libs', include: ['*.jar'])
+// testImplementation 'junit:junit:4.12'
+// androidTestImplementation 'com.android.support.test:runner:1.0.2'
+// androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+// api project(':DeviceAddModule')
+// //api 'com.alibaba:arouter-compiler:1.2.2'
+//
+//// annotationProcessor 'com.alibaba:arouter-compiler:1.2.2'
+//
+// implementation("com.android.support:support-v4:28.0.0")
+//}
+//
diff --git a/AndroidOpenDemo/app/src/main/AndroidManifest.xml b/AndroidOpenDemo/app/src/main/AndroidManifest.xml
index 292c7b6..63d59c1 100644
--- a/AndroidOpenDemo/app/src/main/AndroidManifest.xml
+++ b/AndroidOpenDemo/app/src/main/AndroidManifest.xml
@@ -6,28 +6,28 @@
<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"-->
- <!-- >-->
+<!-- <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/AppTheme"
android:screenOrientation="portrait">
- <!-- <intent-filter>-->
- <!-- <action android:name="android.intent.action.MAIN" />-->
- <!-- <category android:name="android.intent.category.LAUNCHER" />-->
- <!-- </intent-filter>-->
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
</activity>
<activity
android:name=".ui.DeviceListActivity"
diff --git a/AndroidOpenDemo/app/src/main/java/com/.DS_Store b/AndroidOpenDemo/app/src/main/java/com/.DS_Store
deleted file mode 100644
index 26c154e..0000000
--- a/AndroidOpenDemo/app/src/main/java/com/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store
deleted file mode 100644
index 7d59bac..0000000
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store
+++ /dev/null
Binary files differ
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 57a8016..0160d85 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
@@ -178,6 +178,7 @@
initView();
initData();
operatePTZ();
+
}
protected void requestedOrientation(int requestedOrientation, boolean isForce) {
@@ -1213,7 +1214,7 @@
llSound.setClickable(false);//澹伴煶鎸夐挳涓嶅厑璁哥偣鍑�
LCOpenSDK_Talk.setListener(audioTalkerListener);//瀵硅鍓嶅厛璁惧鐩戝惉
int channelId = -1;
-
+ Log.d("wxr", "startTalk: "+deviceListBean.channelNum);
if( Integer.parseInt(deviceListBean.channelNum)> 1) {
/* if(null != deviceListBean.channels.get(deviceListBean.checkedChannel).channelId && !"".equals(deviceListBean.channels.get(deviceListBean.checkedChannel).channelId)) {
channelId = Integer.parseInt(deviceListBean.channels.get(deviceListBean.checkedChannel).channelId);
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 8116998..8207958 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
@@ -66,10 +66,10 @@
int id = v.getId();
if (id == R.id.tv_title_cn) {
} else if (id == R.id.tv_overseas) {
- HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com");
- HdlToLcUtils.getInstance().setHomeId("1633667926249299969");
- HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI1NGQwODRhOTljZWY0YTlhYTU2YTE0ZDFiOTU2OGRkYyIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoic3hjXzAwNCIsInVzZXJEYXRhUmlnaHQiOiIxIiwib3BlbkFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTU3NTA1OTM5MDAzMjYyNTY2NiIsImV4cCI6MTY3ODkzNjcwMywibmJmIjoxNjc4OTI5NTAzfQ.DT2ZaZrBy8aPW-EHSjzo_gbqWIQu38p6Qsi6fqzEwUv9anfTxPD7KkvvDErtm9VhTP7S2j-Os5LRjwDstQc-em8Jiqe4wGYTJ3GVHCrVLKIqTAnVIMOSJMLFB0ohUSsoN81lSVjoW9hmwR_w7B2UGOVHOL6Hr9xB_7jZuh8W7RQ");
- HdlToLcUtils.getInstance().setSubAccessToken("St_0000sgf1760a76afb2431dadb9cc60e3");
+ HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP", "CPL345bn28gHnvi9G4tYbq3cTYkiHC", "https://bahrain-gateway.hdlcontrol.com");
+ HdlToLcUtils.getInstance().setHomeId("1631583489561632770");
+ HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIxZWU2ODQ3YmQ2N2M0ZDE5YmY2MjA2MDliMzU4MDRiNSIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInVzZXJBY2NvdW50Ijoic3VwcG9ydDdAaGRsYXV0b21hdGlvbi5jb20iLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0MiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ium7hOS8n-S5kCIsInVzZXJEYXRhUmlnaHQiOiIxIiwib3BlbkFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTQxNTIzNDEwMDUwNzE5NzQ0MiIsImV4cCI6MTczMzMwNjUyMywibmJmIjoxNzMzMjk5MzIzfQ.DFVKLtKczjZwMPcPpdlsdmoD9mxDk5FpQyLlJMVxdrKNagoSeXMAJPLvxKXcHaVwtDXFsoGc0FpZdWT4F97hAETZ7xhseyDMKa-gs6TR2ZzYeepqZk7TXr-iavVi1Nib52_6-O7lrcz16wOdKaeYfmGcslcYbisWBpcZXGolqIs");
+ HdlToLcUtils.getInstance().setSubAccessToken("St_0000sg75c4641e83df43f387968f05e7");
}
HdlToLcUtils.getInstance().openActivity();
diff --git a/AndroidOpenDemo/app/src/main/res/.DS_Store b/AndroidOpenDemo/app/src/main/res/.DS_Store
deleted file mode 100644
index eeff520..0000000
--- a/AndroidOpenDemo/app/src/main/res/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/AndroidOpenDemo/build.gradle b/AndroidOpenDemo/build.gradle
index a7039c2..3941dc6 100644
--- a/AndroidOpenDemo/build.gradle
+++ b/AndroidOpenDemo/build.gradle
@@ -11,8 +11,9 @@
}
dependencies {
- classpath "com.android.tools.build:gradle:4.1.2"
+ classpath 'com.android.tools.build:gradle:4.2.0'
classpath 'com.alibaba:arouter-compiler:1.2.2'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -24,10 +25,9 @@
mavenLocal()
maven { url 'https://maven.aliyun.com/repository/public' }
maven { url 'https://maven.aliyun.com/repository/jcenter' }
+ maven { url 'https://maven.aliyun.com/repository/google' }
mavenCentral()
maven { url 'https://jitpack.io' }
- google()
-
}
}
diff --git a/AndroidOpenDemo/third-zxing/.DS_Store b/AndroidOpenDemo/third-zxing/.DS_Store
deleted file mode 100644
index b41bb67..0000000
--- a/AndroidOpenDemo/third-zxing/.DS_Store
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0