Browse Source

[공통][New] Pin verify 쓰레드 선택 위치 변경

hyodong.min 7 years ago
parent
commit
c8670f80be

+ 1 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/model/PinModel.java

@@ -4,7 +4,6 @@
 package kr.co.zumo.app.lifeplus.model;
 
 import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 import kr.co.zumo.app.lifeplus.bean.LifeplusAuthBean;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIService;
 
@@ -60,8 +59,7 @@ public class PinModel extends Model {
   public Single<LifeplusAuthBean> verifyPin(String uuid, String pin) {
     // todo pin 암호화 처리 필요
     String encryptedPin = pin;
-    return LifeplusAPIService.verifyPin(uuid, encryptedPin)
-      .observeOn(AndroidSchedulers.mainThread());
+    return LifeplusAPIService.verifyPin(uuid, encryptedPin);
   }
 
   @Override

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/PinPresenter.java

@@ -8,6 +8,7 @@ import android.util.Log;
 import java.io.EOFException;
 import java.net.SocketTimeoutException;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.lifeplus.model.PinModel;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
@@ -79,6 +80,7 @@ public class PinPresenter extends Presenter<PinModel, IPinView> {
 
     view.setDisabledPinDialog();
     disposable = model.verifyPin(SuperModel.getInstance().getUuid(), pin)
+      .observeOn(AndroidSchedulers.mainThread())
       .subscribe(bean -> {
 
         Log.i("APP# PinPresenter | verifyPin", "|" + bean.toPrettyJson());
@@ -99,7 +101,7 @@ public class PinPresenter extends Presenter<PinModel, IPinView> {
         if (e instanceof EOFException) {
           Log.e("APP#  PinPresenter | verifyPin", "| EOFException-- " + e.getLocalizedMessage());
         }
-        else if(e instanceof SocketTimeoutException) {
+        else if (e instanceof SocketTimeoutException) {
           Log.e("APP#  PinPresenter | verifyPin", "| SocketTimeoutException-- " + e.getLocalizedMessage());
         }