upgrade to 27, change leadcloud server.

ccjeng · Sep 18, 2019 · 8e0437d · 8e0437d
1 parent 35fa784
commit 8e0437d
Show file tree

Hide file tree

Showing 99 changed files with 760 additions and 2,910 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/TPTrash.iml b/TPTrash.iml
@@ -9,7 +9,6 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>

diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,10 +8,11 @@ android {
         applicationId 'com.oddsoft.tpetrash2'
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 69
-        versionName '5.1.5.081218TT'
+        versionCode 71
+        versionName '5.2.0.091919TT'
         multiDexEnabled true
     }
+
     buildTypes {
         release {
             minifyEnabled false

diff --git a/app/google-services.json b/app/google-services.json
diff --git a/app/libs/admob-adapter-1.0.0-1505261651-830485e.jar b/app/libs/admob-adapter-1.0.0-1505261651-830485e.jar
diff --git a/app/libs/vpadn-sdk-obf472-13708102-1807311414-0989e85.jar b/app/libs/vpadn-sdk-obf472-13708102-1807311414-0989e85.jar
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":69,"versionName":"5.1.5.081218TT","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":71,"versionName":"5.2.0.091919TT","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/androidTest/java/com/oddsoft/tpetrash2/ApplicationTest.java b/app/src/androidTest/java/com/oddsoft/tpetrash2/ApplicationTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/assets/recycle.json b/app/src/main/assets/recycle.json
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/controller/LocationService.java b/app/src/main/java/com/oddsoft/tpetrash2/controller/LocationService.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/controller/NewTaipeiOpenDataService.java b/app/src/main/java/com/oddsoft/tpetrash2/controller/NewTaipeiOpenDataService.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/controller/TaipeiOpenDataService.java b/app/src/main/java/com/oddsoft/tpetrash2/controller/TaipeiOpenDataService.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/model/ArrayItem.java b/app/src/main/java/com/oddsoft/tpetrash2/model/ArrayItem.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/model/NPRecycle.java b/app/src/main/java/com/oddsoft/tpetrash2/model/NPRecycle.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/model/RealtimeCar.java b/app/src/main/java/com/oddsoft/tpetrash2/model/RealtimeCar.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/CustomMapPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/CustomMapPresenter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/CustomMapView.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/CustomMapView.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/InfoPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/InfoPresenter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/InfoView.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/InfoView.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSPresenter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSView.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSView.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/LocationConnectedListener.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/LocationConnectedListener.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryPresenter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryView.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryView.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/base/BasePresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/base/BasePresenter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/base/Presenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/base/Presenter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/utils/Analytics.java b/app/src/main/java/com/oddsoft/tpetrash2/utils/Analytics.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/utils/Constant.java b/app/src/main/java/com/oddsoft/tpetrash2/utils/Constant.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/utils/MapUtils.java b/app/src/main/java/com/oddsoft/tpetrash2/utils/MapUtils.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/utils/Time.java b/app/src/main/java/com/oddsoft/tpetrash2/utils/Time.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/utils/Utils.java b/app/src/main/java/com/oddsoft/tpetrash2/utils/Utils.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/CustomMapActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/CustomMapActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/InfoActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/InfoActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/LBSActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/LBSActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/MainActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/MainActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/NTFixActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/NTFixActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/Prefs.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/Prefs.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/PrefsFragment.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/PrefsFragment.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/QueryActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/QueryActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/RecycleActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/RecycleActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/ArrayItemAdapter.java b/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/ArrayItemAdapter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/CustomInfoWindowAdapter.java b/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/CustomInfoWindowAdapter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/MainAdapter.java b/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/MainAdapter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/RecycleItem.java b/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/RecycleItem.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/RecycleListAdapter.java b/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/RecycleListAdapter.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/base/Application.java b/app/src/main/java/com/oddsoft/tpetrash2/view/base/Application.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/base/BaseActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/base/BaseActivity.java
diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/base/MVPBaseActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/base/MVPBaseActivity.java
diff --git a/app/src/main/res/drawable/ic_cog_wheel_silhouette.xml b/app/src/main/res/drawable/ic_cog_wheel_silhouette.xml
diff --git a/app/src/main/res/drawable/ic_exclamation_sign.xml b/app/src/main/res/drawable/ic_exclamation_sign.xml
diff --git a/app/src/main/res/drawable/ic_facebook_logo.xml b/app/src/main/res/drawable/ic_facebook_logo.xml
diff --git a/app/src/main/res/drawable/ic_keyboard_backspace_white_24px.xml b/app/src/main/res/drawable/ic_keyboard_backspace_white_24px.xml
diff --git a/app/src/main/res/drawable/ic_map_location.xml b/app/src/main/res/drawable/ic_map_location.xml
diff --git a/app/src/main/res/drawable/ic_navigation_white_24px.xml b/app/src/main/res/drawable/ic_navigation_white_24px.xml
diff --git a/app/src/main/res/drawable/ic_pin.xml b/app/src/main/res/drawable/ic_pin.xml
diff --git a/app/src/main/res/drawable/ic_placeholder.xml b/app/src/main/res/drawable/ic_placeholder.xml
diff --git a/app/src/main/res/drawable/ic_thumbs_up.xml b/app/src/main/res/drawable/ic_thumbs_up.xml
diff --git a/app/src/main/res/drawable/ic_truck.xml b/app/src/main/res/drawable/ic_truck.xml
diff --git a/app/src/main/res/drawable/icon.png b/app/src/main/res/drawable/icon.png
diff --git a/app/src/main/res/drawable/pin.png b/app/src/main/res/drawable/pin.png
diff --git a/app/src/main/res/layout-land/activity_info.xml b/app/src/main/res/layout-land/activity_info.xml
diff --git a/app/src/main/res/layout-port/activity_info.xml b/app/src/main/res/layout-port/activity_info.xml
diff --git a/app/src/main/res/layout/activity_lbs.xml b/app/src/main/res/layout/activity_lbs.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_ntfix.xml b/app/src/main/res/layout/activity_ntfix.xml
diff --git a/app/src/main/res/layout/activity_query.xml b/app/src/main/res/layout/activity_query.xml
diff --git a/app/src/main/res/layout/activity_recycle.xml b/app/src/main/res/layout/activity_recycle.xml
diff --git a/app/src/main/res/layout/activity_tpfix.xml b/app/src/main/res/layout/activity_tpfix.xml
diff --git a/app/src/main/res/layout/custominfowindow.xml b/app/src/main/res/layout/custominfowindow.xml
diff --git a/app/src/main/res/layout/layout_item_main.xml b/app/src/main/res/layout/layout_item_main.xml
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
diff --git a/app/src/main/res/layout/preference.xml b/app/src/main/res/layout/preference.xml
diff --git a/app/src/main/res/layout/recycle_listitem.xml b/app/src/main/res/layout/recycle_listitem.xml
diff --git a/app/src/main/res/layout/spinner.xml b/app/src/main/res/layout/spinner.xml
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
diff --git a/app/src/main/res/layout/trash_item.xml b/app/src/main/res/layout/trash_item.xml
diff --git a/app/src/main/res/menu/info.xml b/app/src/main/res/menu/info.xml
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
diff --git a/app/src/main/res/menu/nav_drawer_items.xml b/app/src/main/res/menu/nav_drawer_items.xml
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles_material.xml b/app/src/main/res/values/styles_material.xml
diff --git a/app/src/main/res/values/updates.xml b/app/src/main/res/values/updates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <string-array name="updates">
-    	<item>5.1.4\n修正一些錯誤
+    	<item>5.2.0\n修正一些錯誤
 		</item>
 </string-array>
 </resources>
diff --git a/app/src/main/res/xml/global_tracker.xml b/app/src/main/res/xml/global_tracker.xml
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle b/settings.gradle
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":69,"versionName":"5.1.5.081218TT","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":71,"versionName":"5.2.0.091919TT","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]