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

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

@@ -21,6 +21,7 @@ public class LifeplusPreferences {
   public final static String ENCRYPTION_USER_NO = "encryption_user_no";
   public final static String ZUMO_USER_UPDATE_COMPLETED = "zumo_user_update_completed";
   public final static String USER_ID = "user_id";
+  public final static String USER_NAME = "user_name";
   public final static String TUTORIAL_DONE = "tutorial_done";
   public final static String PERMISSION_INFO_DONE = "permission_info_done";
   public final static String DEVICE_UUID = "device_uuid";
@@ -126,6 +127,19 @@ public class LifeplusPreferences {
     return preferences.get(USER_ID, "");
   }
 
+  /**
+   * 유저 이름
+   *
+   * @param userName
+   */
+  public void setUserName(String userName) {
+    preferences.put(USER_NAME, userName);
+  }
+
+  public String getUserName() {
+    return preferences.get(USER_NAME, "");
+  }
+
   /**
    * 암호화된 핀
    *
@@ -230,4 +244,5 @@ public class LifeplusPreferences {
   public String getGuestLikedList() {
     return preferences.get(GUEST_LIKED_LIST, "");
   }
+
 }

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

@@ -190,11 +190,15 @@ public final class SuperModel {
    * @return
    */
   public String getUserName() {
+    if (null == userName) {
+      userName = preferences.getUserName();
+    }
     return userName;
   }
 
   public void setUserName(String userName) {
     this.userName = userName;
+    preferences.setUserName(userName);
   }
 
   /**

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

@@ -19,6 +19,8 @@ import kr.co.zumo.app.lifeplus.view.IView;
  */
 public interface IMyMainView extends IView {
 
+  void setBenefitLabel(String str);
+
   void setMyBookmarkList(ArrayList<BookmarkBean> bookmarkBeans);
 
   void drawBookmarkLabel(int count);

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

@@ -68,6 +68,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   protected View arrowBookmark;
   protected View arrowBucket;
   protected TextView textBucketLabel;
+  protected TextView textBenefitLabel;
 
   protected CheckBox likeCheck1;
   protected CheckBox likeCheck2;
@@ -108,6 +109,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     arrowBookmark = findViewById(R.id.image_view_book_mark_arrow);
     arrowBucket = findViewById(R.id.image_view_arrow_bucket_list);
     textBucketLabel = findViewById(R.id.text_view_exists_bucket_list);
+    textBenefitLabel = findViewById(R.id.text_view_benefit);
 
     likeCheck1 = findViewById(R.id.like_check);
     likeCheck2 = findViewById(R.id.like_check2);
@@ -178,6 +180,9 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textViewBookmarkCount.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK_LIST).build()));
   }
 
+  @Override
+  public abstract void setBenefitLabel(String str);
+
   @Override
   public void setMyBookmarkList(ArrayList<BookmarkBean> bookmarkBeans) {
     textViewBookmarkRecommend.setVisibility(View.GONE);

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

@@ -17,9 +17,15 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
  */
 public class MyMainGuestFragment extends MyMainFragment {
 
+  @Override
+  public void setBenefitLabel(String str) {
+    textBenefitLabel.setText(ResourceUtil.getString(R.string.life_plus_benefit_text, "나를"));
+  }
+
   @Override
   protected void createMemberOrGuest() {
-    layoutMemberHeader.setVisibility(View.GONE);;
+    layoutMemberHeader.setVisibility(View.GONE);
+    ;
     layoutGuestHeader.setVisibility(View.VISIBLE);
   }
 

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

@@ -18,9 +18,14 @@ import kr.co.zumo.app.lifeplus.view.Event;
  */
 public class MyMainMemberFragment extends MyMainFragment {
 
+  public void setBenefitLabel(String name) {
+    textBenefitLabel.setText(ResourceUtil.getString(R.string.life_plus_benefit_text, name));
+  }
+
   @Override
   protected void createMemberOrGuest() {
-    layoutMemberHeader.setVisibility(View.VISIBLE);;
+    layoutMemberHeader.setVisibility(View.VISIBLE);
+    ;
     layoutGuestHeader.setVisibility(View.GONE);
   }
 

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

@@ -56,6 +56,7 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
   @Override
   protected void createViewInternal() {
   }
+
   @Override
   protected void destroyInternal() {
   }
@@ -68,7 +69,7 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
   protected void startInternal() {
     // 북마크 업데이트
     // contents 를 activity 로 분리하면서 화면 업데이트가 자동으로 되지 않으므로.
-    if(doubleCheckerBookmarkList.isCompleted()) {
+    if (doubleCheckerBookmarkList.isCompleted()) {
       setBookmark();
     }
   }
@@ -255,6 +256,8 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
     doubleCheckerBookmarkList.checkFirst();
     doubleCheckerBestBucket.checkFirst();
     doubleCheckerMyBucket.checkFirst();
+
+    view.setBenefitLabel(model.getUserName() + "님을");
   }
 
   @Override

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

@@ -105,6 +105,11 @@ public class SignUpAgreeModel extends Model {
     SuperModel.getInstance().renewMemberData();
 
     SuperModel.getInstance().setUserId(userId);
+
+    MobileAuthBean mobileAuthBean = SignUpModelHelper.getInstance().getMobileAuthBean();
+    if (StringUtil.isFull(mobileAuthBean.getName())) {
+      SuperModel.getInstance().setUserName(mobileAuthBean.getName());
+    }
   }
 
   /**

app/src/main/res/layout/fragment_my_main.xml

@@ -281,7 +281,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="35dp"
         android:lineSpacingExtra="6sp"
-        android:text="@string/life_plus_benefit_text"
+        tools:text="@string/life_plus_benefit_text"
         android:textColor="@color/C000000"
         android:textSize="15sp"
         android:textStyle="bold"/>

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

@@ -604,8 +604,7 @@
   <string name="eight">8</string>
   <string name="three">3</string>
   <string name="buy_and_reserve">구매/예약</string>
-  <string name="life_plus_benefit_text"><b>한화님을 위한 Lifeplus Benefit</b></string>
-  <string name="life_plus_benefit_text_guest"><b>나를 위한 Lifeplus Benefit</b></string>
+  <string name="life_plus_benefit_text"><b>%s 위한 Lifeplus Benefit</b></string>
   <string name="book_mark_count">북마크 %s</string>
   <string name="bucket_list_count">버킷리스트 %s</string>
   <string name="book_mark_recommend_text">최근 많이 북마크한 콘텐츠 추천</string>