优化代码现在乘客与司机端共享一个基础库

jikun2008 · Aug 7, 2017 · 7b5f98f · 7b5f98f
1 parent 44b7de2
commit 7b5f98f
Show file tree

Hide file tree

Showing 126 changed files with 1,528 additions and 8,175 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/AmapLibrary/.gitignore b/AmapLibrary/.gitignore
diff --git a/AmapLibrary/build.gradle b/AmapLibrary/build.gradle
diff --git a/...rary/libs/AMap3DMap_5.2.0_AMapNavi_5.1.0_AMapSearch_5.1.0_AMapLocation_3.4.0_20170602.jar b/...rary/libs/AMap3DMap_5.2.0_AMapNavi_5.1.0_AMapSearch_5.1.0_AMapLocation_3.4.0_20170602.jar
diff --git a/AmapLibrary/libs/armeabi/libGNaviData.so b/AmapLibrary/libs/armeabi/libGNaviData.so
diff --git a/AmapLibrary/libs/armeabi/libGNaviGuide.so b/AmapLibrary/libs/armeabi/libGNaviGuide.so
diff --git a/AmapLibrary/libs/armeabi/libGNaviMap.so b/AmapLibrary/libs/armeabi/libGNaviMap.so
diff --git a/AmapLibrary/libs/armeabi/libGNaviMapex.so b/AmapLibrary/libs/armeabi/libGNaviMapex.so
diff --git a/AmapLibrary/libs/armeabi/libGNaviPos.so b/AmapLibrary/libs/armeabi/libGNaviPos.so
diff --git a/AmapLibrary/libs/armeabi/libGNaviRoute.so b/AmapLibrary/libs/armeabi/libGNaviRoute.so
diff --git a/AmapLibrary/libs/armeabi/libGNaviSearch.so b/AmapLibrary/libs/armeabi/libGNaviSearch.so
diff --git a/AmapLibrary/libs/armeabi/libGNaviUtils.so b/AmapLibrary/libs/armeabi/libGNaviUtils.so
diff --git a/AmapLibrary/libs/armeabi/libRoadLineRebuildAPI.so b/AmapLibrary/libs/armeabi/libRoadLineRebuildAPI.so
diff --git a/AmapLibrary/libs/armeabi/librtbt800.so b/AmapLibrary/libs/armeabi/librtbt800.so
diff --git a/AmapLibrary/libs/armeabi/libwtbt800.so b/AmapLibrary/libs/armeabi/libwtbt800.so
diff --git a/AmapLibrary/proguard-rules.pro b/AmapLibrary/proguard-rules.pro
diff --git a/AmapLibrary/src/androidTest/java/com/map/library/ExampleInstrumentedTest.java b/AmapLibrary/src/androidTest/java/com/map/library/ExampleInstrumentedTest.java
diff --git a/AmapLibrary/src/main/AndroidManifest.xml b/AmapLibrary/src/main/AndroidManifest.xml
diff --git a/AmapLibrary/src/main/java/com/map/NaviFragment.java b/AmapLibrary/src/main/java/com/map/NaviFragment.java
diff --git a/AmapLibrary/src/main/res/values/strings.xml b/AmapLibrary/src/main/res/values/strings.xml
diff --git a/AmapLibrary/src/test/java/com/map/library/ExampleUnitTest.java b/AmapLibrary/src/test/java/com/map/library/ExampleUnitTest.java
diff --git a/app/build.gradle b/app/build.gradle
@@ -53,26 +53,10 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile project(':AmapLibrary')
-    compile project(':baselibray')
-    compile 'com.tencent.bugly:crashreport:latest.release' //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.2.0
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.orhanobut:logger:1.15'
-    compile 'io.reactivex:rxjava:1.2.1'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.retrofit2:converter-scalars:2.3.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'com.android.support:support-annotations:26.0.0-alpha1'
-    testCompile 'junit:junit:4.12'
-    compile 'com.github.promeg:tinypinyin:2.0.3' // TinyPinyin核心包，约80KB
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile project(':CommonLibrary:AmapLibrary')
+    compile project(':CommonLibrary:baselibray')
+    compile 'com.jakewharton:butterknife:8.6.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
     compile 'com.yanzhenjie:permission:1.0.8'
+    compile 'com.github.promeg:tinypinyin:2.0.3' // TinyPinyin核心包，约80KB
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,14 +13,14 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <!-- 不是sdk需要的权限，是示例中NotiService$NotiInnerService需要的权限 -->
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
 
     <!-- 读取缓存数据 -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
     <!-- 更改设置 -->
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -43,27 +43,22 @@
             android:name="com.amap.api.v2.apikey"
             android:value="e3b687e72db21b4f298091114cfd8748" />
 
+
+        <activity android:name=".activity.TestActivity">
+
+        </activity>
         <activity
             android:name=".activity.MainActiivty"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
-        <activity
-            android:name=".activity.TestSimpleActivity"
-            android:screenOrientation="portrait">
-
 
-        </activity>
-        <activity
-            android:name=".activity.LoginActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan" />
 
         <activity
             android:name=".activity.SendOrderActivity"

diff --git a/app/src/main/aidl/com/yisingle/bind/IGuardAidlInterface.aidl b/app/src/main/aidl/com/yisingle/bind/IGuardAidlInterface.aidl
diff --git a/app/src/main/java/com/yisingle/app/MainApplication.java b/app/src/main/java/com/yisingle/app/MainApplication.java
@@ -4,7 +4,11 @@
 import android.content.Context;
 import android.support.multidex.MultiDex;
 
+import com.blankj.utilcode.util.Utils;
+import com.orhanobut.logger.AndroidLogAdapter;
+import com.orhanobut.logger.FormatStrategy;
 import com.orhanobut.logger.Logger;
+import com.orhanobut.logger.PrettyFormatStrategy;
 import com.tencent.bugly.crashreport.CrashReport;
 
 /**
@@ -26,8 +30,9 @@ protected void attachBaseContext(Context base) {
     public void onCreate() {
         super.onCreate();
         AppManager.getInstance().init(this);
-        Logger.init().methodCount(0).hideThreadInfo();
+        initLogger();
 
+        Utils.init(getApplicationContext());//初始化AndroidUtilCode
         CrashReport.initCrashReport(getApplicationContext(), "8856cf1479", false);
 
     }
@@ -37,4 +42,15 @@ public static Context getContext() {
         return context;
 
     }
+
+    private void initLogger() {
+        FormatStrategy formatStrategy = PrettyFormatStrategy.newBuilder()
+                .showThreadInfo(false)  // (Optional) Whether to show thread info or not. Default true
+                .methodCount(0)         // (Optional) How many method line to show. Default 2
+                .methodOffset(0)        // (Optional) Hides internal method calls up to offset. Default 5
+//                .logStrategy(customLog) // (Optional) Changes the log strategy to print out. Default LogCat
+                .tag("My custom tag")   // (Optional) Global tag for every log. Default PRETTY_LOGGER
+                .build();
+        Logger.addLogAdapter(new AndroidLogAdapter(formatStrategy));
+    }
 }
diff --git a/app/src/main/java/com/yisingle/app/activity/LoginActivity.java b/app/src/main/java/com/yisingle/app/activity/LoginActivity.java