no message

ccjeng · Apr 7, 2017 · 72dfd04 · 72dfd04
1 parent ab5eaed
commit 72dfd04
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 402 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'com.oddsoft.tpetrash2'
         minSdkVersion 16
         targetSdkVersion 21
-        versionCode 62
-        versionName '5.0.2.122416TT'
+        versionCode 63
+        versionName '5.1.0.040717TT'
         multiDexEnabled true
     }
     buildTypes {

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/CustomMapPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/CustomMapPresenter.java
@@ -67,6 +67,7 @@ public void onMapReady(GoogleMap map) {
         map.getUiSettings().setZoomControlsEnabled(true);
         map.setMyLocationEnabled(true);
 
+        float zoom = 14;
         switch (mapType) {
             case "tpfix":  //台北市資源回收及廚餘限時收受點
                 drawLocationTPFix(map);
@@ -76,6 +77,7 @@ public void onMapReady(GoogleMap map) {
                 break;
             case "tpcloth": //台北市舊衣回收箱
                 drawLocationTPCloth(map);
+                zoom = 16;
                 break;
             case "ntrecycle": //新北市黃金資收站設置資訊
                 drawLocationNTRecycle(map);
@@ -86,7 +88,7 @@ public void onMapReady(GoogleMap map) {
 
         if (currentLocation != null) {
             LatLng myLocation = new LatLng(currentLocation.getLatitude(), currentLocation.getLongitude());
-            map.moveCamera(CameraUpdateFactory.newLatLngZoom(myLocation, 14));
+            map.moveCamera(CameraUpdateFactory.newLatLngZoom(myLocation, zoom));
 
         } else {
             view.showError(context.getString(R.string.location_error), Utils.Mode.ERROR);

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
@@ -26,6 +26,7 @@
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
+import com.oddsoft.tpetrash2.BuildConfig;
 import com.oddsoft.tpetrash2.R;
 import com.oddsoft.tpetrash2.utils.Analytics;
 import com.oddsoft.tpetrash2.utils.Utils;
@@ -285,17 +286,10 @@ private void showMessage() {
         long cacheExpiration = 3600 * 3; //3 hour
 
         //Settings
-/*
-        FirebaseRemoteConfigSettings remoteConfigSettings = new FirebaseRemoteConfigSettings.Builder()
-                .setDeveloperModeEnabled(true)
-                .build();
-        mRemoteConfig.setConfigSettings(remoteConfigSettings);
-
-        //expire the cache immediately for development mode.
-        if (mRemoteConfig.getInfo().getConfigSettings().isDeveloperModeEnabled()) {
+        if(BuildConfig.DEBUG) {
             cacheExpiration = 0;
         }
-*/
+
         mRemoteConfig.fetch(cacheExpiration)
                 .addOnCompleteListener(new OnCompleteListener<Void>() {
                     @Override
@@ -309,8 +303,6 @@ public void onComplete(@NonNull Task<Void> task) {
 
                             cvMessage.setVisibility(messageEnabled ? View.VISIBLE : View.GONE);
 
-                            cvMessage.setVisibility(messageEnabled ? View.GONE : View.VISIBLE);
-
                             if (messageEnabled) {
                                 messageView.setText(messageText.replace("\\n", System.getProperty("line.separator")));
                             }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="query">垃圾車班表\n依行政區查詢</string>
     <string name="tpfix">台北市垃圾資源回收、廚餘回收限時收受點</string>
     <string name="tpfood">台北市週三、週日廚餘專用限時收受點</string>
-    <string name="tpcloth">台北市舊衣回收箱</string>
+    <string name="tpcloth">台北市\n舊衣回收箱</string>
     <string name="ntfix">新北市定點清運查詢</string>
     <string name="ntrecycle">新北市黃金資收站設置資訊</string>
     <string name="newtaipeirealtime">新北市垃圾車即時資訊</string>

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.0.1\n移除一些不必要的權限
+    	<item>5.1.0\n新增「台北市舊衣回收箱」
 		</item>
 </string-array>
 </resources>