Browse Source

[공통][Bug] SuperModel.setUuid() -> setDeviceUuid()

hyodong.min 7 years ago
parent
commit
90a339e8d4

+ 4 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/activity/SplashActivity.java

@@ -161,13 +161,13 @@ public class SplashActivity extends AppCompatActivity {
     else {
       // 저장돼있지 않으면 처음이므로 저장;
       Log.w("APP# SplashActivity | verifyUuid", "|" + "저장돼있지 않으면 처음이므로 저장");
-      setUuid(currentUuid);
+      setDeviceUuid(currentUuid);
     }
   }
 
-  protected void setUuid(String uuid) {
-    Log.w("APP# SplashActivity | setUuid", "| " + uuid);
-    SuperModel.getInstance().setUuid(uuid);
+  protected void setDeviceUuid(String uuid) {
+    Log.w("APP# SplashActivity | setDeviceUuid", "| " + uuid);
+    SuperModel.getInstance().setDeviceUuid(uuid);
   }
 
   protected void requestPermissions() {

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

@@ -22,7 +22,7 @@ public final class SuperModel {
     return ourInstance;
   }
 
-  private String Uuid;
+  private String deviceUuid;
   private String UserId;
   private LifeplusPreferences preferences;
 
@@ -48,21 +48,21 @@ public final class SuperModel {
    *
    * @return uuid
    */
-  public String getUuid() {
-    if (StringUtil.isFull(Uuid) == false) {
-      Uuid = preferences.getDeviceUuid();
+  public String getDeviceUuid() {
+    if (StringUtil.isFull(deviceUuid) == false) {
+      deviceUuid = preferences.getDeviceUuid();
     }
-    return Uuid;
+    return deviceUuid;
   }
 
   /**
    * 장치 고유번호 저장;
    *
-   * @param uuid
+   * @param deviceUuid
    */
-  public void setUuid(String uuid) {
-    Uuid = uuid;
-    preferences.setDeviceUuid(uuid);
+  public void setDeviceUuid(String deviceUuid) {
+    this.deviceUuid = deviceUuid;
+    preferences.setDeviceUuid(deviceUuid);
   }
 
   /**

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

@@ -87,7 +87,7 @@ public class PinPresenter extends Presenter<PinModel, IPinView> {
     }
 
 
-//    disposable = model.verifyPin(SuperModel.getInstance().getUuid(), pin)
+//    disposable = model.verifyPin(SuperModel.getInstance().getDeviceUuid(), pin)
 //      .observeOn(AndroidSchedulers.mainThread())
 //      .subscribe(bean -> {
 //