Skip to content

S
supplier
Commit bc78c384 by 宁斌
Options

1、所有activity默認設置成豎屏 如果是平板根據系統走

parent 02eff0af
Showing with 152 additions and 115 deletions
arms/src/main/java/com/jess/arms/base/BaseActivity.java
......@@ -88,13 +88,14 @@ public abstract class BaseActivity<P extends IPresenter> extends AppCompatActivi
return view == null ? super.onCreateView(name, context, attrs) : view;
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mContext = this;
if (!QMUIDeviceHelper.isTablet(this)) {
//手機端直接強制竖屏
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
if (QMUIDeviceHelper.isTablet(this)) {
//平板端按照系統方向來
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}
//DecorView的背景对我来说无用，但是会产生一次Overdraw,这里去掉（过度绘制优化）
getWindow().setBackgroundDrawable(null);
......
base-module/build.gradle
......@@ -51,7 +51,7 @@ android {
/**
* 版本号
*/
schemaVersion 17
schemaVersion 18
/**
* greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下）
*/
......
base-module/src/main/java/com/gingersoft/gsa/cloud/bean/RestaurantExpandInfo.java
package com.gingersoft.gsa.cloud.bean;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/**
* 作者：ELEGANT_BIN
......@@ -9,10 +11,10 @@ import lombok.Data;
* 修订历史：2018/8/11
* 描述：保存餐廳UI配置信息
*/
@Data
public class RestaurantExpandInfo {
@Data
@Getter
@Setter
public static final class UIStyleConfiguration {
/**
* 食品組、食品、細項、折扣行列寬高
......@@ -228,14 +230,15 @@ public class RestaurantExpandInfo {
}
@Data
@Getter
@Setter
public static final class FunctionConfiguration {
/**
* 賬單小數相關
*/
private int Rounding;
private int RoundingDecimal;
private int ItemDecimals;
private int Rounding = 0;
private int RoundingDecimal = 1;
private int ItemDecimals = 2;//商品價格保留多少位小數
private int DeliveryPrintCount;//外送印單打印次數
private int DeliveryClosingPC;//外送結賬打印次數
......@@ -248,6 +251,7 @@ public class RestaurantExpandInfo {
private int PrintStatisticsAmount;//是否顯示統計打印數
private int PrintFirstOrder;//是否打印"頭單"文字
private int FrozenChainAutoOrder;//是否自動接單 為0true
private int MergeSendFood;//送單是否自動合併食品
private int AutoPrinterPaper;//送單自動打印上菜紙
private int ToPrintQRCode;//結賬是否打印積分二維碼
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/ExpandInfo.java
......@@ -6,6 +6,8 @@ import org.greenrobot.greendao.annotation.Id;
import org.greenrobot.greendao.annotation.Property;
import org.greenrobot.greendao.annotation.Transient;
import java.io.Serializable;
import lombok.Data;
/**
......@@ -17,7 +19,10 @@ import lombok.Data;
*/
@Data
@Entity
public class ExpandInfo {
public class ExpandInfo implements Serializable {
private static final long serialVersionUID = -82395061667241608L;
@Property(nameInDb = "_id")
@Id(autoincrement = true)
......@@ -47,15 +52,17 @@ public class ExpandInfo {
* 4：日期類型
*/
private int dataType;
private String showName;
//是否被編輯了
@Transient
private boolean isUpdate = false;
private String showName;
public static final int data_type_int = 1;
public static final int data_type_string = 2;
public static final int data_type_boolean = 3;
public static final int data_type_date = 4;
@Generated(hash = 1155994232)
public ExpandInfo(Long id, int restaurantId, String settingName,
Integer valueInt, String valueChar, String valueDatetime, String remark,
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
......@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
* Master of DAO (schema version 17): knows all DAOs.
* Master of DAO (schema version 18): knows all DAOs.
*/
public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 17;
public static final int SCHEMA_VERSION = 18;
/** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/utils/ComboItemDaoUtils.java
......@@ -206,53 +206,6 @@ public class ComboItemDaoUtils {
*
* @return
*/
public List<ComboItem> queryComboFoodsByQueryBuilder(long fid) {
// ComboItem comboItem = queryComboByQueryBuilder(fid);
// List<ComboItem> foodCombos = null;
// if (comboItem != null) {
// foodCombos = queryCombosByComIdQueryBuilder(comboItem.getComId());
// }
List<ComboItem> list = new ArrayList<>();
// FoodDaoUtils foodDao = new FoodDaoUtils(mContext);
// if (foodCombos != null) {
// for (int i = 0; i < foodCombos.size(); i++) {
// Food food = foodDao.queryFoodByFidQueryBuilder(foodCombos.get(i).getFid());
// if (food != null) {
// list.add(comboItem.addFoodInfo(food, foodCombos.get(i)));
// }
// }
// }
return list;
}
public List<ComboItem> queryCombosFoodsByQueryBuilder(long fid) {
QueryBuilder<ComboItem> queryBuilder = mManager.getDaoSession().queryBuilder(ComboItem.class);
// queryBuilder.where(queryBuilder.join()).orderAsc(FoodDao.Properties.SeqNo).list();
// List<ComboItem> ComboItem = queryCombosByQueryBuilder(fid);
// List<ComboItem> foodCombos = null;
// if (ComboItem != null && ComboItem.size() != 0) {
// foodCombos = queryCombosByComIdQueryBuilder(ComboItem.get(0).getComId());
// }
List<ComboItem> list = new ArrayList<>();
// FoodDaoUtils foodDao = new FoodDaoUtils(mContext);
// if (foodCombos != null) {
// for (int i = 0; i < foodCombos.size(); i++) {
// Food food = foodDao.queryFoodByFidQueryBuilder(foodCombos.get(i).getFid());
// if(food != null) {
// list.add(ComboItem.addFoodInfo(food, foodCombos.get(i)));
// }
// }
// }
return list;
}
/**
* 使用queryBuilder进行查询食品
*
* @return
*/
public ComboItem queryComboByQueryBuilder(long fid) {
QueryBuilder<ComboItem> queryBuilder = mManager.getDaoSession().queryBuilder(ComboItem.class);
return queryBuilder.where(ComboItemDao.Properties.Fid.eq(fid)).build().unique();
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java
......@@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.Context;
import android.net.ParseException;
import android.text.TextUtils;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
......@@ -14,9 +15,12 @@ import com.google.gson.JsonParseException;
import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import org.json.JSONException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import me.jessyan.rxerrorhandler.handler.listener.ResponseErrorListener;
import retrofit2.HttpException;
import timber.log.Timber;
......@@ -64,7 +68,8 @@ public class MyResponseErrorListener implements ResponseErrorListener {
msg = ArmsUtils.getString(context, R.string.response_error_request_was_redirected_to_another_page);
} else if (httpException.code() == 401) {
Activity activity = GsaCloudApplication.getAppContext().getCurrentActivity();
if (!showloggedDialog && activity != null) {
// if (!showloggedDialog && activity != null) {
if (activity != null) {
showloggedDialog = true;
showloggedDialog(activity, ArmsUtils.getString(context, R.string.response_error_request_logged));
}
......
coldchain-module/src/main/AndroidManifest.xml
......@@ -4,9 +4,15 @@
<application>
<activity android:name=".mvp.ui.activity.OrderDetailsActivity"/>
<activity android:name=".mvp.ui.activity.SupplementOrderActivity" />
<activity android:name=".mvp.ui.activity.ColdChainMainActivity"/>
<activity
android:name=".mvp.ui.activity.OrderDetailsActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".mvp.ui.activity.SupplementOrderActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".mvp.ui.activity.ColdChainMainActivity"
android:screenOrientation="portrait"/>
<!-- arms配置 -->
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
......
delivery_pick_module/src/main/AndroidManifest.xml
......@@ -10,23 +10,35 @@
<activity
android:name=".ui.activity.DeliveryOrderMainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
android:launchMode="singleTop"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="action.gingersoft.DELIVERY_ORDER" />
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name=".ui.activity.HistoryOrderActivity" />
<activity
android:name=".ui.activity.HistoryOrderActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".ui.activity.DeliverySettingActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".ui.activity.OrderDetailsActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".ui.activity.PayActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".ui.activity.LogActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".mvp.ui.activity.SendOrderActivity"
android:screenOrientation="portrait"/>
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
<activity android:name=".ui.activity.DeliverySettingActivity" />
<activity android:name=".ui.activity.OrderDetailsActivity" />
<activity android:name=".ui.activity.PayActivity" />
<activity android:name=".ui.activity.LogActivity" />
<activity android:name=".mvp.ui.activity.SendOrderActivity"/>
</application>
</manifest>
\ No newline at end of file
download-module/src/main/AndroidManifest.xml
......@@ -5,16 +5,18 @@
<uses-permission android:name="android.permission.INTERNET" />
<application>
<activity android:name=".mvp.ui.activity.DownloadActivity"/>
<activity
android:name=".mvp.ui.activity.DownloadActivity"
android:screenOrientation="portrait" />
<!-- arms配置 -->
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
<meta-data
android:name="design_width_in_dp"
android:value="360"/>
android:value="360" />
<meta-data
android:name="design_height_in_dp"
android:value="640"/>
android:value="640" />
</application>
</manifest>
login-module/src/main/AndroidManifest.xml
......@@ -28,7 +28,8 @@
<activity
android:name=".mvp.ui.activity.mvp.ui.activity.WelcomeActivity"
android:launchMode="singleTop">
android:launchMode="singleTop"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />
......@@ -38,20 +39,27 @@
</activity>
<activity
android:name=".mvp.ui.activity.mvp.ui.activity.LoginActivity"
android:launchMode="singleTop" />
<activity android:name=".mvp.ui.activity.mvp.ui.activity.SwitchServerActivity" />
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.mvp.ui.activity.SwitchServerActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.mvp.ui.activity.RecoverPasswordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.mvp.ui.activity.ChooseRestaurantActivity"
android:screenOrientation="portrait" />
<activity android:name=".mvp.ui.activity.mvp.ui.activity.RecoverPasswordActivity" />
<activity android:name=".mvp.ui.activity.mvp.ui.activity.ChooseRestaurantActivity"/>
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
<meta-data
android:name="design_width_in_dp"
android:value="360"/>
android:value="360" />
<meta-data
android:name="design_height_in_dp"
android:value="640"/>
android:value="640" />
<meta-data
android:name="android.max_aspect"
......@@ -59,12 +67,11 @@
<!--适配华为（huawei）刘海屏-->
<meta-data
android:name="android.notch_support"
android:value="true"/>
android:value="true" />
<!--适配小米（xiaomi）刘海屏-->
<meta-data
android:name="notch.config"
android:value="portrait|landscape" />
</application>
</manifest>
main-module/src/main/AndroidManifest.xml
......@@ -7,14 +7,30 @@
<activity
android:name=".mvp.ui.activity.NewMainActivity"
android:launchMode="singleTask" />
<activity android:name=".mvp.ui.activity.ExpandListActivity"/>
<activity android:name=".mvp.ui.activity.MainActivity" />
<activity android:name=".mvp.ui.activity.ReportActivity" />
<activity android:name=".mvp.ui.activity.SettlementActivity" />
<activity android:name=".mvp.ui.activity.SettlementReportActivity" />
<activity android:name=".mvp.ui.activity.LookLogActivity" />
<activity android:name=".mvp.ui.activity.LanguageActivity" />
<activity android:name=".mvp.ui.activity.RestaurantQrCodeActivity"/>
<activity
android:name=".mvp.ui.activity.ExpandListActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.MainActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.ReportActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.SettlementActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.SettlementReportActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.LookLogActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.LanguageActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.RestaurantQrCodeActivity"
android:screenOrientation="portrait" />
<!-- arms配置 -->
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
......
order-advance-module/src/main/AndroidManifest.xml
......@@ -3,7 +3,9 @@
package="com.gingersoft.order_advance_module">
<application>
<activity android:name=".mvp.ui.activity.DiningTableActivity" />
<activity
android:name=".mvp.ui.activity.DiningTableActivity"
android:screenOrientation="portrait"/>
<!-- arms配置 -->
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
......
print-module/src/main/AndroidManifest.xml
......@@ -8,16 +8,22 @@
<activity
android:name=".mvp.ui.activity.PrintActivity"
android:launchMode="singleTop"
android:theme="@style/print_TranslucentTheme" />
android:theme="@style/print_TranslucentTheme"
android:screenOrientation="portrait"/>
<activity android:name=".mvp.ui.activity.PrinterListActivity" />
<activity android:name=".mvp.ui.activity.PrinterAddActivity" />
<activity android:name=".mvp.ui.activity.PrinterListActivity"
android:screenOrientation="portrait"/>
<activity android:name=".mvp.ui.activity.PrinterAddActivity"
android:screenOrientation="portrait"/>
<service android:name=".mvp.print.service.PrjService"/>
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
<activity android:name=".mvp.ui.activity.PrintTestActivity"/>
<activity android:name=".mvp.ui.activity.PrintAddCurrencyActivity"/>
<activity
android:name=".mvp.ui.activity.PrintTestActivity"
android:screenOrientation="portrait"/>
<activity android:name=".mvp.ui.activity.PrintAddCurrencyActivity"
android:screenOrientation="portrait"/>
</application>
......
table-module/src/main/AndroidManifest.xml
......@@ -11,24 +11,38 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:networkSecurityConfig="@xml/network_android">
<application android:networkSecurityConfig="@xml/network_android">
<activity
android:name=".mvp.ui.activity.TableActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.MealStandActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.OrderPayActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.OrderContentActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.orderManager.OrderCenterActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.orderManager.OrderDetailActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.SoldoutCtrlActivity"
android:screenOrientation="portrait" />
<activity android:name=".mvp.ui.activity.TableActivity"/>
<activity android:name=".mvp.ui.activity.MealStandActivity"/>
<activity android:name=".mvp.ui.activity.OrderPayActivity" />
<activity android:name=".mvp.ui.activity.OrderContentActivity" />
<activity android:name=".mvp.ui.activity.orderManager.OrderCenterActivity" />
<activity android:name=".mvp.ui.activity.orderManager.OrderDetailActivity" />
<activity android:name=".mvp.ui.activity.SoldoutCtrlActivity" />
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
<meta-data
android:name="design_width_in_dp"
android:value="360"/>
android:value="360" />
<meta-data
android:name="design_height_in_dp"
android:value="640"/>
android:value="640" />
</application>
</manifest>
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
......@@ -20,6 +20,7 @@ import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.database.utils.FunctionDaoUtils;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
......@@ -69,6 +70,7 @@ import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import lombok.Data;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
import android.os.Message;
import android.view.View;
......@@ -31,6 +32,7 @@ import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
import com.qmuiteam.qmui.arch.QMUIFragmentPagerAdapter;
import com.qmuiteam.qmui.layout.QMUIButton;
import com.qmuiteam.qmui.util.QMUIDeviceHelper;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUITopBar;
import com.qmuiteam.qmui.widget.popup.QMUIPopup;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/FoodAdapter.java
......@@ -162,6 +162,7 @@ public class FoodAdapter extends DefaultAdapter<Food> {
tv_number.setLayoutParams(lp);
tv_number.setTextSize(10);
tv_number.setHeight(mLayoutQtyHeight);
if (datasBean.getNumber() == 0) {
tv_number.setVisibility(View.INVISIBLE);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ModifierAdapter.java
......@@ -35,7 +35,6 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
private int ColHeight;
private int FontSize;
private int OrderNumberChildShowSize;
private int OrderNumberChildFontSize;
......@@ -45,7 +44,6 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
ColHeight = GsaCloudApplication.uiStyleConfiguration.getModBtnHeight();
FontSize = GsaCloudApplication.uiStyleConfiguration.getModFontSize();
OrderNumberChildShowSize = GsaCloudApplication.uiStyleConfiguration.getOrderNumberChildShowSize();
OrderNumberChildFontSize = GsaCloudApplication.uiStyleConfiguration.getOrderNumberChildFontSize();
}
......
table-module/src/main/res/layout/meal_item_discount.xml
......@@ -6,7 +6,7 @@
android:layout_marginRight="1px"
android:layout_marginTop="1px"
android:gravity="center"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_2"
android:text="food"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/theme_white_color"
......
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