大吉大利+2

app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementActivity.java

@@ -10,13 +10,14 @@ import com.xingdata.zzdpos.databinding.ActivityAnnouncementBinding;
 import com.xingdata.zzdpos.model.Notice;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.announcement.fragment.AnnouncementFragment;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 
 public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, ActivityAnnouncementBinding> implements AnnouncementContract.View {
 
     private AnnouncementFragment mAnnouncementFragment = new AnnouncementFragment();
-
+    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {
@@ -41,6 +42,17 @@ public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, Ac
 //        mAnnouncementDetailFragment.showAnnouncementDetail(s);
 //    }
 
+    @Override
+    public void isShowLoading(Boolean is) {
+        if (is) {
+            mLoadingDialog.show((BaseActivity) mContext);
+        } else {
+            if (mLoadingDialog.isShowing) {
+                mLoadingDialog.dismiss();
+            }
+        }
+    }
+
     @Override
     public void loadNotice(Pager<Notice> noticePager, boolean isRefresh) {
         mAnnouncementFragment.setData(noticePager, isRefresh);

app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementContract.java

@@ -9,7 +9,7 @@ import com.xingdata.zzdpos.model.Pager;
 public interface AnnouncementContract {
 
     interface View extends BaseView {
-
+        void isShowLoading(Boolean is);
         /**
          * 加载列表
          */

app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementPresenter.java

@@ -14,8 +14,9 @@ public class AnnouncementPresenter extends AnnouncementContract.Presenter {
 
     @Override
     public void queryNoticeList() {
+        mView.isShowLoading(true);
         ApiFactory.Notice.queryNotice(nowPageNumber, nowPageSize).doFinally(() -> {
-//            mView.isShowLoading(false);
+            mView.isShowLoading(false);
         })
                 .subscribe(noticePager -> {
                     if (noticePager.getTotalRow() == 0) {

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

@@ -14,6 +14,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.ActivityMainBinding;
 import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
 import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
 import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
@@ -39,7 +40,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     //    private List<View> views=new ArrayList<>();
     private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
     private HandoverDialog mHandoverDialog = new HandoverDialog();
-
+    LoadingDialog mLoadingDialog = new LoadingDialog();
     @Override
     public int getLayoutId() {
         return R.layout.activity_main;
@@ -136,6 +137,17 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 
     }
 
+    @Override
+    public void isShowLoading(Boolean is) {
+        if (is) {
+            mLoadingDialog.show((BaseActivity) mContext);
+        } else {
+            if (mLoadingDialog.isShowing) {
+                mLoadingDialog.dismiss();
+            }
+        }
+    }
+
     @Override
     public void handoverOk() {
         mHandoverDialog.dismiss();

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

@@ -7,6 +7,8 @@ import com.xingdata.zzdpos.base.BaseView;
 interface MainContract {
 
     interface View extends BaseView {
+        void isShowLoading(Boolean is);
+
         /**
          * 交班确认
          */
@@ -17,6 +19,7 @@ interface MainContract {
 //         */
 //        void showChangePasswordDialog();
 //
+
         /**
          * 显示交班报表页面
          */
@@ -270,6 +273,7 @@ interface MainContract {
 //         */
 //        public abstract void clickChangePassword();
 //
+
         /**
          * 菜单EXIT页面 - 点击交班 打开交班报表页面
          */
@@ -507,6 +511,7 @@ interface MainContract {
 //         */
 //        public abstract void sync(SplashPresenter.SynchronousTask synchronousTask);
 //
+
         /**
          * 初始化交班记录
          */
@@ -527,6 +532,7 @@ interface MainContract {
 //         */
 //        public abstract void clickFeedOk(Feed feed);
 //
+
         /**
          * 注销
          */

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java

@@ -17,6 +17,7 @@ import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment;
@@ -26,7 +27,7 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
     private StatisticsDateFragment mStatisticsDateFragment = new StatisticsDateFragment();
     private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
     private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment();
-
+    LoadingDialog mLoadingDialog = new LoadingDialog();
     @Override
     public int getLayoutId() {
         return R.layout.activity_statistics;
@@ -89,6 +90,18 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
         FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding.fragmentContainer.getId(), false, true);
     }
 
+
+    @Override
+    public void isShowLoading(Boolean is) {
+        if (is) {
+            mLoadingDialog.show((BaseActivity) mContext);
+        } else {
+            if (mLoadingDialog.isShowing) {
+                mLoadingDialog.dismiss();
+            }
+        }
+    }
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
 //        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
@@ -98,4 +111,5 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
 //        }
         return super.onKeyDown(keyCode, event);
     }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java

@@ -21,6 +21,7 @@ public interface StatisticsContract {
 
 
     interface View extends BaseView {
+        void isShowLoading(Boolean is);
         /**
          * 设置统计信息
          */

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -20,13 +20,14 @@ import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 
 public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter, ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
 
-
+    LoadingDialog mLoadingDialog = new LoadingDialog();
     @Override
     public int getLayoutId() {
         return R.layout.activity_statistics_detail;
@@ -93,6 +94,17 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         viewVipRechargeBinding.setSendAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtSend(), false));
     }
 
+    @Override
+    public void isShowLoading(Boolean is) {
+        if (is) {
+            mLoadingDialog.show((BaseActivity) mContext);
+        } else {
+            if (mLoadingDialog.isShowing) {
+                mLoadingDialog.dismiss();
+            }
+        }
+    }
+
     @Override
     public void getOrderDetailSuss(Saleorder mSaleorder) {
 

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailContract.java

@@ -16,7 +16,7 @@ public interface StatisticsDetailContract {
 
     interface View extends BaseView {
 
-
+        void isShowLoading(Boolean is);
         void getOrderDetailSuss(Saleorder saleorder);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailPresenter.java

@@ -17,7 +17,9 @@ public class StatisticsDetailPresenter extends StatisticsDetailContract.Presente
 
     @Override
     public void getOrderDetail(String mSaleorderId) {
-        ApiFactory.Test.getSaleOrderDetail(mSaleorderId).subscribe(saleorder -> {
+        mView.isShowLoading(true);
+        ApiFactory.Test.getSaleOrderDetail(mSaleorderId).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(saleorder -> {
                     mView.getOrderDetailSuss(saleorder);
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java

@@ -44,8 +44,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment fragment) {
+        mView.isShowLoading(true);
         ApiFactory.Test.getSaleOrderList("99", pageNumber, pageSize, startDate, endDate).doFinally(() -> {
-
+            mView.isShowLoading(false);
         })
                 .subscribe(orderlist -> {
                     fragment.setData(orderlist, orderlist.isFirstPage());
@@ -73,7 +74,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getRechargeList(int pageNumber, RechargeListFragment msListFragment) {
-        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize)
+        mView.isShowLoading(true);
+        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize).doFinally(()-> mView.isShowLoading(false))
                 .subscribe(vipRechargeOrderPager -> {
                     msListFragment.setData(vipRechargeOrderPager, vipRechargeOrderPager.isFirstPage());
                 }, throwable -> {
@@ -83,7 +85,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getRechargeList(int pageNumber, long startDate, long endDate) {
-        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate)
+        mView.isShowLoading(true);
+        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
                 .subscribe(vipRechargeOrderPager -> {
                     //判断是否能加载更多
                     if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
@@ -98,7 +101,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getTicketList(int pageNumber, UsedTicketListFragment msListFragment) {
-        ApiFactory.Ticket.query(pageNumber, nowPageSize, 1)
+        mView.isShowLoading(true);
+        ApiFactory.Ticket.query(pageNumber, nowPageSize, 1).doFinally(()-> mView.isShowLoading(false))
                 .subscribe(ticketPager -> {
                     msListFragment.setData(ticketPager, ticketPager.isFirstPage());
                 }, throwable -> {
@@ -108,7 +112,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getTicketList(int pageNumber, long startDate, long endDate) {
-        ApiFactory.Ticket.query(pageNumber, nowPageSize, 1, startDate, endDate)
+        mView.isShowLoading(true);
+        ApiFactory.Ticket.query(pageNumber, nowPageSize, 1, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
                 .subscribe(ticketPager -> {
                     if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
                         ToastUtils.showShort("没有查询到相关优惠券");
@@ -125,7 +130,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
      */
     @Override
     public void getSaleOrderList(int pageNumber, String wd) {
-        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd)
+        mView.isShowLoading(true);
+        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd).doFinally(()-> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
                     if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
@@ -142,7 +148,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getSaleOrderList(int pageNumber, long startDate, long endDate) {
-        ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate)
+        mView.isShowLoading(true);
+        ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
                     if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/UsedTicketListFragment.java

@@ -100,7 +100,7 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
 
     @Override
     public String getTabTitle() {
-        return "核销优惠券";
+        return "已用优惠券";
 
 
     }