1.1.8正式版

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java

@@ -49,6 +49,7 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter;
 import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
+import com.google.android.material.internal.NavigationMenuItemView;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java

@@ -467,7 +467,14 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
                         mAppManager.killActivity("PrintActivity");
                     }
                 });
-        printBill();
+        RxJavaUtils.delay(1,TimeUnit.SECONDS)
+                .subscribe(new Consumer<Long>() {
+
+                    @Override
+                    public void accept(Long aLong) throws Exception {
+                        printBill();
+                    }
+                });
     }
 
     private void printBill() {
@@ -481,11 +488,11 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
                 .callAsyncCallbackOnMainThread(new IComponentCallback() {
                     @Override
                     public void onResult(CC cc, CCResult result) {
-                        hideLoading();
                         LoganManager.w_code(TAG, "printBill " + "是否成功打印：" + result.isSuccess());
                         mAppManager.killActivity("PrintActivity");
                         mAppManager.killActivity(MealStandActivity.class);
                         mAppManager.killActivity(OrderContentActivity.class);
+                        hideLoading();
                         killMyself();
                     }
                 });

config.gradle

@@ -7,8 +7,8 @@ ext {
             targetSdkVersion : 29,
             //正式版:    1.0.3  3
             //內部測試版:1.2.0  20
-            versionCode      : 17,
-            versionName      : "1.1.7"
+            versionCode      : 18,
+            versionName      : "1.1.8"
     ]
 
     version = [

library-database/src/main/java/com/gingersoft/gsa/cloud/database/utils/FoodDaoUtils.java

@@ -4,7 +4,9 @@ import android.content.Context;
 import android.util.Log;
 
 import com.gingersoft.gsa.cloud.database.DaoManager;
+import com.gingersoft.gsa.cloud.database.bean.ColorBean;
 import com.gingersoft.gsa.cloud.database.bean.Food;
+import com.gingersoft.gsa.cloud.database.greendao.ColorBeanDao;
 import com.gingersoft.gsa.cloud.database.greendao.FoodDao;
 
 import org.greenrobot.greendao.query.QueryBuilder;
@@ -161,10 +163,12 @@ public class FoodDaoUtils {
     public List<Food> queryFoodGroupByQueryBuilder() {
         QueryBuilder<Food> queryBuilder = mManager.getDaoSession().queryBuilder(Food.class);
         long currentTime = System.currentTimeMillis();
-        return queryBuilder.where(queryBuilder.and(
-                FoodDao.Properties.ParentId.eq(0),
-                FoodDao.Properties.StartDate.le(currentTime),
-                FoodDao.Properties.EndDate.ge(currentTime))).orderAsc(FoodDao.Properties.SeqNo).list();
+//        queryBuilder.join(ColorBean.class, ColorBeanDao.Properties.ColorId)
+        queryBuilder .where(queryBuilder.and(
+                        FoodDao.Properties.ParentId.eq(0),
+                        FoodDao.Properties.StartDate.le(currentTime),
+                        FoodDao.Properties.EndDate.ge(currentTime)));
+        return queryBuilder.orderAsc(FoodDao.Properties.SeqNo).list();
     }
 
     /**