From 7307444d2d7c8d48fbf44c1770aa63187e795e28 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期四, 17 八月 2023 11:39:18 +0800
Subject: [PATCH] 切换为打包模式
---
AndroidOpenDemo/.idea/jarRepositories.xml | 5 +
AndroidOpenDemo/build.gradle | 2
AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 38 ++++----
AndroidOpenDemo/.idea/misc.xml | 1
AndroidOpenDemo/.idea/workspace.xml | 37 ++++++---
AndroidOpenDemo/app/src/main/AndroidManifest.xml | 31 ++++---
AndroidOpenDemo/DeviceAddModule/build.gradle | 1
AndroidOpenDemo/app/build.gradle | 79 +++++++++++++++++++
AndroidOpenDemo/gradle/wrapper/gradle-wrapper.properties | 2
9 files changed, 147 insertions(+), 49 deletions(-)
diff --git a/AndroidOpenDemo/.idea/jarRepositories.xml b/AndroidOpenDemo/.idea/jarRepositories.xml
index abf8106..7da122d 100644
--- a/AndroidOpenDemo/.idea/jarRepositories.xml
+++ b/AndroidOpenDemo/.idea/jarRepositories.xml
@@ -61,5 +61,10 @@
<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>
+ <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 d8f4e50..25d9fc2 100644
--- a/AndroidOpenDemo/.idea/misc.xml
+++ b/AndroidOpenDemo/.idea/misc.xml
@@ -3,6 +3,7 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
+ <entry key="..\:/HDL/ProjectCode/HdlToLc/AndroidOpenDemo/app/src/main/res/layout/activity_environment_guide.xml" value="0.3536458333333333" />
<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" />
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 47c46f0..9c82473 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -14,14 +14,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
+ <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/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/mobilecommon/base/BaseFragmentActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.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/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/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$/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" />
@@ -48,12 +49,26 @@
<task path="$PROJECT_DIR$/third-zxing">
<activation />
</task>
+ <task path="$PROJECT_DIR$">
+ <activation />
+ </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" />
@@ -111,7 +126,7 @@
<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$/app/src/main/res/layout" />
+ <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" />
@@ -137,7 +152,7 @@
<recent name="com" />
</key>
</component>
- <component name="RunManager" selected="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]">
+ <component name="RunManager" selected="Gradle.AndroidOpenDemo [assembleRelease]">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -163,8 +178,6 @@
<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" />
@@ -204,10 +217,10 @@
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method>
</configuration>
- <configuration name="AndroidOpenDemo:DeviceAddModule [assembleDebug]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+ <configuration name="AndroidOpenDemo [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/DeviceAddModule" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
@@ -215,7 +228,7 @@
</option>
<option name="taskNames">
<list>
- <option value="assembleDebug" />
+ <option value="assembleRelease" />
</list>
</option>
<option name="vmOptions" />
@@ -311,11 +324,11 @@
</configuration>
<recent_temporary>
<list>
+ <item itemvalue="Gradle.AndroidOpenDemo [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>
diff --git a/AndroidOpenDemo/DeviceAddModule/build.gradle b/AndroidOpenDemo/DeviceAddModule/build.gradle
index 395f444..22f9e9d 100644
--- a/AndroidOpenDemo/DeviceAddModule/build.gradle
+++ b/AndroidOpenDemo/DeviceAddModule/build.gradle
@@ -76,6 +76,7 @@
api 'com.alibaba:arouter-api:1.4.1'
api 'com.alibaba:arouter-annotation:1.0.6'
+
}
configurations {
all*.exclude group: 'com.google.zxing'
diff --git a/AndroidOpenDemo/app/build.gradle b/AndroidOpenDemo/app/build.gradle
index c7a2af1..ae6d3c1 100644
--- a/AndroidOpenDemo/app/build.gradle
+++ b/AndroidOpenDemo/app/build.gradle
@@ -1,4 +1,80 @@
-apply plugin: 'com.android.application'
+//杩愯
+/*apply plugin: 'com.android.application'
+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'
@@ -71,3 +147,4 @@
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 2e0f79d..292c7b6 100644
--- a/AndroidOpenDemo/app/src/main/AndroidManifest.xml
+++ b/AndroidOpenDemo/app/src/main/AndroidManifest.xml
@@ -6,27 +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/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index 8dc4320..5f98b60 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -57,7 +57,7 @@
return instance;
}
- public void initData(Activity activity, String appKey, String secretKey,String url) {
+ public void initData(Activity activity, String appKey, String secretKey, String url) {
this.activity = activity;
MediaPlayHelper.initContext(activity.getApplication().getApplicationContext());
ClassInstanceManager.newInstance().init(activity.getApplication().getApplicationContext());
@@ -70,9 +70,8 @@
// secretKey = "017fc27bb987496f9a677e4e6f0c88";
// appKey = "lc0285433bc7e8423d";
// url = CONST.Envirment.OVERSEAS_PRO.url;
- ProviderManager.getAppProvider().setAppType(1);
+ ProviderManager.getAppProvider().setAppType(1);
// }
-
try {
@@ -88,7 +87,8 @@
Toast.makeText(activity, e.getMessage(), Toast.LENGTH_SHORT).show();
}
}
- public void openActivity() {
+
+ public void openActivity() {
try {
activity.startActivity(new Intent(activity, com.lechange.demo.ui.DeviceListActivity.class));
} catch (Throwable e) {
@@ -96,8 +96,8 @@
}
}
- public void addCamera(IAddCamera iAddCamera) {
- if(!EventBus.getDefault().isRegistered(this)){
+ public void addCamera(IAddCamera iAddCamera) {
+ if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().register(this);
}
this.iAddCamera = iAddCamera;
@@ -107,7 +107,7 @@
}
- public void ShowErrorInfo(boolean isShow){
+ public void ShowErrorInfo(boolean isShow) {
HttpClient.SetShowErrorInfo(isShow);
}
@@ -123,8 +123,8 @@
}
}
- public void play(String deviceId,String title){
- new DeviceUtils(deviceId,title).play();
+ public void play(String deviceId, String title) {
+ new DeviceUtils(deviceId, title).play();
}
@@ -147,7 +147,7 @@
public void setToken(String token) {
this.token = token;
- LCDeviceEngine.newInstance().accessToken=(token);
+ LCDeviceEngine.newInstance().accessToken = (token);
}
public String getSubAccessToken() {
@@ -159,16 +159,16 @@
LCDeviceEngine.newInstance().setSubAccessToken(subAccessToken);
}
- private void getSubAccountToken(String openId){
+ private void getSubAccountToken(String openId) {
UserNetManager.getInstance().subAccountToken(openId, new IUserDataCallBack() {
@Override
public void onCallBackOpenId(String str) {
- if (str!=null){
+ if (str != null) {
//鏆備笉淇濆瓨鍒皊p涓簡锛屽洜涓鸿幏鍙栭渶瑕乧ontext銆�
// PreferencesHelper.getInstance(getApplicationContext()).set(Constants.SUBACCOUNTTOKEN,str);
LCDeviceEngine.newInstance().setSubAccessToken(str);
- activity.startActivity(new Intent(activity,com.lechange.demo.ui.DeviceListActivity.class));
+ activity.startActivity(new Intent(activity, com.lechange.demo.ui.DeviceListActivity.class));
}
}
@@ -179,7 +179,7 @@
});
}
- public boolean checkCameraPermissions(){
+ 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;
@@ -187,9 +187,9 @@
}
/**
- * 璇锋眰鎽勫儚澶村叏涓�
+ * 璇锋眰鎽勫儚澶存潈闄�
*/
- public void requestCameraPermissions(){
+ 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
@@ -201,7 +201,7 @@
}
- private void 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)) {
@@ -224,7 +224,7 @@
/**
* 璇锋眰瀵硅鏉冮檺
*/
- public void requestPermission() {
+ public void requestPermission() {
boolean isMinSDKM = Build.VERSION.SDK_INT < 23;
boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
&& ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
@@ -237,7 +237,7 @@
requestRecordAudioPermission();
}
- private void requestRecordAudioPermission() {
+ private void requestRecordAudioPermission() {
if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.RECORD_AUDIO)
|| ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_COARSE_LOCATION)
|| ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA)
diff --git a/AndroidOpenDemo/build.gradle b/AndroidOpenDemo/build.gradle
index 14a41eb..a7039c2 100644
--- a/AndroidOpenDemo/build.gradle
+++ b/AndroidOpenDemo/build.gradle
@@ -11,7 +11,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath "com.android.tools.build:gradle:4.1.2"
classpath 'com.alibaba:arouter-compiler:1.2.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/AndroidOpenDemo/gradle/wrapper/gradle-wrapper.properties b/AndroidOpenDemo/gradle/wrapper/gradle-wrapper.properties
index d2c45a4..1f3fdbc 100644
--- a/AndroidOpenDemo/gradle/wrapper/gradle-wrapper.properties
+++ b/AndroidOpenDemo/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
--
Gitblit v1.8.0