Skip to content

S
supplier
Commit b5790dcf by 宁斌
Options

1.1.8正式版

parent c07d6ee1
Showing with 20 additions and 8 deletions
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; ...@@ -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.table.mvp.ui.widget.SplitTableDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog; 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.base.DefaultAdapter;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader; 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 ...@@ -467,7 +467,14 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
mAppManager.killActivity("PrintActivity"); 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() { private void printBill() {
...@@ -481,11 +488,11 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements ...@@ -481,11 +488,11 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
.callAsyncCallbackOnMainThread(new IComponentCallback() { .callAsyncCallbackOnMainThread(new IComponentCallback() {
@Override @Override
public void onResult(CC cc, CCResult result) { public void onResult(CC cc, CCResult result) {
hideLoading();
LoganManager.w_code(TAG, "printBill " + "是否成功打印：" + result.isSuccess()); LoganManager.w_code(TAG, "printBill " + "是否成功打印：" + result.isSuccess());
mAppManager.killActivity("PrintActivity"); mAppManager.killActivity("PrintActivity");
mAppManager.killActivity(MealStandActivity.class); mAppManager.killActivity(MealStandActivity.class);
mAppManager.killActivity(OrderContentActivity.class); mAppManager.killActivity(OrderContentActivity.class);
hideLoading();
killMyself(); killMyself();
} }
}); });
......
config.gradle
...@@ -7,8 +7,8 @@ ext { ...@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 29, targetSdkVersion : 29,
//正式版: 1.0.3 3 //正式版: 1.0.3 3
//內部測試版:1.2.0 20 //內部測試版:1.2.0 20
versionCode : 17, versionCode : 18,
versionName : "1.1.7" versionName : "1.1.8"
] ]
version = [ version = [
......
library-database/src/main/java/com/gingersoft/gsa/cloud/database/utils/FoodDaoUtils.java
...@@ -4,7 +4,9 @@ import android.content.Context; ...@@ -4,7 +4,9 @@ import android.content.Context;
import android.util.Log; import android.util.Log;
import com.gingersoft.gsa.cloud.database.DaoManager; 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.bean.Food;
import com.gingersoft.gsa.cloud.database.greendao.ColorBeanDao;
import com.gingersoft.gsa.cloud.database.greendao.FoodDao; import com.gingersoft.gsa.cloud.database.greendao.FoodDao;
import org.greenrobot.greendao.query.QueryBuilder; import org.greenrobot.greendao.query.QueryBuilder;
...@@ -161,10 +163,12 @@ public class FoodDaoUtils { ...@@ -161,10 +163,12 @@ public class FoodDaoUtils {
public List<Food> queryFoodGroupByQueryBuilder() { public List<Food> queryFoodGroupByQueryBuilder() {
QueryBuilder<Food> queryBuilder = mManager.getDaoSession().queryBuilder(Food.class); QueryBuilder<Food> queryBuilder = mManager.getDaoSession().queryBuilder(Food.class);
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
return queryBuilder.where(queryBuilder.and( // queryBuilder.join(ColorBean.class, ColorBeanDao.Properties.ColorId)
FoodDao.Properties.ParentId.eq(0), queryBuilder .where(queryBuilder.and(
FoodDao.Properties.StartDate.le(currentTime), FoodDao.Properties.ParentId.eq(0),
FoodDao.Properties.EndDate.ge(currentTime))).orderAsc(FoodDao.Properties.SeqNo).list(); FoodDao.Properties.StartDate.le(currentTime),
FoodDao.Properties.EndDate.ge(currentTime)));
return queryBuilder.orderAsc(FoodDao.Properties.SeqNo).list();
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment