Bläddra i källkod

[공통][Bug] 오류 수정

hyodong.min 7 år sedan
förälder
incheckning
fc3fcb2d4f

+ 7 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityBase.java

@@ -55,7 +55,7 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
     defineActionBar();
 
     presenter = definePresenter();
-    if(null != presenter) {
+    if (null != presenter) {
       model = presenter.getModel();
     }
     onAfterCreate(savedInstanceState);
@@ -215,10 +215,14 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
         .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
         .subscribe(isConnectedAll -> {
           Log.i("APP# ActivityBase | watchNetwork", "|" + "isConnectedAll: +++++++++" + isConnectedAll);
-          presenter.onChangedConnection(isConnectedAll, 0);
+          if (null != presenter) {
+            presenter.onChangedConnection(isConnectedAll, 0);
+          }
         }, e -> {
           Log.i("APP# ActivityBase | watchNetwork", "|" + "isConnectedAll: ++++++++++" + "error ");
-          presenter.onChangedConnection(false, 0);
+          if (null != presenter) {
+            presenter.onChangedConnection(false, 0);
+          }
         })
     );
   }

+ 1 - 1
app/src/main/res/layout/activity_main.xml

@@ -20,7 +20,7 @@
       android:id="@+id/button_sign_up"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="JOIN"/>
+      android:text="Join"/>
 
     <kr.co.zumo.app.lifeplus.view.custom.SignUpButtonView
       android:id="@+id/button_faq"