Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/model/PaidUpEnter.java

@@ -23,7 +23,7 @@ public class PaidUpEnter {
     private int mssrvMapId;
     private int mssrvFree;
     private int mssrvPrice1;
-    private int mssrvPrice2;
+    private long mssrvPrice2;
     private int vipLevelDef;
     private int ticketLevelDef;
     private int acctLevelDef;
@@ -56,7 +56,7 @@ public class PaidUpEnter {
         this.mssrvPrice1 = mssrvPrice1;
     }
 
-    public int getMssrvPrice2() {
+    public long getMssrvPrice2() {
         return mssrvPrice2;
     }
 

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

@@ -4,7 +4,7 @@ package com.xingdata.zzdpos.ui.main;
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
 
-interface MainContract {
+public interface MainContract {
 
     interface View extends BaseView {
         void isShowLoading(Boolean is);

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 static PaidUpEnter mPaidUpEnter;
+    public static List<PaidUpEnter> mPaidUpEnters;
     public static HandoverInfo handoverInfo;
 
 
@@ -39,7 +39,7 @@ public class MainPresenter extends MainContract.Presenter {
         ApiFactory.PaidUp.getEnter()
                 .subscribe(paidUpEnterPager -> {
                             if (paidUpEnterPager.getList().size() != 0) {
-                                this.mPaidUpEnter = paidUpEnterPager.getList().get(0);
+                                this.mPaidUpEnters = paidUpEnterPager.getList();
                             }
 
                         }
@@ -61,6 +61,8 @@ public class MainPresenter extends MainContract.Presenter {
                                 Integer day = (int) ((time - System.currentTimeMillis()) / 86400000L);
                                 if (day <= 7) {
                                     mView.showPaidUpVipDialog(activity, day);
+                                } else if (activity == null) {
+                                    clickHandover();
                                 } else {
                                     ActivityUtils.startActivity(activity);
                                 }

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

@@ -9,7 +9,7 @@ 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;
 
 
@@ -69,13 +69,19 @@ public class PaidUpDialog extends BaseDialog<MainPresenter, DialogPaidUpBinding>
     @Override
     public void initView() {
         mViewBinding.setIsShow(true);
-        if (MainPresenter.mPaidUpEnter != null) {
-            setPaidUpEnter(MainPresenter.mPaidUpEnter);
+        if (MainPresenter.mPaidUpEnters != null) {
+            long dayFree=0;
+            long price=0;
+            for(PaidUpEnter paidUpEnter: MainPresenter.mPaidUpEnters){
+                dayFree=paidUpEnter.getMssrvFree();
+                price=paidUpEnter.getMssrvPrice2()+price;
+            }
+            setPaidUpEnter(dayFree,price);
         }
 
     }
 
-    public void setPaidUpEnter(PaidUpEnter paidUpEnter) {
+    public void setPaidUpEnter(Long dayFree,Long price) {
         if (day != null) {
             if (day < 0) {
                 day = 0;
@@ -87,13 +93,13 @@ public class PaidUpDialog extends BaseDialog<MainPresenter, DialogPaidUpBinding>
 
         } else {
             mViewBinding.tvLine1.setText(Html.fromHtml("<big><font color=\"black\">高级功能可试用</font></big>" +
-                    "<big><big><big><font  color=\"red\">" + paidUpEnter.getMssrvFree() + "</font></big></big></big>" + "<big><font color=\"black\">月</font></big>"));
+                    "<big><big><big><font  color=\"red\">" + dayFree + "</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><font  color=\"black\">" + ConvertUtil.fenToYuan(Long.valueOf(paidUpEnter.getMssrvPrice2()), false) + "/年" + "</font></big></big></big>"));
+                "<big><big><big><font  color=\"black\">" + ConvertUtil.fenToYuan(Long.valueOf(price), false) + "/年" + "</font></big></big></big>"));
 
 
     }

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

@@ -14,6 +14,7 @@ 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.MainPresenter;
 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;
@@ -27,7 +28,7 @@ import com.xingdata.zzdpos.util.RecyclerViewUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MarketingMenuActivity extends BaseActivity<MarketingMenuPresenter, ActivityMarketingMenuBinding> implements MarketingMenuContract.View {
+public class MarketingMenuActivity extends BaseActivity<MainPresenter, ActivityMarketingMenuBinding> implements com.xingdata.zzdpos.ui.main.MainContract.View {
     MarketingMenuAdapter marketingMenuAdapter;
     List<Integer> list = new ArrayList<>();
     private PaidUpDialog mPaidUpDialog = new PaidUpDialog();
@@ -131,4 +132,19 @@ public class MarketingMenuActivity extends BaseActivity<MarketingMenuPresenter,
             }
         }
     }
+
+    @Override
+    public void showUptateDialog(String updateUrl, String version) {
+
+    }
+
+    @Override
+    public void handoverOk() {
+
+    }
+
+    @Override
+    public void showHandoverDialog() {
+
+    }
 }

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