6.17 提交

arms/src/main/java/com/jess/arms/utils/ArmsUtils.java

@@ -219,7 +219,7 @@ public class ArmsUtils {
             mToast.cancel();
             mToast.cancel();
             mToast  = null;
             mToast  = null;
         }
         }
-        mToast = Toast.makeText(context, string, Toast.LENGTH_SHORT);
+        mToast = Toast.makeText(context.getApplicationContext(), string, Toast.LENGTH_SHORT);
         mToast.setText(string);
         mToast.setText(string);
         mToast.show();
         mToast.show();
     }
     }

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/toast/ToastUtils.java

@@ -17,7 +17,7 @@ public class ToastUtils {
             public void run() {
             public void run() {
                 if (context != null) {
                 if (context != null) {
                     if (mToast == null) {
                     if (mToast == null) {
-                        mToast = Toast.makeText(context, text, duration);
+                        mToast = Toast.makeText(context.getApplicationContext(), text, duration);
                     } else {
                     } else {
                         mToast.setText(text);
                         mToast.setText(text);
                         mToast.setDuration(duration);
                         mToast.setDuration(duration);

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt

@@ -497,7 +497,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
     /**
     /**
      * 打開錢箱
      * 打開錢箱
      */
      */
-    fun openCashBox(){
+    fun openCashBox() {
         CC.obtainBuilder("Component.Print")
         CC.obtainBuilder("Component.Print")
                 .addParam(PrintConstans.PRINT_TYPE, 6)
                 .addParam(PrintConstans.PRINT_TYPE, 6)
                 .addParam(PrintConstans.PRINT_LOADING, false)
                 .addParam(PrintConstans.PRINT_LOADING, false)
@@ -543,6 +543,10 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
         launch({
         launch({
             repository.getDeliveryInfo(GsaCloudApplication.getRestaurantId(context).toString(), GsaCloudApplication.getMemberId(context).toString()).apply {
             repository.getDeliveryInfo(GsaCloudApplication.getRestaurantId(context).toString(), GsaCloudApplication.getMemberId(context).toString()).apply {
                 deliveryBean = this
                 deliveryBean = this
+                if (this.data.isEmpty()) {
+                    ToastUtils.show(context, "沒有配置配送員信息")
+                    return@apply
+                }
                 //顯示選擇派送員
                 //顯示選擇派送員
                 object : DialogUtils(context, R.layout.other_order_layout_assign_deliveryman) {
                 object : DialogUtils(context, R.layout.other_order_layout_assign_deliveryman) {
                     override fun initLayout(hepler: ViewHepler?, dialog: Dialog?) {
                     override fun initLayout(hepler: ViewHepler?, dialog: Dialog?) {
@@ -592,7 +596,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                         .setGravity(Gravity.BOTTOM)
                         .setGravity(Gravity.BOTTOM)
                         .show()
                         .show()
             }
             }
-        },{
+        }, {
 
 
         })
         })
     }
     }