试用

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -69,11 +69,11 @@ public class C {
         /**
          * 开发平台（开发人员使用）
          */
-//        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";//开发测试平台
+        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";//开发测试平台
         /**
          * 生产平台
          */
-        public static final String BASE_URL = "http://tk.51zzd.com/";
+//        public static final String BASE_URL = "http://tk.51zzd.com/";
 
 
         private static final String PKG = "/tk/";

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -55,6 +55,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 
     @Override
     public void initView() {
+        mPresenter.getPaidUpEnter();
         mainActivity = this;
         mPresenter.initHandoverInfo();
         List<BaseFragment> fragments = new ArrayList<>();

app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java

@@ -24,7 +24,7 @@ import io.reactivex.ObservableSource;
 import io.reactivex.functions.Function;
 
 public class MainPresenter extends MainContract.Presenter {
-    public PaidUpEnter mPaidUpEnter;
+    public static PaidUpEnter mPaidUpEnter;
     public static HandoverInfo handoverInfo;
 
 
@@ -93,7 +93,7 @@ public class MainPresenter extends MainContract.Presenter {
         ApiFactory.PaidUp.getMarketing()
                 .subscribe(object -> {
                             if (object.toString().length() == 0) {
-
+                                mView.showHandoverDialog();
                             } else {
                                 Long time = JSON.parseObject(object.toString()).getLong("openExp");
                                 Integer day = (int) ((time - System.currentTimeMillis()) / 86400000L);

app/src/main/java/com/xingdata/zzdpos/ui/main/dialog/PaidUpDialog.java

@@ -3,25 +3,32 @@ package com.xingdata.zzdpos.ui.main.dialog;
 import android.text.Html;
 import android.view.View;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseDialog;
 import com.xingdata.zzdpos.databinding.DialogPaidUpBinding;
 import com.xingdata.zzdpos.model.PaidUpEnter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
+import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuPresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 
 
 /**
  * 交班页面
  */
-public class PaidUpDialog extends BaseDialog<MainPresenter, DialogPaidUpBinding> {
+public class PaidUpDialog extends BaseDialog<MarketingMenuPresenter, DialogPaidUpBinding> {
     private Boolean isNew = true;
     private Integer day;
+    private Class mClass;
 
     public void setDay(Integer integer) {
         this.day = integer;
     }
 
+    public void setClass(Class mClass) {
+        this.mClass = mClass;
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.dialog_paid_up;
@@ -32,6 +39,16 @@ public class PaidUpDialog extends BaseDialog<MainPresenter, DialogPaidUpBinding>
         return -1;
     }
 
+    @Override
+    public void onCancelClick(View view) {
+        super.onCancelClick(view);
+        if (!isNew && mClass != null) {
+
+            ActivityUtils.startActivity(mClass);
+
+        }
+    }
+
     @Override
     public void onConfirmClick(View view) {
         super.onConfirmClick(view);
@@ -48,8 +65,8 @@ public class PaidUpDialog extends BaseDialog<MainPresenter, DialogPaidUpBinding>
     @Override
     public void initView() {
         mViewBinding.setIsShow(true);
-        if (mPresenter.mPaidUpEnter != null) {
-            setPaidUpEnter(mPresenter.mPaidUpEnter);
+        if (MainPresenter.mPaidUpEnter != null) {
+            setPaidUpEnter(MainPresenter.mPaidUpEnter);
         }
 
     }
@@ -60,19 +77,19 @@ public class PaidUpDialog extends BaseDialog<MainPresenter, DialogPaidUpBinding>
                 day = 0;
             }
             mViewBinding.tvLine1.setText(Html.fromHtml("<big><font color=\"black\">高级功能体验剩余</font></big>" +
-                    "<big><big><big><big><font  color=\"red\">" + day + "</font></big></big></big></big>" + "<big><font color=\"black\">天</font></big>"));
+                    "<big><big><big><font  color=\"red\">" + day + "</font></big></big></big>" + "<big><font color=\"black\">天</font></big>"));
             setBtnName("继续使用", "续费");
             isNew = false;
 
         } else {
             mViewBinding.tvLine1.setText(Html.fromHtml("<big><font color=\"black\">高级功能可试用</font></big>" +
-                    "<big><big><big><big><font  color=\"red\">" + paidUpEnter.getMssrvFree() + "</font></big></big></big></big>" + "<big><font color=\"black\">月</font></big>"));
+                    "<big><big><big><font  color=\"red\">" + paidUpEnter.getMssrvFree() + "</font></big></big></big>" + "<big><font color=\"black\">月</font></big>"));
             setBtnName("暂不试用", "开始试用");
             isNew = true;
         }
 
         mViewBinding.tvLine2.setText(Html.fromHtml("<big><font color=\"black\">服务费：￥</font></big>" +
-                "<big><big><big><big><font  color=\"black\">" + ConvertUtil.fenToYuan(Long.valueOf(paidUpEnter.getMssrvPrice2()), false) + "/年" + "</font></big></big></big></big>"));
+                "<big><big><big><font  color=\"black\">" + ConvertUtil.fenToYuan(Long.valueOf(paidUpEnter.getMssrvPrice2()), false) + "/年" + "</font></big></big></big>"));
 
 
     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

@@ -10,8 +10,11 @@ import com.blankj.utilcode.util.ActivityUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
 import com.xingdata.zzdpos.model.MarketingMenuModel;
+import com.xingdata.zzdpos.ui.dialog.PromptDialog;
+import com.xingdata.zzdpos.ui.main.dialog.PaidUpDialog;
 import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
 import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
 import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
@@ -24,14 +27,19 @@ import com.xingdata.zzdpos.util.RecyclerViewUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MarketingMenuActivity extends AppCompatActivity {
+public class MarketingMenuActivity extends BaseActivity<MarketingMenuPresenter, ActivityMarketingMenuBinding> implements MarketingMenuContract.View {
     MarketingMenuAdapter marketingMenuAdapter;
     List<Integer> list = new ArrayList<>();
+    private PaidUpDialog mPaidUpDialog = new PaidUpDialog();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_marketing_menu);
+    public int getLayoutId() {
+        return R.layout.activity_marketing_menu;
+    }
+
+
+    @Override
+    public void initView() {
 
         ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
                 this, R.layout.activity_marketing_menu);
@@ -70,17 +78,20 @@ public class MarketingMenuActivity extends AppCompatActivity {
                     break;
                     case C.MENU.MENU_MS_TICKET: {
                         //优惠券设置
-                        ActivityUtils.startActivity(ReturnTicketActivity.class);
+                        mPresenter.isPaidUpVip(ReturnTicketActivity.class);
+
                     }
                     break;
                     case C.MENU.MENU_MS_RECHARGE: {
                         //充值优惠
-                        ActivityUtils.startActivity(RechargeRuleActivity.class);
+                        mPresenter.isPaidUpVip(RechargeRuleActivity.class);
+
                     }
                     break;
                     case C.MENU.MENU_MS_MS: {
                         //营销计划
-                        ActivityUtils.startActivity(MsActivity.class);
+                        mPresenter.isPaidUpVip(MsActivity.class);
+
                     }
                     break;
                     case C.MENU.MENU_MS_SMS: {
@@ -95,4 +106,29 @@ public class MarketingMenuActivity extends AppCompatActivity {
             }
         });
     }
+
+    @Override
+    public void showPaidUpVipDialog(Class activity, Integer day) {
+        mPaidUpDialog.setDay(day);
+        mPaidUpDialog.setClass(activity);
+        mPaidUpDialog.show(this);
+    }
+
+    @Override
+    public void showMarketingResult() {
+        PromptDialog mPromptDialog = new PromptDialog();
+        mPromptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SUCC, "开通成功");
+        mPromptDialog.setCustomButton("确定", view -> dismissAllDialog());
+        mPromptDialog.show((BaseActivity) ActivityUtils.getTopActivity(), 2);
+    }
+    @Override
+    public void isShowLoading(Boolean is) {
+        if (is) {
+            mLoadingDialog.show((BaseActivity) mContext);
+        } else {
+            if (mLoadingDialog.isShowing) {
+                mLoadingDialog.dismiss();
+            }
+        }
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuContract.java

+package com.xingdata.zzdpos.ui.marketing.marketingMenu;
+
+import com.xingdata.zzdpos.base.BasePresenter;
+import com.xingdata.zzdpos.base.BaseView;
+
+interface MarketingMenuContract {
+
+    interface View extends BaseView {
+
+        /**
+         * 显示读取对话框
+         */
+        void isShowLoading(Boolean is);
+
+        /**
+         * 显示会员续费页面
+         */
+        void showPaidUpVipDialog(Class activity, Integer day);
+
+        /**
+         * 显示开通结果
+         */
+        void showMarketingResult();
+
+    }
+
+    abstract class Presenter extends BasePresenter<View> {
+
+        /**
+         * 查詢會員规则
+         */
+        public abstract void getPaidUpEnter();
+
+        /**
+         * 查詢會員付費
+         */
+        public abstract void isPaidUpVip(Class activity);
+
+        /**
+         * 开通营销
+         */
+        public abstract void activateMarketing(Integer months, Integer years);
+
+
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuPresenter.java

+
+package com.xingdata.zzdpos.ui.marketing.marketingMenu;
+
+import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.api.ApiFactory;
+import com.xingdata.zzdpos.ui.main.MainPresenter;
+
+public class MarketingMenuPresenter extends MarketingMenuContract.Presenter {
+
+    @Override
+    public void getPaidUpEnter() {
+
+        ApiFactory.PaidUp.getEnter()
+                .subscribe(paidUpEnterPager -> {
+                            if (paidUpEnterPager.getList().size() != 0) {
+                                MainPresenter.mPaidUpEnter = paidUpEnterPager.getList().get(0);
+                            }
+
+                        }
+                        , throwable -> {
+                            ToastUtils.showShort(throwable.getMessage());
+                        }
+                );
+    }
+
+    @Override
+    public void isPaidUpVip(Class activity) {
+
+        ApiFactory.PaidUp.getMarketing()
+                .subscribe(object -> {
+                            if (object.toString().length() == 0) {
+                                mView.showPaidUpVipDialog(activity, null);
+                            } else {
+                                Long time = JSON.parseObject(object.toString()).getLong("openExp");
+                                Integer day = (int) ((time - System.currentTimeMillis()) / 86400000L);
+                                if (day <= 7) {
+                                    mView.showPaidUpVipDialog(activity, day);
+                                } else {
+                                    ActivityUtils.startActivity(activity);
+                                }
+
+                            }
+                        }
+
+                        , throwable -> {
+                            ToastUtils.showShort(throwable.getMessage());
+                        }
+                );
+    }
+
+    @Override
+    public void activateMarketing(Integer months, Integer years) {
+        mView.isShowLoading(true);
+        ApiFactory.PaidUp.activateMarketing(months, years).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(object -> {
+                            mView.showMarketingResult();
+                        }
+
+                        , throwable -> {
+                            ToastUtils.showShort(throwable.getMessage());
+                        }
+                );
+    }
+
+    @Override
+    public void onAttached() {
+
+    }
+}
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -57,8 +57,8 @@ public final class SystemUtil {
                 e.printStackTrace();
             }
         }
-        return "0818562";
-//        return "test01";
+//        return "0818562";
+        return "test11";
     }
 
     /**