From 44fcb5966a08e6b91783cfeb89ddae26fb19600f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 十月 2022 13:14:44 +0800
Subject: [PATCH] sdk
---
AndroidOpenDemo/.idea/jarRepositories.xml | 65 ++++++++++++++++
AndroidOpenDemo/.idea/misc.xml | 17 ++++
AndroidOpenDemo/.idea/workspace.xml | 75 ++++++++++--------
AndroidOpenDemo/.idea/compiler.xml | 6 +
AndroidOpenDemo/third-zxing/build.gradle | 1
AndroidOpenDemo/app/src/main/res/values/styles.xml | 5 +
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java | 2
AndroidOpenDemo/app/src/main/AndroidManifest.xml | 19 +---
AndroidOpenDemo/.idea/gradle.xml | 21 +++++
AndroidOpenDemo/app/build.gradle | 2
10 files changed, 164 insertions(+), 49 deletions(-)
diff --git a/AndroidOpenDemo/.idea/compiler.xml b/AndroidOpenDemo/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/AndroidOpenDemo/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <bytecodeTargetLevel target="1.8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/gradle.xml b/AndroidOpenDemo/.idea/gradle.xml
new file mode 100644
index 0000000..14b7f20
--- /dev/null
+++ b/AndroidOpenDemo/.idea/gradle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GradleSettings">
+ <option name="linkedExternalProjectsSettings">
+ <GradleProjectSettings>
+ <option name="testRunner" value="GRADLE" />
+ <option name="distributionType" value="DEFAULT_WRAPPED" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="modules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/DeviceAddModule" />
+ <option value="$PROJECT_DIR$/app" />
+ <option value="$PROJECT_DIR$/third-zxing" />
+ </set>
+ </option>
+ <option name="resolveModulePerSourceSet" value="false" />
+ </GradleProjectSettings>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/jarRepositories.xml b/AndroidOpenDemo/.idea/jarRepositories.xml
new file mode 100644
index 0000000..abf8106
--- /dev/null
+++ b/AndroidOpenDemo/.idea/jarRepositories.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="jboss.community" />
+ <option name="name" value="JBoss Community repository" />
+ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="MavenRepo" />
+ <option name="name" value="MavenRepo" />
+ <option name="url" value="https://repo.maven.apache.org/maven2/" />
+ </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>
+ <remote-repository>
+ <option name="id" value="maven" />
+ <option name="name" value="maven" />
+ <option name="url" value="https://maven.aliyun.com/repository/public" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="BintrayJCenter" />
+ <option name="name" value="BintrayJCenter" />
+ <option name="url" value="https://jcenter.bintray.com/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="maven3" />
+ <option name="name" value="maven3" />
+ <option name="url" value="https://jitpack.io" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="maven2" />
+ <option name="name" value="maven2" />
+ <option name="url" value="https://maven.aliyun.com/repository/jcenter" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="Google" />
+ <option name="name" value="Google" />
+ <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/m2repository" />
+ <option name="name" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/m2repository" />
+ <option name="url" value="file:$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/m2repository" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/google/m2repository" />
+ <option name="name" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/google/m2repository" />
+ <option name="url" value="file:$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/google/m2repository" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository" />
+ <option name="name" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository" />
+ <option name="url" value="file:$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository" />
+ </remote-repository>
+ </component>
+</project>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/misc.xml b/AndroidOpenDemo/.idea/misc.xml
new file mode 100644
index 0000000..bf3939a
--- /dev/null
+++ b/AndroidOpenDemo/.idea/misc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="DesignSurface">
+ <option name="filePathToZoomLevelMap">
+ <map>
+ <entry key="DeviceAddModule/src/main/res/layout/activity_device_add.xml" value="0.13722826086956522" />
+ <entry key="DeviceAddModule/src/main/res/layout/fragment_scan.xml" value="0.13722826086956522" />
+ <entry key="app/src/main/res/drawable/transparent_divider.xml" value="0.165" />
+ <entry key="app/src/main/res/layout/activity_capture.xml" value="0.13722826086956522" />
+ <entry key="app/src/main/res/layout/activity_device_detail.xml" value="0.13722826086956522" />
+ <entry key="app/src/main/res/layout/activity_device_list.xml" value="0.13949275362318841" />
+ </map>
+ </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" />
+</project>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index b1c5ef1..f943345 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -13,13 +13,19 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="" />
+ <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$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java" 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/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/third-zxing/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/third-zxing/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" />
<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 />
@@ -68,18 +74,18 @@
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
- <item name="DeviceAddModule" type="2d1252cf:ModuleNode" />
+ <item name="third-zxing" 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="third-zxing" 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="third-zxing" type="2d1252cf:ModuleNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
<item name="build" type="c8890929:TasksNode$1" />
</path>
@@ -121,7 +127,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$" />
- <property name="memory.settings.postsync.last.time.stamp" value="1666919827702" />
+ <property name="memory.settings.postsync.last.time.stamp" value="1667178930923" />
<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" />
@@ -139,11 +145,14 @@
<recent name="$PROJECT_DIR$/app/src/main/res/layout" />
<recent name="$PROJECT_DIR$/app/src/main/java/com" />
</key>
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
+ </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="com" />
</key>
</component>
- <component name="RunManager" selected="Android App.app">
+ <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]">
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
<module name="LCAndroidSDKDemo.app" />
<option name="DEPLOY" value="true" />
@@ -224,27 +233,6 @@
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
- <configuration name="AndroidOpenDemo:DeviceAddModule [assemble]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
- <ExternalSystemSettings>
- <option name="executionName" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/DeviceAddModule" />
- <option name="externalSystemIdString" value="GRADLE" />
- <option name="scriptParameters" />
- <option name="taskDescriptions">
- <list />
- </option>
- <option name="taskNames">
- <list>
- <option value="assemble" />
- </list>
- </option>
- <option name="vmOptions" />
- </ExternalSystemSettings>
- <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
- <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
- <DebugAllEnabled>false</DebugAllEnabled>
- <method v="2" />
- </configuration>
<configuration name="AndroidOpenDemo:app [assembleDebug]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
@@ -266,10 +254,10 @@
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
- <configuration name="AndroidOpenDemo:usermodule [assembleDebug]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+ <configuration name="AndroidOpenDemo:app [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/usermodule" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$/app" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
@@ -277,7 +265,28 @@
</option>
<option name="taskNames">
<list>
- <option value="assembleDebug" />
+ <option value="assembleRelease" />
+ </list>
+ </option>
+ <option name="vmOptions" />
+ </ExternalSystemSettings>
+ <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+ <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+ <DebugAllEnabled>false</DebugAllEnabled>
+ <method v="2" />
+ </configuration>
+ <configuration name="AndroidOpenDemo:third-zxing [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+ <ExternalSystemSettings>
+ <option name="executionName" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$/third-zxing" />
+ <option name="externalSystemIdString" value="GRADLE" />
+ <option name="scriptParameters" />
+ <option name="taskDescriptions">
+ <list />
+ </option>
+ <option name="taskNames">
+ <list>
+ <option value="assembleRelease" />
</list>
</option>
<option name="vmOptions" />
@@ -310,11 +319,11 @@
</configuration>
<recent_temporary>
<list>
+ <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]" />
<item itemvalue="Gradle.AndroidOpenDemo:usermodule [assembleRelease]" />
- <item itemvalue="Gradle.AndroidOpenDemo:usermodule [assembleDebug]" />
- <item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assemble]" />
</list>
</recent_temporary>
</component>
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java
index 5490766..eba13db 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java
@@ -124,7 +124,7 @@
private void initParam(CommonParam commonParam) throws Exception {
userId = TextUtils.isEmpty(commonParam.getUserId()) ? commonParam.getAppId() : commonParam.getUserId();
//浼犲叆鍙傛暟 AppId SecretKey 鐜鍒囨崲
- CONST.makeEnv(commonParam.getEnvirment(), commonParam.getAppId(), commonParam.getAppSecret());
+ CONST.makeEnv(commonParam.getEnvirment(), commonParam.getAppId(), commonParam.getAppSecret());//
ContextHelper.init(commonParam.getContext());
new EnvironmentConfig.Builder().setContext(commonParam.getContext()).build();
initImageLoader(commonParam.getContext());
diff --git a/AndroidOpenDemo/app/build.gradle b/AndroidOpenDemo/app/build.gradle
index ddafcf2..3d8be28 100644
--- a/AndroidOpenDemo/app/build.gradle
+++ b/AndroidOpenDemo/app/build.gradle
@@ -83,7 +83,7 @@
//// implementation("com.android.support:support-v4:28.0.0")
//}
-apply plugin: 'com.android.application'
+apply plugin: 'com.android.library'
repositories {
flatDir {
dirs 'libs'
diff --git a/AndroidOpenDemo/app/src/main/AndroidManifest.xml b/AndroidOpenDemo/app/src/main/AndroidManifest.xml
index f4f2a99..7452388 100644
--- a/AndroidOpenDemo/app/src/main/AndroidManifest.xml
+++ b/AndroidOpenDemo/app/src/main/AndroidManifest.xml
@@ -6,43 +6,33 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <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>
<activity
android:name=".ui.EnvGuideActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
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: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: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:screenOrientation="portrait"></activity>
<activity
android:name=".ui.DeviceRecordListActivity"
@@ -55,6 +45,7 @@
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:exported="false"
+ android:theme="@style/device_page_style"
android:screenOrientation="portrait"></activity>
</application>
</manifest>
\ No newline at end of file
diff --git a/AndroidOpenDemo/app/src/main/res/values/styles.xml b/AndroidOpenDemo/app/src/main/res/values/styles.xml
index 2f3a3e5..cca61c2 100644
--- a/AndroidOpenDemo/app/src/main/res/values/styles.xml
+++ b/AndroidOpenDemo/app/src/main/res/values/styles.xml
@@ -45,4 +45,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">#FF000000</item>
+ <item name="android:windowIsTranslucent">false</item>
+ <item name="android:statusBarColor">#000000</item>
+ </style>
</resources>
diff --git a/AndroidOpenDemo/third-zxing/build.gradle b/AndroidOpenDemo/third-zxing/build.gradle
index cee6dd4..eaa7e5f 100644
--- a/AndroidOpenDemo/third-zxing/build.gradle
+++ b/AndroidOpenDemo/third-zxing/build.gradle
@@ -33,6 +33,7 @@
dependencies {
api fileTree(include: ['*.jar'], dir: 'libs')
+// compileOnly fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
--
Gitblit v1.8.0