Bläddra i källkod

VIP模式重命名为休息模式

詹子聪 6 år sedan
förälder
incheckning
39eed85af6

+ 2 - 2
app/src/main/java/com/miekir/eden/base/ApiService.java

@@ -92,8 +92,8 @@ public interface ApiService {
     Observable<BaseResponse<SystemBean>> getSystemConfig();
 
     /**设置是否VIP才能用API*/
-    @POST("/eden/api/setApiConfig")
-    Observable<BaseResponse<String>> setApiConfig(@Query("configType") int configType, @Query("booleanValue") boolean booleanValue, @Query("newZFB") String newZFB);
+    @POST("/eden/api/setSystemConfig")
+    Observable<BaseResponse<String>> setSystemConfig(@Query("configType") int configType, @Query("booleanValue") boolean booleanValue, @Query("newZFB") String newZFB);
 
     /**收藏或取消收藏*/
     @POST("/eden/api/favGoods")

+ 1 - 1
app/src/main/java/com/miekir/eden/bean/SystemBean.java

@@ -13,7 +13,7 @@ public class SystemBean {
     /**
      * 是否有VIP限制,true表示必须要VIP才能使用特殊服务,false表示免费开放中...
      */
-    public boolean isVipLimit;
+    public boolean isRestMode;
     public boolean isWalking;
     public String zfb;
 }

+ 2 - 2
app/src/main/java/com/miekir/eden/ui/home/tool/SystemPresenter.java

@@ -18,7 +18,7 @@ import io.reactivex.schedulers.Schedulers;
  * Description:
  */
 public class SystemPresenter extends BasePresenter<ISystemView> {
-    public static final int CONFIG_TYPE_DOOR = 1;
+    public static final int CONFIG_TYPE_REST = 1;
     public static final int CONFIG_TYPE_WALK = 2;
     public static final int CONFIG_TYPE_ZFB = 3;
 
@@ -55,7 +55,7 @@ public class SystemPresenter extends BasePresenter<ISystemView> {
     public void setConfig(int configType, boolean booleanValue, String newZFB) {
         RetrofitHelper.getInstance()
                 .getRequestApi(ApiService.class)
-                .setApiConfig(configType, booleanValue, newZFB)
+                .setSystemConfig(configType, booleanValue, newZFB)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<String>() {

+ 13 - 13
app/src/main/java/com/miekir/eden/ui/mine/MineActivity.java

@@ -34,7 +34,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
     SystemPresenter mSystemPresenter;
 
     // 当前金额
-    private Switch switch_api;
+    private Switch switch_rest;
     private Switch switch_walk;
     private TextInputEditText et_email;
     private TextInputEditText et_zfb;
@@ -70,9 +70,9 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
         TextInputLayout til_zfb = findViewById(R.id.til_zfb);
         et_email = findViewById(R.id.et_email);
         et_zfb = findViewById(R.id.et_zfb);
-        switch_api = findViewById(R.id.switch_api);
+        switch_rest = findViewById(R.id.switch_rest);
         switch_walk = findViewById(R.id.switch_walk);
-        switch_api.setOnCheckedChangeListener(this);
+        switch_rest.setOnCheckedChangeListener(this);
         switch_walk.setOnCheckedChangeListener(this);
         mSystemBean = UserInfoManager.getInstance().getSystemBean();
         if (mSystemBean == null) {
@@ -86,9 +86,9 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
             et_zfb.setText(mSystemBean.zfb);
         }
 
-        switch_api.setOnCheckedChangeListener(null);
-        switch_api.setChecked(mSystemBean.isVipLimit);
-        switch_api.setOnCheckedChangeListener(this);
+        switch_rest.setOnCheckedChangeListener(null);
+        switch_rest.setChecked(mSystemBean.isRestMode);
+        switch_rest.setOnCheckedChangeListener(this);
 
         switch_walk.setOnCheckedChangeListener(null);
         switch_walk.setChecked(mSystemBean.isWalking);
@@ -165,15 +165,15 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
         dismissLoading();
 
         switch (configType) {
-            case SystemPresenter.CONFIG_TYPE_DOOR:
+            case SystemPresenter.CONFIG_TYPE_REST:
                 if (success) {
                     ToastTool.showShort(StringTool.getString(R.string.mine_set_success));
-                    mSystemBean.isVipLimit = !mSystemBean.isVipLimit;
+                    mSystemBean.isRestMode = !mSystemBean.isRestMode;
                 } else {
                     ToastTool.showShort(StringTool.getString(R.string.mine_set_fail));
-                    switch_api.setOnCheckedChangeListener(null);
-                    switch_api.setChecked(!switch_api.isChecked());
-                    switch_api.setOnCheckedChangeListener(this);
+                    switch_rest.setOnCheckedChangeListener(null);
+                    switch_rest.setChecked(!switch_rest.isChecked());
+                    switch_rest.setOnCheckedChangeListener(this);
                 }
                 break;
 
@@ -213,8 +213,8 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         showLoading();
-        if (buttonView.getId() == switch_api.getId()) {
-            mSystemPresenter.setConfig(SystemPresenter.CONFIG_TYPE_DOOR, isChecked, mSystemBean.zfb);
+        if (buttonView.getId() == switch_rest.getId()) {
+            mSystemPresenter.setConfig(SystemPresenter.CONFIG_TYPE_REST, isChecked, mSystemBean.zfb);
         } else if (buttonView.getId() == switch_walk.getId()) {
             mSystemPresenter.setConfig(SystemPresenter.CONFIG_TYPE_WALK, isChecked, mSystemBean.zfb);
         }

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

@@ -120,7 +120,7 @@
 
 
             <Switch
-                android:id="@+id/switch_api"
+                android:id="@+id/switch_rest"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/height_tool_bar"
                 android:gravity="center_vertical"