试用

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

@@ -188,6 +188,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     @Override
     public void showPaidUpVipDialog(Class activity, Integer day) {
         mPaidUpDialog.setDay(day);
+        mPaidUpDialog.setClass(activity);
         mPaidUpDialog.show(this);
     }
 

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

@@ -90,26 +90,9 @@ public class MainPresenter extends MainContract.Presenter {
 
     @Override
     public void clickHandover() {
-        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);
-                                if (day <= 7) {
-                                    mView.showPaidUpVipDialog(null, day);
-                                } else {
-                                    mView.showHandoverDialog();
-                                }
 
-                            }
-                        }
+        mView.showHandoverDialog();
 
-                        , throwable -> {
-                            ToastUtils.showShort(throwable.getMessage());
-                        }
-                );
     }
 
 

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

@@ -16,7 +16,7 @@ import com.xingdata.zzdpos.util.ConvertUtil;
 /**
  * 交班页面
  */
-public class PaidUpDialog extends BaseDialog<MarketingMenuPresenter, DialogPaidUpBinding> {
+public class PaidUpDialog extends BaseDialog<MainPresenter, DialogPaidUpBinding> {
     private Boolean isNew = true;
     private Integer day;
     private Class mClass;
@@ -42,9 +42,13 @@ public class PaidUpDialog extends BaseDialog<MarketingMenuPresenter, DialogPaidU
     @Override
     public void onCancelClick(View view) {
         super.onCancelClick(view);
-        if (!isNew && mClass != null) {
-
+        if (!isNew) {
+            if (mClass != null) {
                 ActivityUtils.startActivity(mClass);
+            } else {
+                mPresenter.clickHandover();
+            }
+
 
         }
     }

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java

@@ -19,6 +19,7 @@ import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
 import com.xingdata.zzdpos.ui.manage.manageMenu.ManageMenuActivity;
 import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity;
 import com.xingdata.zzdpos.ui.payment.PaymentActivity;
+import com.xingdata.zzdpos.ui.sendticke.SendTicketActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsActivity;
 import com.xingdata.zzdpos.ui.store.StoreActivity;
 import com.xingdata.zzdpos.ui.vip.VipActivity;
@@ -130,7 +131,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
                                 MarketingMenuActivity.class));
                         break;
                     case C.MENU.MENU_TICKET://优惠券
-                        ActivityUtils.startActivity(getActivity(), com.xingdata.zzdpos.ui.sendticke.SendTicketActivity.class);
+                        mPresenter.isPaidUpVip(SendTicketActivity.class);
                         break;
                     case C.MENU.MENU_STATISTICS://统计
                         ActivityUtils.startActivity(getActivity(), StatisticsActivity.class);
@@ -158,7 +159,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
         mViewBinding.btnHandover.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                mPresenter.clickHandover();
+                mPresenter.isPaidUpVip(null);
             }
         });
 

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

@@ -58,7 +58,7 @@ public final class SystemUtil {
             }
         }
 //        return "0818562";
-        return "test11";
+        return "test8988";
     }
 
     /**

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

@@ -38,7 +38,7 @@
         <View
             android:id="@+id/view1"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/all_margin"
+            android:layout_height="@dimen/view_line_L1"
             android:layout_marginTop="@dimen/all_margin"
             android:background="@color/lyt_main_bg"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -48,7 +48,7 @@
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="@dimen/all_margin_big"
+            android:padding="@dimen/all_margin"
             android:visibility="@{isShow?View.VISIBLE:View.GONE}">
 
             <ImageView
@@ -70,13 +70,14 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/all_padding"
                 android:layout_marginTop="@dimen/all_padding"
                 android:text="@string/paid_up_vip_model1_detail"
                 android:textColor="@color/gary"
                 android:textSize="@dimen/all_text_size_low"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/img_model_one"
                 app:layout_constraintTop_toBottomOf="@id/tv_model_one" />
         </android.support.constraint.ConstraintLayout>
@@ -84,7 +85,7 @@
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="@dimen/all_margin_big"
+            android:padding="@dimen/all_margin"
             android:visibility="@{isShow?View.VISIBLE:View.GONE}">
 
             <ImageView
@@ -105,21 +106,24 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/all_padding"
-                android:layout_marginTop="@dimen/all_padding"
                 android:text="@string/paid_up_vip_model2_detail"
                 android:textColor="@color/gary"
                 android:textSize="@dimen/all_text_size_low"
+                android:layout_marginStart="@dimen/all_padding"
+                android:layout_marginTop="@dimen/all_padding"
+                app:layout_constraintTop_toBottomOf="@id/tv_model_two"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/img_model_two"
-                app:layout_constraintTop_toBottomOf="@id/tv_model_two" />
+
+          />
         </android.support.constraint.ConstraintLayout>
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="@dimen/all_margin_big"
+            android:padding="@dimen/all_margin"
             android:visibility="@{isShow?View.VISIBLE:View.GONE}">
 
             <ImageView
@@ -140,10 +144,11 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/all_padding"
                 android:layout_marginTop="@dimen/all_padding"
+                app:layout_constraintEnd_toEndOf="parent"
                 android:text="@string/paid_up_vip_model1_detail"
                 android:textColor="@color/gary"
                 android:textSize="@dimen/all_text_size_low"