Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/build.gradle

@@ -1,5 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
+apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.firebase-perf'
 
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(rootProject.file("keystore.properties")))
@@ -183,13 +185,23 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:16.0.0'
     implementation 'com.kakao.sdk:usermgmt:1.14.0'
     implementation 'com.kakao.sdk:kakaotalk:1.14.0'
+
     // Naver login sdk
     implementation files('libs/3rdparty_login_library_android_4.1.4.jar')
+
+    // Advertise platform
     implementation files('libs/buzzad-android-sdk-advertiser-1.0.1.jar')
     implementation files('libs/cashslide-sdk20170320.jar')
     implementation files('libs/libNswitchSDK_v1.1.2.jar')
     implementation files('libs/tnkad-sdk.jar')
 
+    // Crashlytics
+    implementation 'com.google.firebase:firebase-core:16.0.7'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
+
+    // Performance
+    implementation 'com.google.firebase:firebase-perf:16.2.4'
+
     /*********************************
      * UNIT TEST
      *********************************/

app/src/main/java/kr/co/zumo/app/lifeplus/model/SuperModel.java

@@ -141,7 +141,7 @@ public final class SuperModel implements IMemberStatusManager {
         deviceUuid = preferences.getDeviceUuid();
       } catch (Exception e) {
         //e.printStackTrace();
-        Log.e("APP#  SuperModel | getDeviceId, 144", "Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
+        Log.e("APP#  SuperModel | getDeviceId, ", "144 Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
       }
     }
     return deviceUuid;
@@ -169,7 +169,7 @@ public final class SuperModel implements IMemberStatusManager {
         userNo = preferences.getUserNo();
       } catch (Exception e) {
         //e.printStackTrace();
-        Log.e("APP#  SuperModel | getUserNo, 172", "Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
+        Log.e("APP#  SuperModel | getUserNo, ", "172 Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
       }
     }
     return userNo;
@@ -204,7 +204,7 @@ public final class SuperModel implements IMemberStatusManager {
         userEmail = preferences.getUserEmail();
       } catch (Exception e) {
         //e.printStackTrace();
-        Log.e("APP#  SuperModel | getUserEmail, 207", "Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
+        Log.e("APP#  SuperModel | getUserEmail, ", "207 Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
       }
     }
     return userEmail;
@@ -247,7 +247,7 @@ public final class SuperModel implements IMemberStatusManager {
       saveEncryptedPin(encryptedPin);
     } catch (Exception e) {
       //e.printStackTrace();
-      Log.e("APP#  SuperModel | savePinWithEncryption, 250", "Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
+      Log.e("APP#  SuperModel | savePinWithEncryption, ", "250 Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
     }
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendBasicModel.java

@@ -42,7 +42,7 @@ public class EventRecommendBasicModel extends Model {
   private List<LifeplusContentsBean> contentsBeans;
 
   private EventDetailBean deliveredEventDetailBean;
-  private EventAnswerRecordBean eventAnswerRecordBean;
+
 
   private String selectedAnswerNo = "";
 
@@ -157,11 +157,12 @@ public class EventRecommendBasicModel extends Model {
   }
 
   public void loadEventAnswerRecord() {
+
     String itemNo = deliveredEventDetailBean.getItemNo();
     disposableRecord = new APIEventAnswerRecordModule().call(new EventAnswerRecordRequestBean(itemNo), new APIModuleListener<EventAnswerRecordResultBean>(waiterCaller) {
       @Override
       public void onApiSuccess(EventAnswerRecordResultBean resultBean) {
-        eventAnswerRecordBean = resultBean.getData();
+        EventAnswerRecordBean eventAnswerRecordBean = resultBean.getData();
 
         if (null != eventAnswerRecordBean) {
           setSelectedAnswerNo(eventAnswerRecordBean.getSelectedAnswerNo());

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainDebugFragment.java

@@ -62,7 +62,7 @@ public class MainDebugFragment extends FragmentBase<MainPresenter> implements IM
   private ViewParent layoutCoordinator;
   private View layoutNewbie;
   private ActionBarScroller actionBarScroller;
-  private TextView buttonAddSpecialCode;
+
 
   private RecyclerView.OnScrollListener scrollListener = new RecyclerView.OnScrollListener() {
     @Override
@@ -110,7 +110,7 @@ public class MainDebugFragment extends FragmentBase<MainPresenter> implements IM
     contentsRecyclerView = findViewById(R.id.recycler_view_main);
     contentsRecyclerView.addOnScrollListener(scrollListener);
 
-    buttonAddSpecialCode = findViewById(R.id.button_add_special_code);
+   TextView buttonAddSpecialCode = findViewById(R.id.button_add_special_code);
 
     buttonAddSpecialCode.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.SPECIAL_CODE_CLICK).build());

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/member/SettingMemberInfoModel.java

@@ -43,7 +43,9 @@ import kr.co.zumo.app.lifeplus.zumo.bean.api.MemberInfoResultBean;
  * @history 민효동   [2018. 10. 29.]   [최초 작성]
  * @since 2018. 10. 29.
  */
+@SuppressWarnings("PMD.SuspiciousConstantFieldName")
 public class SettingMemberInfoModel extends Model {
+
   private Disposable disposableLoading;
   private Disposable disposablePolicyAll;
   private Disposable disposablePolicy;

app/src/main/res/values/strings.xml

@@ -280,9 +280,9 @@
   <string name="setting_menu3_setting3_1">날씨제공 : 케이웨더</string>
   <string name="setting_menu3_push_enable">"알림이 오지 않을 경우 &lt;font color='#666666'>&lt;u>여기&lt;/u>&lt;/font>를 눌러 알림수신을 허용해주세요."</string>
   <string name="setting_menu3_event_agree">이벤트 혜택 수신동의</string>
-  <string name="setting_menu3_event_agree_message">이벤트 혜택 수신동의 처리되었습니다.\n(%s)</string>
-  <string name="setting_menu3_event_disagree">이벤트 혜택 수신거부</string>
-  <string name="setting_menu3_event_disagree_message">이벤트 혜택 수신거부 처리되었습니다.\n(%s)</string>
+  <string name="setting_menu3_event_agree_message">이벤트 혜택 / 서비스 정보 수신 처리되었습니다.\n(%s)</string>
+  <string name="setting_menu3_event_disagree">이벤트 혜택 / 서비스 정보 수신거부</string>
+  <string name="setting_menu3_event_disagree_message">이벤트 혜택 / 서비스 정보 수신거부 처리되었습니다.\n(%s)</string>
   <string name="setting_menu3_location_agree_message">위치기반 서비스 이용을 동의하셨습니다.</string>
   <string name="setting_menu4">약관/1:1 문의</string>
   <string name="setting_terms">약관보기</string>

build.gradle

@@ -6,6 +6,9 @@ buildscript {
         google()
         jcenter()
         mavenCentral()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
@@ -14,6 +17,9 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+
+        classpath 'io.fabric.tools:gradle:1.26.1'
+        classpath 'com.google.firebase:firebase-plugins:1.1.5'
     }
 }
 
@@ -23,6 +29,9 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'http://devrepo.kakao.com:8088/nexus/content/groups/public/' }
+        maven {
+            url 'https://maven.google.com/'
+        }
     }
 }