Skip to content

S
supplier
Commit b9c5dcf3 by 宁斌
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	login-module/src/main/AndroidManifest.xml
#	main-module/src/main/AndroidManifest.xml
#	main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
parents 19072f96 3cc1ca01
Showing with 612 additions and 578 deletions
base-module/build.gradle
...@@ -45,7 +45,7 @@ android { ...@@ -45,7 +45,7 @@ android {
/** /**
* 版本号 * 版本号
*/ */
schemaVersion 14 schemaVersion 15
/** /**
* greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下） * greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下）
*/ */
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/Api.java
...@@ -32,6 +32,4 @@ public interface Api { ...@@ -32,6 +32,4 @@ public interface Api {
String printerDevice_list = "printerDevice/list"; String printerDevice_list = "printerDevice/list";
//日誌上傳 //日誌上傳
String upload_app_log = "public/cloud/gsa/upload"; String upload_app_log = "public/cloud/gsa/upload";
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
...@@ -124,6 +124,8 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -124,6 +124,8 @@ public class GsaCloudApplication extends BaseApplication {
androidSetting = new FunctionStyleUtils(); androidSetting = new FunctionStyleUtils();
isLogin = (boolean) SPUtils.get(this, PrintConstans.IS_LOGIN, false);
// 设定一些通用的属性，这些属性在每次统计事件中都会附带 // 设定一些通用的属性，这些属性在每次统计事件中都会附带
// 注意：如果此处的属性名与内置属性的名称相同，则内置属性会被覆盖 // 注意：如果此处的属性名与内置属性的名称相同，则内置属性会被覆盖
// Tracker.INSTANCE.addProperty("附加的属性1", "附加的属性1"); // Tracker.INSTANCE.addProperty("附加的属性1", "附加的属性1");
...@@ -408,6 +410,20 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -408,6 +410,20 @@ public class GsaCloudApplication extends BaseApplication {
return (String) SPUtils.get(context, UserConstans.gsPosShopId, "-1"); return (String) SPUtils.get(context, UserConstans.gsPosShopId, "-1");
} }
public static void logOut(){
SPUtils.remove(getAppContext(), UserConstans.token);
SPUtils.remove(getAppContext(), UserConstans.memberId);
SPUtils.remove(getAppContext(), UserConstans.brandId);
SPUtils.remove(getAppContext(), UserConstans.brandName);
SPUtils.remove(getAppContext(), UserConstans.restaurantId);
SPUtils.remove(getAppContext(), UserConstans.restaurantName);
SPUtils.remove(getAppContext(), UserConstans.memberName);
SPUtils.remove(getAppContext(), UserConstans.brandRestaurantInfos);
SPUtils.remove(getAppContext(), UserConstans.gsPosShopId);
SPUtils.put(getAppContext(), PrintConstans.IS_LOGIN, false);
GsaCloudApplication.isLogin = false;
}
public static String getAppName() { public static String getAppName() {
try { try {
PackageManager packageManager = mAppContext.getPackageManager(); PackageManager packageManager = mAppContext.getPackageManager();
......
base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
...@@ -94,9 +94,9 @@ public class HttpsConstans { ...@@ -94,9 +94,9 @@ public class HttpsConstans {
public static String ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL;// = isFormal ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS; public static String ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL;// = isFormal ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS;
//默認url，配置這個值修改環境 //默認url，配置這個值修改環境
public static String ROOT_SERVER_ADDRESS_FORMAL = (isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK) + PATH; public static String ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL + PATH;
public static String ROOT_SERVER = isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK; public static String ROOT_SERVER = HTTP_ADDRESS_URL_FORMAL;
//修改這個值，配置外賣接單環境 //修改這個值，配置外賣接單環境
public static String ROOT_URL;// = isFormal ? ROOT_FORMAL_URL : ROOT_HK_TEST_URL;//正式：ROOT_FORMAL_URL 測試：ROOT_HK_TEST_URL public static String ROOT_URL;// = isFormal ? ROOT_FORMAL_URL : ROOT_HK_TEST_URL;//正式：ROOT_FORMAL_URL 測試：ROOT_HK_TEST_URL
...@@ -126,6 +126,7 @@ public class HttpsConstans { ...@@ -126,6 +126,7 @@ public class HttpsConstans {
REPORT_SERVER_ADDRESS = REPORT_FORMAL_ADDRESS + REPORT_PATH; REPORT_SERVER_ADDRESS = REPORT_FORMAL_ADDRESS + REPORT_PATH;
WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_FORMAL_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_FORMAL_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
SYSTEM_URL = HTTP_ADDRESS_URL_FORMAL + SYSTEM_PATH; SYSTEM_URL = HTTP_ADDRESS_URL_FORMAL + SYSTEM_PATH;
ROOT_SERVER = HTTP_ADDRESS_URL_FORMAL;
break; break;
case 1: case 1:
_SERVER_ADDRESS = "http://a.ricepon.com:61177" + "/member-web/api/"; _SERVER_ADDRESS = "http://a.ricepon.com:61177" + "/member-web/api/";
...@@ -135,6 +136,7 @@ public class HttpsConstans { ...@@ -135,6 +136,7 @@ public class HttpsConstans {
REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS + REPORT_PATH; REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS + REPORT_PATH;
WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
SYSTEM_URL = ROOT_HK_TEST_URL + SYSTEM_PATH; SYSTEM_URL = ROOT_HK_TEST_URL + SYSTEM_PATH;
ROOT_SERVER = HTTP_ADDRESS_URL_HK;
break; break;
case 2: case 2:
_SERVER_ADDRESS = ROOT_SERVER_ZHI_WANG_HK + "/member-web/api/"; _SERVER_ADDRESS = ROOT_SERVER_ZHI_WANG_HK + "/member-web/api/";
......
base-module/src/main/java/com/gingersoft/gsa/cloud/constans/PrintConstans.java
...@@ -6,6 +6,7 @@ public class PrintConstans { ...@@ -6,6 +6,7 @@ public class PrintConstans {
//默認打印方式 //默認打印方式
public final static String DEFAULT_PRINT_METHOD = "default_print"; public final static String DEFAULT_PRINT_METHOD = "default_print";
public final static String IS_LOGIN = "is_login";
public final static String LOCAL_PRINT = "local_print"; public final static String LOCAL_PRINT = "local_print";
public final static String IP_PRINT = "ip_print"; public final static String IP_PRINT = "ip_print";
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/PrinterDeviceBean.java
...@@ -65,6 +65,7 @@ public class PrinterDeviceBean implements Serializable { ...@@ -65,6 +65,7 @@ public class PrinterDeviceBean implements Serializable {
private int numberIsFlip;//數量大於1顔色是否翻轉 0預設 1是 2否 private int numberIsFlip;//數量大於1顔色是否翻轉 0預設 1是 2否
private int languageType;
@Generated(hash = 626885316) @Generated(hash = 626885316)
public PrinterDeviceBean() { public PrinterDeviceBean() {
...@@ -76,9 +77,9 @@ public class PrinterDeviceBean implements Serializable { ...@@ -76,9 +77,9 @@ public class PrinterDeviceBean implements Serializable {
this.paperSpecification = paperSpecification; this.paperSpecification = paperSpecification;
} }
@Generated(hash = 1569426879) @Generated(hash = 790857534)
public PrinterDeviceBean(Long id, Long dbid, String name, Integer restaurantId, String ip, Long uid, Integer port, Integer type, Long printerModelId, String paperSpecification, int lineFontStop, String printerName, String model, String noteContent, Long printerDeviceDefaultId, int printerDeviceType, Long flyPrinterDeviceId, Long flyPrinterDeviceId2, int foodComplexion, int modifierComplexion, int foodIsBold, String foodFont, int foodIsItalic, int modifierIsBold, String modifierFont, public PrinterDeviceBean(Long id, Long dbid, String name, Integer restaurantId, String ip, Long uid, Integer port, Integer type, Long printerModelId, String paperSpecification, int lineFontStop, String printerName, String model, String noteContent, Long printerDeviceDefaultId, int printerDeviceType, Long flyPrinterDeviceId, Long flyPrinterDeviceId2, int foodComplexion, int modifierComplexion, int foodIsBold, String foodFont, int foodIsItalic, int modifierIsBold, String modifierFont,
int modifierIsItalic, int numberIsFlip) { int modifierIsItalic, int numberIsFlip, int languageType) {
this.id = id; this.id = id;
this.dbid = dbid; this.dbid = dbid;
this.name = name; this.name = name;
...@@ -106,6 +107,7 @@ public class PrinterDeviceBean implements Serializable { ...@@ -106,6 +107,7 @@ public class PrinterDeviceBean implements Serializable {
this.modifierFont = modifierFont; this.modifierFont = modifierFont;
this.modifierIsItalic = modifierIsItalic; this.modifierIsItalic = modifierIsItalic;
this.numberIsFlip = numberIsFlip; this.numberIsFlip = numberIsFlip;
this.languageType = languageType;
} }
public Long getId() { public Long getId() {
...@@ -330,4 +332,12 @@ public class PrinterDeviceBean implements Serializable { ...@@ -330,4 +332,12 @@ public class PrinterDeviceBean implements Serializable {
public void setModifierComplexion(int modifierComplexion) { public void setModifierComplexion(int modifierComplexion) {
this.modifierComplexion = modifierComplexion; this.modifierComplexion = modifierComplexion;
} }
public int getLanguageType() {
return languageType;
}
public void setLanguageType(int languageType) {
this.languageType = languageType;
}
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
...@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; ...@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/** /**
* Master of DAO (schema version 14): knows all DAOs. * Master of DAO (schema version 15): knows all DAOs.
*/ */
public class DaoMaster extends AbstractDaoMaster { public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 14; public static final int SCHEMA_VERSION = 15;
/** Creates underlying database table using DAOs. */ /** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) { public static void createAllTables(Database db, boolean ifNotExists) {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/PrinterDeviceBeanDao.java
...@@ -51,6 +51,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> { ...@@ -51,6 +51,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
public final static Property ModifierFont = new Property(24, String.class, "modifierFont", false, "MODIFIER_FONT"); public final static Property ModifierFont = new Property(24, String.class, "modifierFont", false, "MODIFIER_FONT");
public final static Property ModifierIsItalic = new Property(25, int.class, "modifierIsItalic", false, "MODIFIER_IS_ITALIC"); public final static Property ModifierIsItalic = new Property(25, int.class, "modifierIsItalic", false, "MODIFIER_IS_ITALIC");
public final static Property NumberIsFlip = new Property(26, int.class, "numberIsFlip", false, "NUMBER_IS_FLIP"); public final static Property NumberIsFlip = new Property(26, int.class, "numberIsFlip", false, "NUMBER_IS_FLIP");
public final static Property LanguageType = new Property(27, int.class, "languageType", false, "LANGUAGE_TYPE");
} }
...@@ -92,7 +93,8 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> { ...@@ -92,7 +93,8 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
"\"MODIFIER_IS_BOLD\" INTEGER NOT NULL ," + // 23: modifierIsBold "\"MODIFIER_IS_BOLD\" INTEGER NOT NULL ," + // 23: modifierIsBold
"\"MODIFIER_FONT\" TEXT," + // 24: modifierFont "\"MODIFIER_FONT\" TEXT," + // 24: modifierFont
"\"MODIFIER_IS_ITALIC\" INTEGER NOT NULL ," + // 25: modifierIsItalic "\"MODIFIER_IS_ITALIC\" INTEGER NOT NULL ," + // 25: modifierIsItalic
"\"NUMBER_IS_FLIP\" INTEGER NOT NULL );"); // 26: numberIsFlip "\"NUMBER_IS_FLIP\" INTEGER NOT NULL ," + // 26: numberIsFlip
"\"LANGUAGE_TYPE\" INTEGER NOT NULL );"); // 27: languageType
} }
/** Drops the underlying database table. */ /** Drops the underlying database table. */
...@@ -203,6 +205,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> { ...@@ -203,6 +205,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
} }
stmt.bindLong(26, entity.getModifierIsItalic()); stmt.bindLong(26, entity.getModifierIsItalic());
stmt.bindLong(27, entity.getNumberIsFlip()); stmt.bindLong(27, entity.getNumberIsFlip());
stmt.bindLong(28, entity.getLanguageType());
} }
@Override @Override
...@@ -307,6 +310,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> { ...@@ -307,6 +310,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
} }
stmt.bindLong(26, entity.getModifierIsItalic()); stmt.bindLong(26, entity.getModifierIsItalic());
stmt.bindLong(27, entity.getNumberIsFlip()); stmt.bindLong(27, entity.getNumberIsFlip());
stmt.bindLong(28, entity.getLanguageType());
} }
@Override @Override
...@@ -343,7 +347,8 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> { ...@@ -343,7 +347,8 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
cursor.getInt(offset + 23), // modifierIsBold cursor.getInt(offset + 23), // modifierIsBold
cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // modifierFont cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // modifierFont
cursor.getInt(offset + 25), // modifierIsItalic cursor.getInt(offset + 25), // modifierIsItalic
cursor.getInt(offset + 26) // numberIsFlip cursor.getInt(offset + 26), // numberIsFlip
cursor.getInt(offset + 27) // languageType
); );
return entity; return entity;
} }
...@@ -377,6 +382,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> { ...@@ -377,6 +382,7 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
entity.setModifierFont(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24)); entity.setModifierFont(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24));
entity.setModifierIsItalic(cursor.getInt(offset + 25)); entity.setModifierIsItalic(cursor.getInt(offset + 25));
entity.setNumberIsFlip(cursor.getInt(offset + 26)); entity.setNumberIsFlip(cursor.getInt(offset + 26));
entity.setLanguageType(cursor.getInt(offset + 27));
} }
@Override @Override
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/utils/BtnBuilder.kt
...@@ -63,7 +63,7 @@ class BtnBuilder(var functions: List<Function>) { ...@@ -63,7 +63,7 @@ class BtnBuilder(var functions: List<Function>) {
} }
fun getAdditionalServiceChargeBtn(): BtnBean? { fun getAdditionalServiceChargeBtn(): BtnBean? {
return getBtn(FunctionManagerConstans.takeaway.TRANSPORTATION_BTN_KEY, AdditionalServiceChargeBtn, "追加服務費", R.color.other_order_details_cancel_logistics_btn_color, R.drawable.ic_logistics) return getBtn(FunctionManagerConstans.takeaway.TRANSPORTATION_BTN_KEY, AdditionalServiceChargeBtn, "追加貼士", R.color.other_order_details_cancel_logistics_btn_color, R.drawable.ic_logistics)
} }
private fun getBtn(key: String, btnCode: Int, btnContent: String, btnColor: Int, btnImg: Int): BtnBean? { private fun getBtn(key: String, btnCode: Int, btnContent: String, btnColor: Int, btnImg: Int): BtnBean? {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/AddKeyBoard.java
...@@ -10,6 +10,7 @@ import android.widget.TextView; ...@@ -10,6 +10,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.recyclerview.widget.StaggeredGridLayoutManager;
...@@ -19,13 +20,14 @@ import com.jess.arms.utils.DeviceUtils; ...@@ -19,13 +20,14 @@ import com.jess.arms.utils.DeviceUtils;
public class AddKeyBoard extends FrameLayout { public class AddKeyBoard extends FrameLayout {
private String[] keyString = new String[]{"+10", "+20", "+50", "+100", "7", "8", "9", "X", "4", "5", "6", "1", "2", "3", "確定", "0", "00", "000"}; private String[] keyString = new String[]{"+10", "+20", "+50", "+100", "7", "8", "9", "X", "4", "5", "6", "0", "1", "2", "3", "確定"};
private float screenWidth; private int btnHeight;
private String amount = ""; private String amount = "";
private String decimal = ""; private String decimal = "";
private int maxValue = 100;
private onKeyResultListener onKeyResultListener; private onKeyResultListener onKeyResultListener;
...@@ -43,7 +45,7 @@ public class AddKeyBoard extends FrameLayout { ...@@ -43,7 +45,7 @@ public class AddKeyBoard extends FrameLayout {
} }
private void init() { private void init() {
screenWidth = DeviceUtils.getScreenWidth(getContext()); btnHeight = (int) (DeviceUtils.getScreenWidth(getContext()) / 6);
RecyclerView recyclerView = new RecyclerView(getContext()); RecyclerView recyclerView = new RecyclerView(getContext());
recyclerView.setLayoutManager(new StaggeredGridLayoutManager(4, StaggeredGridLayoutManager.VERTICAL)); recyclerView.setLayoutManager(new StaggeredGridLayoutManager(4, StaggeredGridLayoutManager.VERTICAL));
recyclerView.setAdapter(new KeyBoardAdapter()); recyclerView.setAdapter(new KeyBoardAdapter());
...@@ -78,6 +80,10 @@ public class AddKeyBoard extends FrameLayout { ...@@ -78,6 +80,10 @@ public class AddKeyBoard extends FrameLayout {
oldAmount = Long.parseLong(amount); oldAmount = Long.parseLong(amount);
amount = (oldAmount + Integer.valueOf(keyString[position].substring(1))) + ""; amount = (oldAmount + Integer.valueOf(keyString[position].substring(1))) + "";
} }
if (Integer.parseInt(amount) > maxValue) {
amount = maxValue + "";
ToastUtils.show(getContext(), "追加金額不能超過：" + maxValue);
}
} }
} else if (keyString[position].equals("X")) { } else if (keyString[position].equals("X")) {
if (decimal.length() > 0) { if (decimal.length() > 0) {
...@@ -103,6 +109,15 @@ public class AddKeyBoard extends FrameLayout { ...@@ -103,6 +109,15 @@ public class AddKeyBoard extends FrameLayout {
} }
} else { } else {
amount += keyString[position]; amount += keyString[position];
try {
if (Integer.parseInt(amount) > maxValue) {
amount = maxValue + "";
ToastUtils.show(getContext(), "追加金額不能超過：" + maxValue);
}
} catch (NumberFormatException e) {
e.printStackTrace();
amount = maxValue + "";
}
} }
} }
} }
...@@ -118,10 +133,16 @@ public class AddKeyBoard extends FrameLayout { ...@@ -118,10 +133,16 @@ public class AddKeyBoard extends FrameLayout {
} }
}); });
lp.width = (int) (screenWidth / 4); lp.height = btnHeight;
lp.height = lp.width / 2; if (keyString[position].equals("確定")) {
if (keyString[position].equals("X") || keyString[position].equals("確定")) { holder.tvKey.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.theme_color));
lp.height = lp.height * 2; holder.tvKey.setTextColor(ContextCompat.getColor(getContext(), R.color.white));
} else if (keyString[position].equals("X")) {
holder.tvKey.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.red_500));
holder.tvKey.setTextColor(ContextCompat.getColor(getContext(), R.color.white));
} else {
holder.tvKey.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_333_color));
holder.tvKey.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.white));
} }
holder.layout.setLayoutParams(lp); holder.layout.setLayoutParams(lp);
holder.tvKey.setText(keyString[position]); holder.tvKey.setText(keyString[position]);
...@@ -145,6 +166,14 @@ public class AddKeyBoard extends FrameLayout { ...@@ -145,6 +166,14 @@ public class AddKeyBoard extends FrameLayout {
} }
} }
public void setMaxValue(int maxValue) {
if (maxValue < 0) {
this.maxValue = 0;
} else {
this.maxValue = maxValue;
}
}
public interface onKeyResultListener { public interface onKeyResultListener {
void onResult(boolean isComplete, String value); void onResult(boolean isComplete, String value);
} }
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/OrderPayView.java
...@@ -237,7 +237,7 @@ public class OrderPayView extends LinearLayout { ...@@ -237,7 +237,7 @@ public class OrderPayView extends LinearLayout {
public void notifyBillMethodAdapter(List<PayMethod> mBillMethodList) { public void notifyBillMethodAdapter(List<PayMethod> mBillMethodList) {
if (mBillMethodAdapter != null) if (mBillMethodAdapter != null)
mBillMethodAdapter.setNewData(mBillMethodList); mBillMethodAdapter.setNewInstance(mBillMethodList);
} }
private void recordOperat(Context context) { private void recordOperat(Context context) {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/LoadingDialog.java
...@@ -43,10 +43,13 @@ public class LoadingDialog { ...@@ -43,10 +43,13 @@ public class LoadingDialog {
mLoadingDialog = new Dialog(context, R.style.ui_loading_dialog); mLoadingDialog = new Dialog(context, R.style.ui_loading_dialog);
} }
//不設置會有黑邊 //不設置會有黑邊
Window window = mLoadingDialog.getWindow(); try {
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); Window window = mLoadingDialog.getWindow();
window.getDecorView().setBackgroundResource(android.R.color.transparent); window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
window.getDecorView().setBackgroundResource(android.R.color.transparent);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
mLoadingDialog.setCancelable(cancelable); mLoadingDialog.setCancelable(cancelable);
mLoadingDialog.setCanceledOnTouchOutside(false); mLoadingDialog.setCanceledOnTouchOutside(false);
mLoadingDialog.setContentView(view, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)); mLoadingDialog.setContentView(view, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
......
base-module/src/main/res/layout/print_item_food.xml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_5" android:layout_marginRight="@dimen/dp_5"
tools:text="食品名食品名食品名食品名食品名食品名" tools:text="食品名食品名食品1111111111111111111111111111名食品名食品名食品名"
android:layout_weight="0.6" /> android:layout_weight="0.6" />
<TextView <TextView
...@@ -21,17 +21,16 @@ ...@@ -21,17 +21,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.15" android:layout_weight="0.15"
android:layout_gravity="bottom" android:layout_gravity="bottom"
tools:text="x111111" tools:text="x1111111111111111111111111"
android:gravity="right|center_vertical" /> android:gravity="right|center_vertical" />
<TextView <TextView
android:id="@+id/tv_food_price" android:id="@+id/tv_food_price"
style="@style/Print_text_style" style="@style/Print_text_style"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
tools:text="100000000" tools:text="100000000000000"
android:layout_weight="0.25"
android:gravity="right|center_vertical" /> android:gravity="right|center_vertical" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/contract/OrderListContract.java
...@@ -18,6 +18,8 @@ public interface OrderListContract { ...@@ -18,6 +18,8 @@ public interface OrderListContract {
void notifyByPosition(int position, OrderList.DataBeanX.DataBean dataBean); void notifyByPosition(int position, OrderList.DataBeanX.DataBean dataBean);
void removeItem(int position); void removeItem(int position);
void loadOrderTotalNum(OrderList.DataBeanX.DataBean bean);
} }
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存 //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderDetailsPresenter.java
...@@ -71,16 +71,16 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -71,16 +71,16 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
} }
public void findOrderDetails(int orderId, int isRead) { public void findOrderDetails(int orderId, int isRead) {
//startTime endTime //startTime endTime //mRootView.showLoading("獲取訂單詳情...") mRootView.hideLoading()
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("orderId", orderId + "") .add("orderId", orderId + "")
.build(); .build();
mModel.findOrderDetails(requestBody) mModel.findOrderDetails(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("獲取訂單詳情...")) .doOnSubscribe(disposable -> {})
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> {})
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<OrderDetails>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<OrderDetails>(mErrorHandler) {
...@@ -161,7 +161,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -161,7 +161,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
.doOnSubscribe(disposable -> mRootView.showLoading("確認訂單中，請稍候...")) .doOnSubscribe(disposable -> mRootView.showLoading("確認訂單中，請稍候..."))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> {})
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<ShipAnyOrdersNewBean>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<ShipAnyOrdersNewBean>(mErrorHandler) {
...@@ -205,10 +205,9 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -205,10 +205,9 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
.build(); .build();
mModel.updateOrderStatus(requestBody) mModel.updateOrderStatus(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("請稍候...")) .doOnSubscribe(disposable -> {})
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<UpdateOrderStatusBean>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<UpdateOrderStatusBean>(mErrorHandler) {
...@@ -332,7 +331,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -332,7 +331,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
}); });
}).subscribeOn(Schedulers.io()) }).subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> {}) .doOnSubscribe(disposable -> mRootView.showLoading("獲取打印文件"))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderListPresenter.java
...@@ -18,6 +18,7 @@ import javax.inject.Inject; ...@@ -18,6 +18,7 @@ import javax.inject.Inject;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull; import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber; import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
...@@ -51,10 +52,12 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O ...@@ -51,10 +52,12 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
} }
private List<OrderList.DataBeanX.DataBean> orderList = new ArrayList<>(); private List<OrderList.DataBeanX.DataBean> orderList = new ArrayList<>();
private Disposable disposable;
public void getOrderList(int restaurantId, int page, String status, String type) { public void getOrderList(int restaurantId, int page, String status, String type) {
if (page == 1) { if(disposable != null){
orderList.clear(); if(!disposable.isDisposed()){
return;
}
} }
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", restaurantId + "") .add("restaurantId", restaurantId + "")
...@@ -71,12 +74,23 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O ...@@ -71,12 +74,23 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<OrderList>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<OrderList>(mErrorHandler) {
@Override
public void onSubscribe(Disposable d) {
super.onSubscribe(d);
disposable = d;
}
@Override @Override
public void onNext(@NonNull OrderList info) { public void onNext(@NonNull OrderList info) {
disposable.dispose();
if (page == 1) {
orderList.clear();
}
if (info != null && info.isSuccess() && info.getData() != null) { if (info != null && info.isSuccess() && info.getData() != null) {
if (info.getData().getData() != null && info.getData().getData().size() > 0) { if (info.getData().getData() != null && info.getData().getData().size() > 0) {
List<OrderList.DataBeanX.DataBean> dataBeans = info.getData().getData(); List<OrderList.DataBeanX.DataBean> dataBeans = info.getData().getData();
mRootView.loadOrderTotalNum(dataBeans.get(dataBeans.size() - 1));
dataBeans.remove(dataBeans.size() - 1); dataBeans.remove(dataBeans.size() - 1);
orderList.addAll(dataBeans); orderList.addAll(dataBeans);
} }
...@@ -89,6 +103,9 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O ...@@ -89,6 +103,9 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
@Override @Override
public void onError(Throwable t) { public void onError(Throwable t) {
super.onError(t); super.onError(t);
if (page == 1) {
orderList.clear();
}
mRootView.loadOrderList(null); mRootView.loadOrderList(null);
} }
}); });
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/SupplementOrderPresenter.java
...@@ -140,7 +140,7 @@ public class SupplementOrderPresenter extends BasePresenter<SupplementOrderContr ...@@ -140,7 +140,7 @@ public class SupplementOrderPresenter extends BasePresenter<SupplementOrderContr
object.put("posFid", -222); object.put("posFid", -222);
object.put("productId", -223); object.put("productId", -223);
object.put("productName", "補單食品"); object.put("productName", "補單食品");
object.put("number", 0); object.put("number", 1);
object.put("price", 0); object.put("price", 0);
object.put("lunchboxPrice", 0); object.put("lunchboxPrice", 0);
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/ColdChainMainActivity.java
...@@ -12,6 +12,7 @@ import android.os.Build; ...@@ -12,6 +12,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.view.View; import android.view.View;
import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
...@@ -27,6 +28,7 @@ import com.gingersoft.coldchain_module.di.component.DaggerColdChainMainComponent ...@@ -27,6 +28,7 @@ import com.gingersoft.coldchain_module.di.component.DaggerColdChainMainComponent
import com.gingersoft.coldchain_module.di.module.ColdChainMainModule; import com.gingersoft.coldchain_module.di.module.ColdChainMainModule;
import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstans; import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstans;
import com.gingersoft.coldchain_module.mvp.contract.ColdChainMainContract; import com.gingersoft.coldchain_module.mvp.contract.ColdChainMainContract;
import com.gingersoft.coldchain_module.mvp.model.bean.OrderList;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean; import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
import com.gingersoft.coldchain_module.mvp.presenter.ColdChainMainPresenter; import com.gingersoft.coldchain_module.mvp.presenter.ColdChainMainPresenter;
import com.gingersoft.coldchain_module.mvp.ui.fragment.OrderListFragment; import com.gingersoft.coldchain_module.mvp.ui.fragment.OrderListFragment;
...@@ -66,6 +68,31 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre ...@@ -66,6 +68,31 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
@BindView(R2.id.tv_balance) @BindView(R2.id.tv_balance)
TextView tvBalance; TextView tvBalance;
@BindView(R2.id.cold_chain_takeaway_progress)
ProgressBar mTakeAwayPb;
@BindView(R2.id.tv_cold_chain_takeaway_num)
TextView mTvTakeAwayNum;
@BindView(R2.id.cold_chain_self_progress)
ProgressBar mSelfPb;
@BindView(R2.id.tv_cold_chain_self_num)
TextView mTvSelfNum;
public void setOrderNum(OrderList.DataBeanX.DataBean bean) {
mTakeAwayPb.setMax(bean.getMaxOrder() == 0 ? 1 : bean.getMaxOrder());
mTakeAwayPb.setProgress(bean.getNum());
mSelfPb.setMax(bean.getMaxOrderSelf() == 0 ? 1 : bean.getMaxOrder());
mSelfPb.setProgress(bean.getSelflNum());
mTvTakeAwayNum.setText(bean.getNum() + "/" + bean.getMaxOrder());
mTvSelfNum.setText(bean.getSelflNum() + "/" + bean.getMaxOrderSelf());
}
public List<String> getStatus() {
return status;
}
private List<String> status = Arrays.asList("0,1,2,3", "0,1", "2", "3"); private List<String> status = Arrays.asList("0,1,2,3", "0,1", "2", "3");
private List<OrderListFragment> fragments; private List<OrderListFragment> fragments;
...@@ -215,6 +242,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre ...@@ -215,6 +242,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
} }
private ValueAnimator colorAnimation; private ValueAnimator colorAnimation;
@Override @Override
public void loadBalance(double price, double bond, boolean isBlink) { public void loadBalance(double price, double bond, boolean isBlink) {
tvBalance.setText("餘額：" + price + "（保證金" + bond + "）"); tvBalance.setText("餘額：" + price + "（保證金" + bond + "）");
...@@ -234,7 +262,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre ...@@ -234,7 +262,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if(colorAnimation != null){ if (colorAnimation != null) {
colorAnimation.resume(); colorAnimation.resume();
} }
} }
...@@ -242,7 +270,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre ...@@ -242,7 +270,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
if(colorAnimation != null){ if (colorAnimation != null) {
colorAnimation.pause(); colorAnimation.pause();
} }
} }
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java
...@@ -47,6 +47,8 @@ import java.util.ArrayList; ...@@ -47,6 +47,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -166,13 +168,14 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im ...@@ -166,13 +168,14 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
@Override @Override
public void showLoading(String message) { public void showLoading(String message) {
runOnUiThread(() -> { Observable.just(1)
if (message != null) .observeOn(AndroidSchedulers.mainThread())
LoadingDialog.showDialogForLoading(mContext, message, true); .subscribe(integer -> {
else if (message != null)
LoadingDialog.showDialogForLoading(mContext); LoadingDialog.showDialogForLoading(mContext, message, true);
}); else
LoadingDialog.showDialogForLoading(mContext);
});
} }
@Override @Override
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/fragment/OrderListFragment.java
...@@ -227,6 +227,15 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen ...@@ -227,6 +227,15 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen
} }
} }
@Override
public void loadOrderTotalNum(OrderList.DataBeanX.DataBean bean) {
if(getActivity() instanceof ColdChainMainActivity && bean != null){
if(status.equals(((ColdChainMainActivity) getActivity()).getStatus().get(0))){
((ColdChainMainActivity) getActivity()).setOrderNum(bean);
}
}
}
private void notifyActivityOrderNum(){ private void notifyActivityOrderNum(){
if(getActivity() instanceof ColdChainMainActivity){ if(getActivity() instanceof ColdChainMainActivity){
((ColdChainMainActivity) getActivity()).getNumByOrderTypeInvoke("loadNumber"); ((ColdChainMainActivity) getActivity()).getNumByOrderTypeInvoke("loadNumber");
......
coldchain-module/src/main/res/layout/activity_main.xml
...@@ -37,6 +37,97 @@ ...@@ -37,6 +37,97 @@
app:tabPaddingEnd="-1dp" app:tabPaddingEnd="-1dp"
app:tabPaddingStart="-1dp" /> app:tabPaddingStart="-1dp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_search_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="@dimen/dp_10"
app:layout_constraintTop_toTopOf="parent">
<ProgressBar
android:id="@+id/cold_chain_takeaway_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5"
android:progressDrawable="@drawable/shape_seekbar_bg"
app:layout_constraintCircleRadius="@dimen/dp_5"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/dividing_line"
app:layout_constraintTop_toTopOf="parent"
app:qmui_background_color="@color/color_e4"
app:qmui_progress_color="@color/theme_color"
app:qmui_stroke_round_cap="true"
app:qmui_type="type_rect" />
<TextView
android:id="@+id/tv_month_takeaway_num_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="外賣訂單數："
android:textColor="@color/color_a9"
android:textSize="@dimen/dp_12"
app:layout_constraintRight_toLeftOf="@id/tv_cold_chain_takeaway_num"
app:layout_constraintTop_toBottomOf="@id/cold_chain_takeaway_progress" />
<TextView
android:id="@+id/tv_cold_chain_takeaway_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_a9"
android:textSize="@dimen/dp_12"
app:layout_constraintRight_toRightOf="@id/cold_chain_takeaway_progress"
app:layout_constraintTop_toTopOf="@id/tv_month_takeaway_num_text" />
<View
android:id="@+id/dividing_line"
android:layout_width="@dimen/dp_1"
android:layout_height="0dp"
android:background="@color/color_cf"
app:layout_constraintBottom_toBottomOf="@id/cold_chain_takeaway_progress"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/cold_chain_takeaway_progress" />
<ProgressBar
android:id="@+id/cold_chain_self_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_5"
android:progressDrawable="@drawable/shape_seekbar_bg"
app:layout_constraintCircleRadius="@dimen/dp_5"
app:layout_constraintLeft_toRightOf="@id/dividing_line"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:qmui_background_color="@color/color_e4"
app:qmui_progress_color="@color/theme_color"
app:qmui_type="type_circle" />
<TextView
android:id="@+id/tv_month_self_num_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="自取訂單數："
android:textColor="@color/color_a9"
android:textSize="@dimen/dp_12"
app:layout_constraintRight_toLeftOf="@id/tv_cold_chain_self_num"
app:layout_constraintTop_toBottomOf="@id/cold_chain_self_progress" />
<TextView
android:id="@+id/tv_cold_chain_self_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_a9"
android:textSize="@dimen/dp_12"
app:layout_constraintRight_toRightOf="@id/cold_chain_self_progress"
app:layout_constraintTop_toTopOf="@id/tv_month_self_num_text" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/tv_balance" android:id="@+id/tv_balance"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -67,19 +158,19 @@ ...@@ -67,19 +158,19 @@
<Button <Button
android:id="@+id/btn_supplement_order" android:id="@+id/btn_supplement_order"
android:layout_width="0dp"
style="@style/app_btn_style" style="@style/app_btn_style"
android:background="@color/theme_color" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/theme_color"
android:text="補單" /> android:text="補單" />
<Button <Button
android:id="@+id/btn_pick_up" android:id="@+id/btn_pick_up"
android:layout_width="0dp"
style="@style/app_btn_style" style="@style/app_btn_style"
android:layout_width="0dp"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:background="@color/theme_color"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/theme_color"
android:text="PICK UP" /> android:text="PICK UP" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
config.gradle
...@@ -7,8 +7,8 @@ ext { ...@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 28, targetSdkVersion : 28,
//正式版: 1.0.3 3 //正式版: 1.0.3 3
//內部測試版:1.2.0 20 //內部測試版:1.2.0 20
versionCode : 6, versionCode : 7,
versionName : "1.0.6" versionName : "1.0.7"
] ]
version = [ version = [
......
delivery_pick_mode/build.gradle
...@@ -13,7 +13,7 @@ android { ...@@ -13,7 +13,7 @@ android {
defaultConfig { defaultConfig {
if (project.ext.runAsApp) { if (project.ext.runAsApp) {
applicationId "com.gingersoft.gsa.other_order_mode" applicationId "com.gingersoft.gsa.delivery_pick_mode"
} }
minSdkVersion rootProject.ext.android["minSdkVersion"] minSdkVersion rootProject.ext.android["minSdkVersion"]
targetSdkVersion rootProject.ext.android["targetSdkVersion"] targetSdkVersion rootProject.ext.android["targetSdkVersion"]
......
delivery_pick_mode/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gingersoft.gsa.other_order_mode"> package="com.gingersoft.gsa.delivery_pick_mode">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
......
delivery_pick_mode/src/main/debug/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gingersoft.gsa.other_order_mode"> package="com.gingersoft.gsa.delivery_pick_mode">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".ui.activity.LogActivity"/> <activity android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.LogActivity"/>
<activity android:name=".ui.activity.OrderDetailsActivity" /> <activity android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.OrderDetailsActivity" />
<activity <activity
android:name=".ui.activity.DeliveryOrderMainActivity" android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.DeliveryOrderMainActivity"
android:label="@string/app_name"> android:label="@string/app_name">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration" android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" /> android:value="ConfigModule" />
<activity android:name=".ui.activity.HistoryOrderActivity" /> <activity android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.HistoryOrderActivity" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
delivery_pick_mode/src/main/debug/java/com.gingersoft.gsa.other_order_mode/MyApp.java → delivery_pick_mode/src/main/debug/java/delivery_pick_mode/MyApp.java
package com.gingersoft.gsa.other_order_mode; package com.gingersoft.gsa.delivery_pick_mode;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.jess.arms.base.BaseApplication; import com.jess.arms.base.BaseApplication;
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/OtherOrderComponent.java → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/OtherOrderComponent.java
package com.gingersoft.gsa.other_order_mode; package com.gingersoft.gsa.delivery_pick_mode;
import android.content.Intent; import android.content.Intent;
import android.util.Log; import android.util.Log;
...@@ -8,7 +8,7 @@ import com.billy.cc.core.component.CCResult; ...@@ -8,7 +8,7 @@ import com.billy.cc.core.component.CCResult;
import com.billy.cc.core.component.CCUtil; import com.billy.cc.core.component.CCUtil;
import com.billy.cc.core.component.IComponent; import com.billy.cc.core.component.IComponent;
import com.gingersoft.gsa.cloud.service.GetInfoUpdateService; import com.gingersoft.gsa.cloud.service.GetInfoUpdateService;
import com.gingersoft.gsa.other_order_mode.ui.activity.DeliveryOrderMainActivity; import com.gingersoft.gsa.delivery_pick_mode.ui.activity.DeliveryOrderMainActivity;
public class OtherOrderComponent implements IComponent { public class OtherOrderComponent implements IComponent {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/DeliveryRepository.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/DeliveryRepository.kt
package com.gingersoft.gsa.other_order_mode.data package com.gingersoft.gsa.delivery_pick_mode.data
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
import com.gingersoft.gsa.other_order_mode.data.network.DeliveryNetwork import com.gingersoft.gsa.delivery_pick_mode.data.network.DeliveryNetwork
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import okhttp3.FormBody import okhttp3.FormBody
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/HistoryOrderRepository.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/HistoryOrderRepository.kt
package com.gingersoft.gsa.other_order_mode.data package com.gingersoft.gsa.delivery_pick_mode.data
import com.gingersoft.gsa.other_order_mode.data.network.CoolWeatherNetwork import com.gingersoft.gsa.delivery_pick_mode.data.network.CoolWeatherNetwork
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import okhttp3.FormBody import okhttp3.FormBody
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/WeatherRepository.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/WeatherRepository.kt
package com.gingersoft.gsa.other_order_mode.data package com.gingersoft.gsa.delivery_pick_mode.data
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil import com.gingersoft.gsa.cloud.base.utils.other.TextUtil
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
import com.gingersoft.gsa.other_order_mode.data.model.bean.ThirdItem import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.ThirdItem
import com.gingersoft.gsa.other_order_mode.data.model.bean.UpdateOrderStatusBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.UpdateOrderStatusBean
import com.gingersoft.gsa.other_order_mode.data.network.CoolWeatherNetwork import com.gingersoft.gsa.delivery_pick_mode.data.network.CoolWeatherNetwork
import com.google.gson.Gson import com.google.gson.Gson
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
...@@ -182,11 +182,8 @@ class WeatherRepository private constructor(private val network: CoolWeatherNetw ...@@ -182,11 +182,8 @@ class WeatherRepository private constructor(private val network: CoolWeatherNetw
network.getCancelReason(brandId, restaurantId, type) network.getCancelReason(brandId, restaurantId, type)
} }
suspend fun getPayMethod(orderId: String) = withContext(Dispatchers.IO) { suspend fun getPayMethod(brandId: Int, restaurantId: Int) = withContext(Dispatchers.IO) {
val requestBody = FormBody.Builder() network.getPayMethod(brandId, restaurantId)
.add("orderId", orderId)
.build()
network.getPayMethod(requestBody)
} }
suspend fun addPrj(orderId: String, restaurantId: String, orderDetailsIds: String) = withContext(Dispatchers.IO) { suspend fun addPrj(orderId: String, restaurantId: String, orderDetailsIds: String) = withContext(Dispatchers.IO) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/AddServiceChargeBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/AddServiceChargeBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class AddServiceChargeBean( data class AddServiceChargeBean(
val errCode: String, val errCode: String,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/BalanceBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/BalanceBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class BalanceBean( data class BalanceBean(
val balance: Double, val balance: Double,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/BillBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/BillBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
class BillBean(var name: String = "", var amount: Double = 0.0, var isRed: Int = 0) class BillBean(var name: String = "", var amount: Double = 0.0, var isRed: Int = 0)
//isRed0默認顏色黑色，1為紅色 //isRed0默認顏色黑色，1為紅色
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/CancelLogisticsBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/CancelLogisticsBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
class CancelLogisticsBean(val code: String, val success: Boolean, val errCode: String, val errMsg: String, val sysTime: Long, val data: Data) { class CancelLogisticsBean(val code: String, val success: Boolean, val errCode: String, val errMsg: String, val sysTime: Long, val data: Data) {
data class Data(val result: Result) { data class Data(val result: Result) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/CancelReason.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/CancelReason.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class CancelReason( data class CancelReason(
val `data`: List<DataX>, val `data`: List<DataX>,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/DeliveryAddSuccessConfig.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/DeliveryAddSuccessConfig.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class DeliveryAddSuccessConfig( data class DeliveryAddSuccessConfig(
val data: Data, val data: Data,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/DeliveryBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/DeliveryBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class DeliveryBean(val data: MutableList<Data>, data class DeliveryBean(val data: MutableList<Data>,
val success: Boolean, val success: Boolean,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/DeliveryConfig.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/DeliveryConfig.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
import androidx.databinding.ObservableArrayList import androidx.databinding.ObservableArrayList
import java.io.Serializable import java.io.Serializable
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/EstimatedBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/EstimatedBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class EstimatedBean( data class EstimatedBean(
val `data`: Data?, val `data`: Data?,
val success: Boolean, val success: Boolean,
val sysTime: Long val sysTime: Long
) ){
\ No newline at end of file data class Data(
val estimated_time: Int
)
}
\ No newline at end of file
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/FoodDetailsTranBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/FoodDetailsTranBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/HistoryOrderBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/HistoryOrderBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
import androidx.lifecycle.LiveData
class HistoryOrderBean { class HistoryOrderBean {
/** /**
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/MessageBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/MessageBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class MessageBean(val code: String, val errorMsg: String, val success: Boolean = false, val sysTime: Long = 0, val data: Any? = null) data class MessageBean(val code: String, val errorMsg: String, val success: Boolean = false, val sysTime: Long = 0, val data: Any? = null)
\ No newline at end of file
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/OrderClosingBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/OrderClosingBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class OrderClosingBean( data class OrderClosingBean(
var addPoints: Double = 0.toDouble(), var addPoints: Double = 0.toDouble(),
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/OrderGoupNumBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/OrderGoupNumBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class OrderGoupNumBean( data class OrderGoupNumBean(
val `data`: Data, val `data`: Data,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/OrderList.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/OrderList.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
class OrderList { class OrderList {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/PayTypeInfo.java 0 → 100644
package com.gingersoft.gsa.delivery_pick_mode.data.model.bean;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import java.util.List;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2018/7/10
* 修订历史：2018/7/10
* 描述：
*/
public class PayTypeInfo {
private boolean success;
private long sysTime;
private List<PayMethod> data;
public boolean isSuccess() {
return success;
}
public void setSuccess(boolean success) {
this.success = success;
}
public long getSysTime() {
return sysTime;
}
public void setSysTime(long sysTime) {
this.sysTime = sysTime;
}
public List<PayMethod> getData() {
return data;
}
public void setData(List<PayMethod> data) {
this.data = data;
}
}
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/ServiceChargeRecordBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/ServiceChargeRecordBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class ServiceChargeRecordBean( data class ServiceChargeRecordBean(
val `data`: MutableList<DataX>, val `data`: MutableList<DataX>,
...@@ -12,7 +12,7 @@ data class ServiceChargeRecordBean( ...@@ -12,7 +12,7 @@ data class ServiceChargeRecordBean(
val id: Int, val id: Int,
val logisticsOrderId: Int, val logisticsOrderId: Int,
val orderId: Int, val orderId: Int,
val paymentValue: Double, val paymentValue: Int,
val restaurantId: Int, val restaurantId: Int,
val status: Int, val status: Int,
val type: Int, val type: Int,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/ThirdItem.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/ThirdItem.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
class ThirdItem : ArrayList<ThirdItem.ThirdItemItem>() { class ThirdItem : ArrayList<ThirdItem.ThirdItemItem>() {
data class ThirdItemItem(val descr: String = "", data class ThirdItemItem(val descr: String = "",
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/ThirdSend.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/ThirdSend.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class ThirdSend( data class ThirdSend(
val `data`: Data, val `data`: Data,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/TransportAmountBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/TransportAmountBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class TransportAmountBean( data class TransportAmountBean(
val `data`: List<DataX>, val `data`: List<DataX>,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/TransportationBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/TransportationBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class TransportationBean( data class TransportationBean(
val `data`: DataX?, val `data`: DataX?,
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/UpdateOrderBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/UpdateOrderBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
class UpdateOrderBean { class UpdateOrderBean {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/UpdateOrderStatusBean.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/UpdateOrderStatusBean.kt
package com.gingersoft.gsa.other_order_mode.data.model.bean package com.gingersoft.gsa.delivery_pick_mode.data.model.bean
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/CoolWeatherNetwork.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/CoolWeatherNetwork.kt
package com.gingersoft.gsa.other_order_mode.data.network package com.gingersoft.gsa.delivery_pick_mode.data.network
import com.gingersoft.gsa.other_order_mode.data.network.api.AppService import com.gingersoft.gsa.delivery_pick_mode.data.network.api.AppService
import com.gingersoft.gsa.other_order_mode.data.network.api.WeatherService import com.gingersoft.gsa.delivery_pick_mode.data.network.api.WeatherService
import okhttp3.RequestBody import okhttp3.RequestBody
import retrofit2.Call import retrofit2.Call
import retrofit2.Callback import retrofit2.Callback
...@@ -83,7 +83,7 @@ class CoolWeatherNetwork { ...@@ -83,7 +83,7 @@ class CoolWeatherNetwork {
suspend fun getCancelReason(brandId: Int, restaurantId: Int, type: Int) = cloudService.getCancelReason(brandId, restaurantId, type).await() suspend fun getCancelReason(brandId: Int, restaurantId: Int, type: Int) = cloudService.getCancelReason(brandId, restaurantId, type).await()
//獲取商家配置的支付方式 //獲取商家配置的支付方式
suspend fun getPayMethod(requestBody: RequestBody) = service.getPayMethod(requestBody).await() suspend fun getPayMethod(brandId: Int, restaurantId: Int) = cloudService.getPayMethod(brandId, restaurantId).await()
suspend fun addPrj(requestBody: RequestBody) = cloudService.addPrj(requestBody).await() suspend fun addPrj(requestBody: RequestBody) = cloudService.addPrj(requestBody).await()
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/DeliveryNetwork.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/DeliveryNetwork.kt
package com.gingersoft.gsa.other_order_mode.data.network package com.gingersoft.gsa.delivery_pick_mode.data.network
import com.gingersoft.gsa.other_order_mode.data.network.api.DeliveryService import com.gingersoft.gsa.delivery_pick_mode.data.network.api.DeliveryService
import com.gingersoft.gsa.other_order_mode.data.network.api.WeatherService
import okhttp3.RequestBody import okhttp3.RequestBody
import retrofit2.Call import retrofit2.Call
import retrofit2.Callback import retrofit2.Callback
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/ServiceCreator.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/ServiceCreator.kt
package com.gingersoft.gsa.other_order_mode.data.network package com.gingersoft.gsa.delivery_pick_mode.data.network
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes import com.gingersoft.gsa.cloud.base.utils.encryption.Aes
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/AppService.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/api/AppService.kt
package com.gingersoft.gsa.other_order_mode.data.network.api package com.gingersoft.gsa.delivery_pick_mode.data.network.api
import okhttp3.RequestBody import okhttp3.RequestBody
import retrofit2.Call import retrofit2.Call
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/DeliveryService.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/api/DeliveryService.kt
package com.gingersoft.gsa.other_order_mode.data.network.api package com.gingersoft.gsa.delivery_pick_mode.data.network.api
import com.gingersoft.gsa.other_order_mode.data.model.bean.MessageBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.MessageBean
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryAddSuccessConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryAddSuccessConfig
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
import okhttp3.RequestBody import okhttp3.RequestBody
import retrofit2.Call import retrofit2.Call
import retrofit2.http.Body import retrofit2.http.Body
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/WeatherService.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/api/WeatherService.kt
package com.gingersoft.gsa.other_order_mode.data.network.api package com.gingersoft.gsa.delivery_pick_mode.data.network.api
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
import com.gingersoft.gsa.other_order_mode.data.model.bean.* import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.*
import okhttp3.RequestBody import okhttp3.RequestBody
import retrofit2.Call import retrofit2.Call
import retrofit2.http.Body import retrofit2.http.Body
...@@ -62,8 +62,8 @@ interface WeatherService { ...@@ -62,8 +62,8 @@ interface WeatherService {
@GET("restaurantFoodReason/config/list") @GET("restaurantFoodReason/config/list")
fun getCancelReason(@Query("brandId") brandId: Int, @Query("restaurantId") restaurantId: Int, @Query("type") type: Int): Call<CancelReason> fun getCancelReason(@Query("brandId") brandId: Int, @Query("restaurantId") restaurantId: Int, @Query("type") type: Int): Call<CancelReason>
@POST("order/confirmPay") @GET("restaurant/pay/get")
fun getPayMethod(@Body requestBody: RequestBody): Call<PayTypeInfo> fun getPayMethod(@Query("brandId") brandId: Int, @Query("restaurantId") restaurantId: Int): Call<PayTypeInfo>
@POST("printerRecording/add") @POST("printerRecording/add")
fun addPrj(@Body requestBody: RequestBody): Call<String> fun addPrj(@Body requestBody: RequestBody): Call<String>
...@@ -81,5 +81,5 @@ interface WeatherService { ...@@ -81,5 +81,5 @@ interface WeatherService {
fun getShipanyTransportAmount(@Query("orderId") orderId: String, @Query("uid") uid: String, @Query("restaurantId") restaurantId: String): Call<TransportAmountBean> fun getShipanyTransportAmount(@Query("orderId") orderId: String, @Query("uid") uid: String, @Query("restaurantId") restaurantId: String): Call<TransportAmountBean>
@GET("logisticsExpensesAdditional/getAdditionalByOrderId") @GET("logisticsExpensesAdditional/getAdditionalByOrderId")
fun getAdditionalByOrderId(@Query("orderId") orderId: String, @Query("deletes") deletes: String) : Call<ServiceChargeRecordBean> fun getAdditionalByOrderId(@Query("orderId") orderId: String, @Query("deletes") deletes: String): Call<ServiceChargeRecordBean>
} }
\ No newline at end of file
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/factory/DeliveryFactory.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/factory/DeliveryFactory.kt
package com.gingersoft.gsa.other_order_mode.model.factory package com.gingersoft.gsa.delivery_pick_mode.model.factory
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.gingersoft.gsa.other_order_mode.data.DeliveryRepository import com.gingersoft.gsa.delivery_pick_mode.data.DeliveryRepository
import com.gingersoft.gsa.other_order_mode.model.viewModel.DeliveryViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.DeliveryViewModel
class DeliveryFactory(private val repository: DeliveryRepository) : ViewModelProvider.NewInstanceFactory() { class DeliveryFactory(private val repository: DeliveryRepository) : ViewModelProvider.NewInstanceFactory() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/factory/HistoryOrderModelFactory.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/factory/HistoryOrderModelFactory.kt
package com.gingersoft.gsa.other_order_mode.model.factory package com.gingersoft.gsa.delivery_pick_mode.model.factory
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.gingersoft.gsa.other_order_mode.data.HistoryOrderRepository import com.gingersoft.gsa.delivery_pick_mode.data.HistoryOrderRepository
import com.gingersoft.gsa.other_order_mode.model.viewModel.HistoryOrderViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.HistoryOrderViewModel
class HistoryOrderModelFactory(private val repository: HistoryOrderRepository) : ViewModelProvider.NewInstanceFactory() { class HistoryOrderModelFactory(private val repository: HistoryOrderRepository) : ViewModelProvider.NewInstanceFactory() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/factory/WeatherModelFactory.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/factory/WeatherModelFactory.kt
package com.gingersoft.gsa.other_order_mode.model.factory package com.gingersoft.gsa.delivery_pick_mode.model.factory
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.gingersoft.gsa.other_order_mode.data.WeatherRepository import com.gingersoft.gsa.delivery_pick_mode.data.WeatherRepository
import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.PageViewModel
class WeatherModelFactory(private val repository: WeatherRepository) : ViewModelProvider.NewInstanceFactory() { class WeatherModelFactory(private val repository: WeatherRepository) : ViewModelProvider.NewInstanceFactory() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/BaseViewModel.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/BaseViewModel.kt
package com.gingersoft.gsa.other_order_mode.model.viewModel package com.gingersoft.gsa.delivery_pick_mode.model.viewModel
import android.content.Context import android.content.Context
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/DeliveryViewModel.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/DeliveryViewModel.kt
package com.gingersoft.gsa.other_order_mode.model.viewModel package com.gingersoft.gsa.delivery_pick_mode.model.viewModel
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import com.gingersoft.gsa.other_order_mode.data.model.bean.MessageBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.MessageBean
import com.gingersoft.gsa.other_order_mode.data.DeliveryRepository import com.gingersoft.gsa.delivery_pick_mode.data.DeliveryRepository
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryAddSuccessConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryAddSuccessConfig
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
class DeliveryViewModel(private val repository: DeliveryRepository) : BaseViewModel() { class DeliveryViewModel(private val repository: DeliveryRepository) : BaseViewModel() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/HistoryOrderViewModel.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/HistoryOrderViewModel.kt
package com.gingersoft.gsa.other_order_mode.model.viewModel package com.gingersoft.gsa.delivery_pick_mode.model.viewModel
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
...@@ -13,9 +12,8 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils ...@@ -13,9 +12,8 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.constans.PrintConstans import com.gingersoft.gsa.cloud.constans.PrintConstans
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
import com.gingersoft.gsa.other_order_mode.data.HistoryOrderRepository import com.gingersoft.gsa.delivery_pick_mode.data.HistoryOrderRepository
import com.gingersoft.gsa.other_order_mode.data.model.bean.HistoryOrderBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.HistoryOrderBean
import com.gingersoft.gsa.other_order_mode.data.model.bean.OrderList
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
class HistoryOrderViewModel(private val historyOrderRepository: HistoryOrderRepository) : ViewModel() { class HistoryOrderViewModel(private val historyOrderRepository: HistoryOrderRepository) : ViewModel() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt
package com.gingersoft.gsa.other_order_mode.model.viewModel package com.gingersoft.gsa.delivery_pick_mode.model.viewModel
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
...@@ -26,11 +26,11 @@ import com.gingersoft.gsa.cloud.constans.AppConstans ...@@ -26,11 +26,11 @@ import com.gingersoft.gsa.cloud.constans.AppConstans
import com.gingersoft.gsa.cloud.constans.PrintConstans import com.gingersoft.gsa.cloud.constans.PrintConstans
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
import com.gingersoft.gsa.cloud.service.GetInfoUpdateService import com.gingersoft.gsa.cloud.service.GetInfoUpdateService
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.WeatherRepository import com.gingersoft.gsa.delivery_pick_mode.data.WeatherRepository
import com.gingersoft.gsa.other_order_mode.data.model.bean.* import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.*
import com.gingersoft.gsa.other_order_mode.ui.adapter.DeliveryAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.DeliveryAdapter
import com.gingersoft.gsa.other_order_mode.util.OtherOrderUtils import com.gingersoft.gsa.delivery_pick_mode.util.OtherOrderUtils
import com.jess.arms.utils.ArmsUtils import com.jess.arms.utils.ArmsUtils
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -832,14 +832,14 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -832,14 +832,14 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
return MessageBean(what.toString(), msg, state, System.currentTimeMillis(), null) return MessageBean(what.toString(), msg, state, System.currentTimeMillis(), null)
} }
var payTypeBean = MutableLiveData<PayTypeInfo.DataBean>() var payTypeBean = MutableLiveData<List<PayMethod>>()
/** /**
* 獲取支付方式 * 獲取支付方式
*/ */
fun getPayMethod(orderId: String) { fun getPayMethod(brandId: Int, restaurantId: Int) {
launch({ launch({
repository.getPayMethod(orderId).apply { repository.getPayMethod(brandId, restaurantId).apply {
if (this.code == "1" && this.data != null) { if (isSuccess) {
payTypeBean.postValue(this.data) payTypeBean.postValue(this.data)
} else { } else {
payTypeBean.postValue(null) payTypeBean.postValue(null)
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/DeliveryOrderMainActivity.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
package com.gingersoft.gsa.other_order_mode.ui.activity package com.gingersoft.gsa.delivery_pick_mode.ui.activity
import android.animation.ArgbEvaluator import android.animation.ArgbEvaluator
import android.animation.ValueAnimator import android.animation.ValueAnimator
...@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable ...@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.IBinder import android.os.IBinder
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
...@@ -19,6 +20,8 @@ import androidx.lifecycle.Observer ...@@ -19,6 +20,8 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.encryption.Base64
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.base.widget.DialogUtils import com.gingersoft.gsa.cloud.base.widget.DialogUtils
import com.gingersoft.gsa.cloud.constans.AppConstans import com.gingersoft.gsa.cloud.constans.AppConstans
...@@ -27,19 +30,21 @@ import com.gingersoft.gsa.cloud.constans.HttpsConstans ...@@ -27,19 +30,21 @@ import com.gingersoft.gsa.cloud.constans.HttpsConstans
import com.gingersoft.gsa.cloud.database.utils.ExpandInfoDaoUtils import com.gingersoft.gsa.cloud.database.utils.ExpandInfoDaoUtils
import com.gingersoft.gsa.cloud.service.GetInfoUpdateService import com.gingersoft.gsa.cloud.service.GetInfoUpdateService
import com.gingersoft.gsa.cloud.service.PostCallBack import com.gingersoft.gsa.cloud.service.PostCallBack
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.network.ServiceCreator import com.gingersoft.gsa.delivery_pick_mode.data.network.ServiceCreator
import com.gingersoft.gsa.other_order_mode.databinding.ActivityOtherOrderBinding import com.gingersoft.gsa.delivery_pick_mode.databinding.ActivityOtherOrderBinding
import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.PageViewModel
import com.gingersoft.gsa.other_order_mode.ui.adapter.SectionsPagerAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.SectionsPagerAdapter
import com.gingersoft.gsa.other_order_mode.ui.base.BaseActivity import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import com.gingersoft.gsa.other_order_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView import com.qmuiteam.qmui.alpha.QMUIAlphaTextView
import com.qmuiteam.qmui.util.QMUIDisplayHelper import com.qmuiteam.qmui.util.QMUIDisplayHelper
import com.qmuiteam.qmui.widget.popup.QMUIPopup import com.qmuiteam.qmui.widget.popup.QMUIPopup
import com.qmuiteam.qmui.widget.popup.QMUIPopups import com.qmuiteam.qmui.widget.popup.QMUIPopups
import kotlinx.android.synthetic.main.activity_other_order.* import kotlinx.android.synthetic.main.activity_other_order.*
import org.json.JSONObject
import java.net.URLEncoder
class DeliveryOrderMainActivity : BaseActivity() { class DeliveryOrderMainActivity : BaseActivity() {
...@@ -78,7 +83,6 @@ class DeliveryOrderMainActivity : BaseActivity() { ...@@ -78,7 +83,6 @@ class DeliveryOrderMainActivity : BaseActivity() {
val mFilter = IntentFilter(AppConstans.CLEAR_ORDER_RECEIVING_HEART) val mFilter = IntentFilter(AppConstans.CLEAR_ORDER_RECEIVING_HEART)
mReceiver = ClearHeartBroadcastReceiver() mReceiver = ClearHeartBroadcastReceiver()
registerReceiver(mReceiver, mFilter) registerReceiver(mReceiver, mFilter)
val binding: ActivityOtherOrderBinding = DataBindingUtil.setContentView(this, R.layout.activity_other_order) val binding: ActivityOtherOrderBinding = DataBindingUtil.setContentView(this, R.layout.activity_other_order)
initOutTime() initOutTime()
...@@ -118,6 +122,7 @@ class DeliveryOrderMainActivity : BaseActivity() { ...@@ -118,6 +122,7 @@ class DeliveryOrderMainActivity : BaseActivity() {
getBanlance(GsaCloudApplication.getBrandId(this@DeliveryOrderMainActivity)) getBanlance(GsaCloudApplication.getBrandId(this@DeliveryOrderMainActivity))
balanceBean.observe(this@DeliveryOrderMainActivity, Observer { balanceBean.observe(this@DeliveryOrderMainActivity, Observer {
Log.e("eee", "刷新餘額")
it?.let { it?.let {
tv_balance.text = "餘額：${it.balance}" + "（保證金: ${it.bond} )" tv_balance.text = "餘額：${it.balance}" + "（保證金: ${it.bond} )"
if (it.balance <= it.threshold) { if (it.balance <= it.threshold) {
...@@ -359,9 +364,9 @@ class DeliveryOrderMainActivity : BaseActivity() { ...@@ -359,9 +364,9 @@ class DeliveryOrderMainActivity : BaseActivity() {
if (type == 3 || type == 4 || type == 5 if (type == 3 || type == 4 || type == 5
|| type == 6 || type == 7) { || type == 6 || type == 7) {
pageViewModel.refreshState.postValue(selectPosition) pageViewModel.refreshState.postValue(selectPosition)
//刷新餘額
pageViewModel.getBanlance(GsaCloudApplication.getBrandId(this@DeliveryOrderMainActivity))
} }
//刷新餘額
pageViewModel.getBanlance(GsaCloudApplication.getBrandId(this@DeliveryOrderMainActivity))
} }
}) })
it.execute { it.execute {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/DeliverySettingActivity.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliverySettingActivity.kt
package com.gingersoft.gsa.other_order_mode.ui.activity package com.gingersoft.gsa.delivery_pick_mode.ui.activity
import android.os.Bundle import android.os.Bundle
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
import com.gingersoft.gsa.other_order_mode.ui.base.BaseActivity import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import com.gingersoft.gsa.other_order_mode.ui.fragment.DeliveryFragment import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.DeliveryFragment
import com.gingersoft.gsa.other_order_mode.ui.fragment.UpdateDeliveryFragment import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.UpdateDeliveryFragment
import kotlinx.android.synthetic.main.activity_delivery.* import kotlinx.android.synthetic.main.activity_delivery.*
class DeliverySettingActivity : BaseActivity() { class DeliverySettingActivity : BaseActivity() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/HistoryOrderActivity.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/HistoryOrderActivity.kt
package com.gingersoft.gsa.other_order_mode.ui.activity package com.gingersoft.gsa.delivery_pick_mode.ui.activity
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
...@@ -6,11 +6,11 @@ import androidx.lifecycle.ViewModelProvider ...@@ -6,11 +6,11 @@ import androidx.lifecycle.ViewModelProvider
import com.gingersoft.gsa.cloud.base.utils.time.TimePickerUtils import com.gingersoft.gsa.cloud.base.utils.time.TimePickerUtils
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.model.viewModel.HistoryOrderViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.HistoryOrderViewModel
import com.gingersoft.gsa.other_order_mode.ui.base.BaseActivity import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import com.gingersoft.gsa.other_order_mode.ui.fragment.HistoryFragment import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.HistoryFragment
import com.gingersoft.gsa.other_order_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import kotlinx.android.synthetic.main.activity_history_order.* import kotlinx.android.synthetic.main.activity_history_order.*
import java.text.ParseException import java.text.ParseException
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/LogActivity.java → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/LogActivity.java
package com.gingersoft.gsa.other_order_mode.ui.activity; package com.gingersoft.gsa.delivery_pick_mode.ui.activity;
import android.os.Bundle; import android.os.Bundle;
import android.widget.TextView; import android.widget.TextView;
...@@ -6,7 +6,7 @@ import android.widget.TextView; ...@@ -6,7 +6,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.gingersoft.gsa.cloud.service.GetInfoUpdateService; import com.gingersoft.gsa.cloud.service.GetInfoUpdateService;
import com.gingersoft.gsa.other_order_mode.R; import com.gingersoft.gsa.delivery_pick_mode.R;
public class LogActivity extends AppCompatActivity { public class LogActivity extends AppCompatActivity {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/PayActivity.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/PayActivity.kt
package com.gingersoft.gsa.other_order_mode.ui.activity package com.gingersoft.gsa.delivery_pick_mode.ui.activity
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.widget.TextView import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod import com.gingersoft.gsa.cloud.base.common.bean.PayMethod
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil import com.gingersoft.gsa.cloud.base.utils.MoneyUtil
import com.gingersoft.gsa.cloud.base.widget.DialogUtils import com.gingersoft.gsa.cloud.base.widget.DialogUtils
import com.gingersoft.gsa.cloud.print.bean.OrderDetails.DataBean import com.gingersoft.gsa.cloud.print.bean.OrderDetails.DataBean
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.BillBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.BillBean
import com.gingersoft.gsa.other_order_mode.data.model.bean.PayTypeInfo import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.PageViewModel
import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.FoodListAdapter
import com.gingersoft.gsa.other_order_mode.ui.adapter.FoodListAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.PayBillAdapter
import com.gingersoft.gsa.other_order_mode.ui.adapter.PayBillAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import com.gingersoft.gsa.other_order_mode.ui.base.BaseActivity import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.gingersoft.gsa.other_order_mode.util.InjectorUtil
import kotlinx.android.synthetic.main.activity_pay.* import kotlinx.android.synthetic.main.activity_pay.*
class PayActivity : BaseActivity() { class PayActivity : BaseActivity() {
...@@ -30,7 +31,7 @@ class PayActivity : BaseActivity() { ...@@ -30,7 +31,7 @@ class PayActivity : BaseActivity() {
qm_order_pay_bar.setTitle("結賬") qm_order_pay_bar.setTitle("結賬")
qm_order_pay_bar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { finish() } qm_order_pay_bar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { finish() }
qm_order_pay_bar.setBackgroundColor(resources.getColor(R.color.theme_color)) qm_order_pay_bar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color))
val orderDetails: DataBean = intent.getSerializableExtra("orderDetails") as DataBean val orderDetails: DataBean = intent.getSerializableExtra("orderDetails") as DataBean
...@@ -56,11 +57,11 @@ class PayActivity : BaseActivity() { ...@@ -56,11 +57,11 @@ class PayActivity : BaseActivity() {
} }
other_pay_view.loadInfo(this, ArrayList<PayMethod>(), MoneyUtil.sub(orderDetails.TOTAL_AMOUNT!!.toDouble(), orderDetails.discount_amount), foodCount) other_pay_view.loadInfo(this, ArrayList<PayMethod>(), MoneyUtil.sub(orderDetails.TOTAL_AMOUNT!!.toDouble(), orderDetails.discount_amount), foodCount)
pageViewModel.getPayMethod(orderDetails.ID.toString()) pageViewModel.getPayMethod(GsaCloudApplication.getBrandId(this), GsaCloudApplication.getRestaurantId(this))
pageViewModel.payTypeBean.observe(this, Observer { pageViewModel.payTypeBean.observe(this, Observer {
//獲取支付方式 //獲取支付方式
// other_pay_view.loadInfo(this, PayTypeInfo.getPayMethodByPayType(it), MoneyUtil.sub(orderDetails.TOTAL_AMOUNT!!.toDouble(), orderDetails.discount_amount), foodCount) // other_pay_view.loadInfo(this, PayTypeInfo.getPayMethodByPayType(it), MoneyUtil.sub(orderDetails.TOTAL_AMOUNT!!.toDouble(), orderDetails.discount_amount), foodCount)
other_pay_view.notifyBillMethodAdapter(PayTypeInfo.getPayMethodByPayType(it)) other_pay_view.notifyBillMethodAdapter(it)
}) })
other_pay_view.setmOnSureClickLisenter { payMethods -> other_pay_view.setmOnSureClickLisenter { payMethods ->
...@@ -71,7 +72,6 @@ class PayActivity : BaseActivity() { ...@@ -71,7 +72,6 @@ class PayActivity : BaseActivity() {
hepler.getView<TextView>(R.id.tv_dialog_confirm).setOnClickListener { hepler.getView<TextView>(R.id.tv_dialog_confirm).setOnClickListener {
dialog.dismiss() dialog.dismiss()
showLoading() showLoading()
pageViewModel.closingBill(orderDetails, payMethods){_, _ -> pageViewModel.closingBill(orderDetails, payMethods){_, _ ->
cancelDialogForLoading() cancelDialogForLoading()
setResult(RESULT_OK) setResult(RESULT_OK)
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/DeliveryAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/DeliveryAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
class DeliveryAdapter(data: MutableList<String>) : BaseQuickAdapter<String, BaseViewHolder>(R.layout.other_order_delivery_item, data) { class DeliveryAdapter(data: MutableList<String>) : BaseQuickAdapter<String, BaseViewHolder>(R.layout.other_order_delivery_item, data) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/DeliveryListAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/DeliveryListAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
...@@ -7,10 +7,10 @@ import android.widget.ImageView ...@@ -7,10 +7,10 @@ import android.widget.ImageView
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
import com.gingersoft.gsa.other_order_mode.databinding.ItemDeliveryLayoutBinding import com.gingersoft.gsa.delivery_pick_mode.databinding.ItemDeliveryLayoutBinding
import com.gingersoft.gsa.other_order_mode.ui.fragment.UpdateDeliveryFragment import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.UpdateDeliveryFragment
class DeliveryListAdapter(data: MutableList<DeliveryConfig.Data.DeliveryInfo>) : BaseQuickAdapter<DeliveryConfig.Data.DeliveryInfo, DeliveryListAdapter.ViewHolder>(R.layout.item_delivery_layout, data) { class DeliveryListAdapter(data: MutableList<DeliveryConfig.Data.DeliveryInfo>) : BaseQuickAdapter<DeliveryConfig.Data.DeliveryInfo, DeliveryListAdapter.ViewHolder>(R.layout.item_delivery_layout, data) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/FoodListAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/FoodListAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
...@@ -6,13 +6,12 @@ import android.view.View ...@@ -6,13 +6,12 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.FoodDetailsTranBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.FoodDetailsTranBean
import com.gingersoft.gsa.other_order_mode.databinding.LayoutDialogFoodItemBinding import com.gingersoft.gsa.delivery_pick_mode.databinding.LayoutDialogFoodItemBinding
import com.qmuiteam.qmui.util.QMUIDisplayHelper.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper.dp2px
class FoodListAdapter(private val context: Context, private val productnameBeans: List<OrderDetails.DataBean.PRODUCTNAMEBean>) : RecyclerView.Adapter<FoodListAdapter.ViewHolder>() { class FoodListAdapter(private val context: Context, private val productnameBeans: List<OrderDetails.DataBean.PRODUCTNAMEBean>) : RecyclerView.Adapter<FoodListAdapter.ViewHolder>() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/HistoryOrderAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/HistoryOrderAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import android.content.Context import android.content.Context
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
...@@ -8,10 +8,9 @@ import android.view.ViewGroup ...@@ -8,10 +8,9 @@ import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.HistoryOrderBean.DataBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.HistoryOrderBean.DataBean
import com.gingersoft.gsa.other_order_mode.data.model.bean.OrderList import com.gingersoft.gsa.delivery_pick_mode.databinding.LayoutHistoryOrderItemBinding
import com.gingersoft.gsa.other_order_mode.databinding.LayoutHistoryOrderItemBinding
import com.scwang.smartrefresh.layout.util.SmartUtil import com.scwang.smartrefresh.layout.util.SmartUtil
class HistoryOrderAdapter(var stauts: String?, private val context: Context, var data: List<DataBean>?) : RecyclerView.Adapter<HistoryOrderAdapter.ViewHolder>() { class HistoryOrderAdapter(var stauts: String?, private val context: Context, var data: List<DataBean>?) : RecyclerView.Adapter<HistoryOrderAdapter.ViewHolder>() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/OrderBtnAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/OrderBtnAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
...@@ -7,7 +7,7 @@ import android.widget.LinearLayout ...@@ -7,7 +7,7 @@ import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.gingersoft.gsa.cloud.ui.utils.BtnBuilder import com.gingersoft.gsa.cloud.ui.utils.BtnBuilder
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
class OrderBtnAdapter(var list: MutableList<BtnBuilder.BtnBean>) : RecyclerView.Adapter<OrderBtnAdapter.ViewHolder>() { class OrderBtnAdapter(var list: MutableList<BtnBuilder.BtnBean>) : RecyclerView.Adapter<OrderBtnAdapter.ViewHolder>() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/OrderDetailsAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/OrderDetailsAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.gingersoft.gsa.cloud.ui.utils.BtnBuilder import com.gingersoft.gsa.cloud.ui.utils.BtnBuilder
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
class OrderDetailsAdapter(list: MutableList<BtnBuilder.BtnBean>) : BaseQuickAdapter<BtnBuilder.BtnBean, BaseViewHolder>(R.layout.item_btn, list) { class OrderDetailsAdapter(list: MutableList<BtnBuilder.BtnBean>) : BaseQuickAdapter<BtnBuilder.BtnBean, BaseViewHolder>(R.layout.item_btn, list) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/OtherOrdersAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/OtherOrdersAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import android.animation.AnimatorSet import android.animation.AnimatorSet
import android.animation.ObjectAnimator.ofFloat import android.animation.ObjectAnimator.ofFloat
...@@ -13,9 +13,9 @@ import androidx.core.content.ContextCompat ...@@ -13,9 +13,9 @@ import androidx.core.content.ContextCompat
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.Adapter import androidx.recyclerview.widget.RecyclerView.Adapter
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.OrderList import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.OrderList
import com.gingersoft.gsa.other_order_mode.databinding.LayoutDeliveryOrderItemBinding import com.gingersoft.gsa.delivery_pick_mode.databinding.LayoutDeliveryOrderItemBinding
import com.scwang.smartrefresh.layout.util.SmartUtil.dp2px import com.scwang.smartrefresh.layout.util.SmartUtil.dp2px
class OtherOrdersAdapter(var context: Context, var outTime: Int) : Adapter<OtherOrdersAdapter.ViewHolder>() { class OtherOrdersAdapter(var context: Context, var outTime: Int) : Adapter<OtherOrdersAdapter.ViewHolder>() {
...@@ -55,14 +55,14 @@ class OtherOrdersAdapter(var context: Context, var outTime: Int) : Adapter<Other ...@@ -55,14 +55,14 @@ class OtherOrdersAdapter(var context: Context, var outTime: Int) : Adapter<Other
10 -> "已指派另一位配送員" 10 -> "已指派另一位配送員"
else -> "" else -> ""
} }
if (data.curStat < 2) { // if (data.curStat < 2) {
//是否超時 // //是否超時
if (outTime == 0) { // if (outTime == 0) {
holder.binding.isTimeOut = false // holder.binding.isTimeOut = false
} else { // } else {
holder.binding.isTimeOut = data.timeSecond < outTime // holder.binding.isTimeOut = data.timeSecond < outTime
} // }
} // }
} else { } else {
holder.binding.deliveryState = "" holder.binding.deliveryState = ""
holder.binding.isTimeOut = false holder.binding.isTimeOut = false
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/PayBillAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/PayBillAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.BillBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.BillBean
class PayBillAdapter(layoutId:Int, billBeans: MutableList<BillBean>) : BaseQuickAdapter<BillBean, BaseViewHolder>(layoutId, billBeans) { class PayBillAdapter(layoutId:Int, billBeans: MutableList<BillBean>) : BaseQuickAdapter<BillBean, BaseViewHolder>(layoutId, billBeans) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/SectionsPagerAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/SectionsPagerAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import android.content.Context import android.content.Context
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentPagerAdapter import androidx.fragment.app.FragmentPagerAdapter
import com.gingersoft.gsa.other_order_mode.ui.fragment.PlaceholderFragment import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.PlaceholderFragment
/** /**
* A [FragmentPagerAdapter] that returns a fragment corresponding to * A [FragmentPagerAdapter] that returns a fragment corresponding to
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/TextAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/TextAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
class TextAdapter(list: MutableList<String>) : BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_textview, list) { class TextAdapter(list: MutableList<String>) : BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_textview, list) {
override fun convert(holder: BaseViewHolder, item: String) { override fun convert(holder: BaseViewHolder, item: String) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/ThirdExpensesAdapter.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/ThirdExpensesAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter package com.gingersoft.gsa.delivery_pick_mode.ui.adapter
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.ServiceChargeRecordBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.ServiceChargeRecordBean
class ThirdExpensesAdapter(data: MutableList<ServiceChargeRecordBean.DataX>?) : BaseQuickAdapter<ServiceChargeRecordBean.DataX, BaseViewHolder>(R.layout.item_third_expenses, data) { class ThirdExpensesAdapter(data: MutableList<ServiceChargeRecordBean.DataX>?) : BaseQuickAdapter<ServiceChargeRecordBean.DataX, BaseViewHolder>(R.layout.item_third_expenses, data) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/base/BaseActivity.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/base/BaseActivity.kt
package com.gingersoft.gsa.other_order_mode.ui.base package com.gingersoft.gsa.delivery_pick_mode.ui.base
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/base/BaseFragment.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/base/BaseFragment.kt
package com.gingersoft.gsa.other_order_mode.ui.base package com.gingersoft.gsa.delivery_pick_mode.ui.base
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/DeliveryFragment.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/DeliveryFragment.kt
package com.gingersoft.gsa.other_order_mode.ui.fragment package com.gingersoft.gsa.delivery_pick_mode.ui.fragment
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
...@@ -10,13 +10,13 @@ import androidx.lifecycle.ViewModelProvider ...@@ -10,13 +10,13 @@ import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.ui.utils.AppDialog import com.gingersoft.gsa.cloud.ui.utils.AppDialog
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.model.viewModel.DeliveryViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.DeliveryViewModel
import com.gingersoft.gsa.other_order_mode.ui.activity.DeliverySettingActivity import com.gingersoft.gsa.delivery_pick_mode.ui.activity.DeliverySettingActivity
import com.gingersoft.gsa.other_order_mode.ui.adapter.DeliveryListAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.DeliveryListAdapter
import com.gingersoft.gsa.other_order_mode.ui.base.BaseFragment import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseFragment
import com.gingersoft.gsa.other_order_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.gingersoft.gsa.other_order_mode.util.setState import com.gingersoft.gsa.delivery_pick_mode.util.setState
import kotlinx.android.synthetic.main.fragment_delivery_list.* import kotlinx.android.synthetic.main.fragment_delivery_list.*
class DeliveryFragment : BaseFragment() { class DeliveryFragment : BaseFragment() {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/HistoryFragment.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/HistoryFragment.kt
package com.gingersoft.gsa.other_order_mode.ui.fragment package com.gingersoft.gsa.delivery_pick_mode.ui.fragment
import android.os.Bundle import android.os.Bundle
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
...@@ -6,13 +6,13 @@ import androidx.lifecycle.Observer ...@@ -6,13 +6,13 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.model.viewModel.HistoryOrderViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.HistoryOrderViewModel
import com.gingersoft.gsa.other_order_mode.ui.adapter.HistoryOrderAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.HistoryOrderAdapter
import com.gingersoft.gsa.other_order_mode.ui.base.BaseFragment import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseFragment
import com.gingersoft.gsa.other_order_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.gingersoft.gsa.other_order_mode.util.OtherOrderUtils import com.gingersoft.gsa.delivery_pick_mode.util.OtherOrderUtils
import com.gingersoft.gsa.other_order_mode.util.setState import com.gingersoft.gsa.delivery_pick_mode.util.setState
import kotlinx.android.synthetic.main.fragment_other_order.* import kotlinx.android.synthetic.main.fragment_other_order.*
class HistoryFragment : BaseFragment(R.layout.fragment_other_order) { class HistoryFragment : BaseFragment(R.layout.fragment_other_order) {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/HistoryViewModel.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/HistoryViewModel.kt
package com.gingersoft.gsa.other_order_mode.ui.fragment package com.gingersoft.gsa.delivery_pick_mode.ui.fragment
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/PlaceholderFragment.kt
package com.gingersoft.gsa.other_order_mode.ui.fragment package com.gingersoft.gsa.delivery_pick_mode.ui.fragment
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
...@@ -9,13 +9,13 @@ import androidx.recyclerview.widget.LinearLayoutManager ...@@ -9,13 +9,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil import com.gingersoft.gsa.cloud.base.utils.other.TextUtil
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.PageViewModel
import com.gingersoft.gsa.other_order_mode.ui.activity.OrderDetailsActivity import com.gingersoft.gsa.delivery_pick_mode.ui.activity.OrderDetailsActivity
import com.gingersoft.gsa.other_order_mode.ui.adapter.OtherOrdersAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.OtherOrdersAdapter
import com.gingersoft.gsa.other_order_mode.ui.base.BaseFragment import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseFragment
import com.gingersoft.gsa.other_order_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.gingersoft.gsa.other_order_mode.util.setState import com.gingersoft.gsa.delivery_pick_mode.util.setState
import kotlinx.android.synthetic.main.fragment_other_order.* import kotlinx.android.synthetic.main.fragment_other_order.*
/** /**
...@@ -54,14 +54,14 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) { ...@@ -54,14 +54,14 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
intent.putExtra("orderPayType", data.orderPayType) intent.putExtra("orderPayType", data.orderPayType)
intent.putExtra("isRead", data.isRead) intent.putExtra("isRead", data.isRead)
//已指派物流 並且 狀態為未接單 才判斷是否超時 //已指派物流 並且 狀態為未接單 才判斷是否超時
if (data.isDelete == 0 && data.curStat < 2) { // if (data.isDelete == 0 && data.curStat < 2) {
if (pageViewModel.timeOut == 0) { // if (pageViewModel.timeOut == 0) {
//為0時沒配置，不顯示追加服務費按鈕 // //為0時沒配置，不顯示追加服務費按鈕
intent.putExtra("isTimeOut", false) // intent.putExtra("isTimeOut", false)
} else { // } else {
intent.putExtra("isTimeOut", data.timeSecond < pageViewModel.timeOut * 60 * 1000) // intent.putExtra("isTimeOut", data.timeSecond < pageViewModel.timeOut * 60 * 1000)
} // }
} // }
startActivity(intent) startActivity(intent)
} }
rv_other_order.adapter = adapter rv_other_order.adapter = adapter
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/UpdateDeliveryFragment.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/UpdateDeliveryFragment.kt
package com.gingersoft.gsa.other_order_mode.ui.fragment package com.gingersoft.gsa.delivery_pick_mode.ui.fragment
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
...@@ -9,13 +8,13 @@ import androidx.recyclerview.widget.LinearLayoutManager ...@@ -9,13 +8,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
import com.gingersoft.gsa.other_order_mode.model.viewModel.DeliveryViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.DeliveryViewModel
import com.gingersoft.gsa.other_order_mode.ui.activity.DeliverySettingActivity import com.gingersoft.gsa.delivery_pick_mode.ui.activity.DeliverySettingActivity
import com.gingersoft.gsa.other_order_mode.ui.adapter.TextAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.TextAdapter
import com.gingersoft.gsa.other_order_mode.ui.base.BaseFragment import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseFragment
import com.gingersoft.gsa.other_order_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.jess.arms.utils.ArmsUtils import com.jess.arms.utils.ArmsUtils
import com.qmuiteam.qmui.util.QMUIDisplayHelper import com.qmuiteam.qmui.util.QMUIDisplayHelper
import com.qmuiteam.qmui.widget.popup.QMUIPopup import com.qmuiteam.qmui.widget.popup.QMUIPopup
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/InjectorUtil.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/util/InjectorUtil.kt
package com.gingersoft.gsa.other_order_mode.util package com.gingersoft.gsa.delivery_pick_mode.util
import com.gingersoft.gsa.other_order_mode.data.DeliveryRepository import com.gingersoft.gsa.delivery_pick_mode.data.DeliveryRepository
import com.gingersoft.gsa.other_order_mode.data.HistoryOrderRepository import com.gingersoft.gsa.delivery_pick_mode.data.HistoryOrderRepository
import com.gingersoft.gsa.other_order_mode.data.WeatherRepository import com.gingersoft.gsa.delivery_pick_mode.data.WeatherRepository
import com.gingersoft.gsa.other_order_mode.data.network.CoolWeatherNetwork import com.gingersoft.gsa.delivery_pick_mode.data.network.CoolWeatherNetwork
import com.gingersoft.gsa.other_order_mode.data.network.DeliveryNetwork import com.gingersoft.gsa.delivery_pick_mode.data.network.DeliveryNetwork
import com.gingersoft.gsa.other_order_mode.model.factory.DeliveryFactory import com.gingersoft.gsa.delivery_pick_mode.model.factory.DeliveryFactory
import com.gingersoft.gsa.other_order_mode.model.factory.HistoryOrderModelFactory import com.gingersoft.gsa.delivery_pick_mode.model.factory.HistoryOrderModelFactory
import com.gingersoft.gsa.other_order_mode.model.factory.WeatherModelFactory import com.gingersoft.gsa.delivery_pick_mode.model.factory.WeatherModelFactory
object InjectorUtil { object InjectorUtil {
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/OtherOrderUtils.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/util/OtherOrderUtils.kt
package com.gingersoft.gsa.other_order_mode.util package com.gingersoft.gsa.delivery_pick_mode.util
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
...@@ -6,7 +6,6 @@ import android.media.AudioAttributes ...@@ -6,7 +6,6 @@ import android.media.AudioAttributes
import android.media.AudioManager import android.media.AudioManager
import android.media.SoundPool import android.media.SoundPool
import android.os.Build import android.os.Build
import android.util.Log
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
...@@ -18,11 +17,11 @@ import com.gingersoft.gsa.cloud.base.utils.MoneyUtil ...@@ -18,11 +17,11 @@ import com.gingersoft.gsa.cloud.base.utils.MoneyUtil
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil import com.gingersoft.gsa.cloud.base.utils.other.TextUtil
import com.gingersoft.gsa.cloud.base.widget.DialogUtils import com.gingersoft.gsa.cloud.base.widget.DialogUtils
import com.gingersoft.gsa.cloud.print.bean.OrderDetails import com.gingersoft.gsa.cloud.print.bean.OrderDetails
import com.gingersoft.gsa.other_order_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.other_order_mode.data.model.bean.BillBean import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.BillBean
import com.gingersoft.gsa.other_order_mode.databinding.LayoutOrderInfoDialogNewBinding import com.gingersoft.gsa.delivery_pick_mode.databinding.LayoutOrderInfoDialogNewBinding
import com.gingersoft.gsa.other_order_mode.ui.adapter.FoodListAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.FoodListAdapter
import com.gingersoft.gsa.other_order_mode.ui.adapter.PayBillAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.PayBillAdapter
import com.jess.arms.utils.ArmsUtils import com.jess.arms.utils.ArmsUtils
import java.lang.Double.parseDouble import java.lang.Double.parseDouble
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/RxTimerUtil.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/util/RxTimerUtil.kt
package com.gingersoft.gsa.other_order_mode.util package com.gingersoft.gsa.delivery_pick_mode.util
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Observer import io.reactivex.Observer
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/ViewUtil.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/util/ViewUtil.kt
package com.gingersoft.gsa.other_order_mode.util package com.gingersoft.gsa.delivery_pick_mode.util
import android.app.Activity import android.app.Activity
import android.app.Dialog import android.app.Dialog
......
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/Data.kt deleted 100644 → 0
package com.gingersoft.gsa.other_order_mode.data.model.bean
data class Data(
val estimated_time: Int
)
\ No newline at end of file
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/PayTypeInfo.java deleted 100644 → 0
package com.gingersoft.gsa.other_order_mode.data.model.bean;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import java.util.ArrayList;
import java.util.List;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2018/7/10
* 修订历史：2018/7/10
* 描述：
*/
public class PayTypeInfo {
/**
* code : 1
* data : {"id":15558,"amount":0.05,"remain":161457,"status":0,"orderType":2,"payType":[{"id":6,"payName":"支付宝HK","isdefault":1,"remarks":null},{"id":11,"payName":"服务员确认","isdefault":0,"remarks":null},{"id":5,"payName":"TNG","isdefault":0,"remarks":null},{"id":8,"payName":"支付宝","isdefault":0,"remarks":null},{"id":9,"payName":"微信","isdefault":0,"remarks":null}],"restaurantId":26,"restaurantName":"Gingersoft"}
* errorMsg : 成功
* page : null
*/
private String code;
private DataBean data;
private String errorMsg;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public DataBean getData() {
return data;
}
public void setData(DataBean data) {
this.data = data;
}
public String getErrorMsg() {
return errorMsg;
}
public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}
public static class DataBean {
/**
* id : 15558
* amount : 0.05
* remain : 161457
* status : 0
* orderType : 2
* payType : [{"id":6,"payName":"支付宝HK","isdefault":1,"remarks":null},{"id":11,"payName":"服务员确认","isdefault":0,"remarks":null},{"id":5,"payName":"TNG","isdefault":0,"remarks":null},{"id":8,"payName":"支付宝","isdefault":0,"remarks":null},{"id":9,"payName":"微信","isdefault":0,"remarks":null}]
* restaurantId : 26
* restaurantName : Gingersoft
*/
private int id;
private double amount;
private int remain;
private String appleToken;
private int status;
private int orderType;
private int restaurantId;
private String restaurantName;
private List<PayTypeBean> payType;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public double getAmount() {
return amount;
}
public void setAmount(double amount) {
this.amount = amount;
}
public int getRemain() {
return remain;
}
public void setRemain(int remain) {
this.remain = remain;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getOrderType() {
return orderType;
}
public void setOrderType(int orderType) {
this.orderType = orderType;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public String getRestaurantName() {
return restaurantName;
}
public void setRestaurantName(String restaurantName) {
this.restaurantName = restaurantName;
}
public List<PayTypeBean> getPayType() {
return payType;
}
public void setPayType(List<PayTypeBean> payType) {
this.payType = payType;
}
public String getAppleToken() {
return appleToken;
}
public void setAppleToken(String appleToken) {
this.appleToken = appleToken;
}
public static class PayTypeBean {
/**
* id : 6
* payName : 支付宝HK
* isdefault : 1
* remarks : null
*/
private int id;
private long isdefault;
private String remarks;
private String payName;
private String payName3;
private String payName2;
private boolean checked;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public long getIsdefault() {
return isdefault;
}
public void setIsdefault(long isdefault) {
this.isdefault = isdefault;
}
public String getPayName() {
return payName;
}
public void setPayName(String payName) {
this.payName = payName;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public boolean isChecked() {
return checked;
}
public void setChecked(boolean checked) {
this.checked = checked;
}
public String getPayName3() {
return payName3;
}
public void setPayName3(String payName3) {
this.payName3 = payName3;
}
public String getPayName2() {
return payName2;
}
public void setPayName2(String payName2) {
this.payName2 = payName2;
}
}
}
public static List<PayMethod> getPayMethodByPayType(PayTypeInfo.DataBean payTypes) {
List<PayMethod> payMethods = new ArrayList<>();
if (payTypes == null) {
return payMethods;
}
if (payTypes.payType == null) {
return payMethods;
}
for (PayTypeInfo.DataBean.PayTypeBean payType : payTypes.payType) {
PayMethod payMethod = new PayMethod(payType.id, payType.payName, payType.payName2, payType.payName3);
payMethods.add(payMethod);
}
return payMethods;
}
}
delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/aaa.kt deleted 100644 → 0
package com.gingersoft.gsa.other_order_mode.ui.activity
fun main() {
var aaa = "1234567891023456789"
var str = "asdf sdafas saf"
}
\ No newline at end of file
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