Эх сурвалжийг харах

1.修改Android Apex Mobile工程配置。

Pen Li 8 жил өмнө
parent
commit
51169b1baf

+ 30 - 30
Apex Mobile/app/app.iml

@@ -49,13 +49,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
@@ -63,6 +56,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -70,13 +70,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -84,6 +77,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
@@ -91,6 +92,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
@@ -108,7 +110,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="com.android.support:multidex-1.0.2" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tagmanager-11.0.4" level="project" />
@@ -117,28 +119,27 @@
     <orderEntry type="library" name="com.google.android.gms:play-services-drive-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-auth-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-awareness-11.0.4" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/Apex Mobile/app/libs/httpmime-4.1.1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tagmanager-v4-impl-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-wearable-11.0.4" level="project" />
-    <orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-iid-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-panorama-11.0.4" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/baidumapapi_base_v3_7_1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:mediarouter-v7-25.2.0" level="project" />
     <orderEntry type="library" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-iid-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-plus-11.0.4" level="project" />
     <orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
-    <orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-vision-common-11.0.4" level="project" />
-    <orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-games-11.0.4" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/baidumapapi_map_v3_7_1.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="com.android.support:support-fragment-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-11.0.4" level="project" />
+    <orderEntry type="library" name="com.android.support:support-core-utils-25.2.0" level="project" />
+    <orderEntry type="library" name="com.android.support:animated-vector-drawable-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.0.4" level="project" />
+    <orderEntry type="library" name="com.android.support:appcompat-v7-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-identity-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-vision-11.0.4" level="project" />
+    <orderEntry type="library" name="com.android.support:support-annotations:25.2.0@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-ads-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-ads-lite-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-cast-framework-11.0.4" level="project" />
@@ -147,41 +148,40 @@
     <orderEntry type="library" name="com.google.firebase:firebase-common-11.0.4" level="project" />
     <orderEntry type="library" name="com.android.support:palette-v7-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.0.4" level="project" />
-    <orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
-    <orderEntry type="library" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-auth-11.0.4" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/Apex Mobile/app/libs/BaiduLBS_Android.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-base-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-places-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-config-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-auth-api-phone-11.0.4" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/core-2.3.0.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-database-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-analytics-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-storage-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-clearcut-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-nearby-11.0.4" level="project" />
+    <orderEntry type="library" name="com.android.support:support-core-ui-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-storage-common-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-wallet-11.0.4" level="project" />
+    <orderEntry type="library" name="com.android.support:support-media-compat-25.2.0" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/Apex Mobile/app/libs/core-2.3.0.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-basement-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-cast-11.0.4" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/Apex Mobile/app/libs/httpmime-4.1.1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-appinvite-11.0.4" level="project" />
-    <orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" name="com.android.support:support-v4-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-analytics-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-safetynet-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-dynamic-links-11.0.4" level="project" />
-    <orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-gcm-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-database-connection-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-instantapps-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-auth-base-11.0.4" level="project" />
-    <orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-maps-11.0.4" level="project" />
+    <orderEntry type="library" name="com.android.support:support-compat-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-messaging-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tagmanager-api-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-fitness-11.0.4" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-gass-11.0.4" level="project" />
-    <orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
+    <orderEntry type="library" name="com.android.support:support-vector-drawable-25.2.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-location-11.0.4" level="project" />
     <orderEntry type="library" name="org.apache.http.legacy-android-25" level="project" />
   </component>

+ 3 - 3
Apex Mobile/app/build.gradle

@@ -34,10 +34,10 @@ android {
 
 dependencies {
     //    compile 'com.android.support:support-v4:19.1.0'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:support-v4:25.2.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+//    compile 'com.android.support:recyclerview-v7:26.1.0'
     compile 'com.google.android.gms:play-services:11.0.4'
     //    compile files('libs/baidumapapi_base_v3_7_1.jar')
     //    compile files('libs/baidumapapi_map_v3_7_1.jar')

+ 8 - 4
Apex Mobile/local.properties

@@ -1,7 +1,11 @@
-## This file must *NOT* be checked into Version Control Systems,
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
-#
-#Tue Jan 23 15:46:41 CST 2018
-sdk.dir=/Users/ray/Library/Android/sdk
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Feb 05 10:04:32 CST 2018
+sdk.dir=/Users/macmini1/Library/Android/sdk