Skip to content

S
supplier
Commit c6a57b39 by Wyh
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
parents e65ccb3b c9d2faed
Showing with 590 additions and 276 deletions
base-module/build.gradle
...@@ -5,6 +5,7 @@ apply plugin: 'kotlin-android-extensions' ...@@ -5,6 +5,7 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.jakewharton.butterknife' apply plugin: 'com.jakewharton.butterknife'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
android { android {
compileSdkVersion rootProject.ext.android["compileSdkVersion"] compileSdkVersion rootProject.ext.android["compileSdkVersion"]
...@@ -59,6 +60,43 @@ android { ...@@ -59,6 +60,43 @@ android {
} }
} }
////dokit 扩展
//dokitExt {
// //通用设置
// comm {
// //地图经纬度开关
// gpsSwitch true
// //网络开关
// networkSwitch true
// //大图开关
// bigImgSwitch true
// //webView js 抓包
// webViewSwitch true
// }
//
// slowMethod {
// //调用栈模式配置
// stackMethod {
// //默认值为 5ms 小于该值的函数在调用栈中不显示
// thresholdTime 5
// //调用栈函数入口
// enterMethods = ["com.didichuxing.doraemondemo.MainDebugActivity.test1"]
// //黑名单 粒度最小到类 暂不支持到方法
// methodBlacklist = ["com.facebook.drawee.backends.pipeline.Fresco"]
// }
// //普通模式配置
// normalMethod {
// //默认值为 500ms 小于该值的函数在运行时不会在控制台中被打印
// thresholdTime 100
// //需要针对函数插装的包名
// packageNames = ["com.didichuxing.doraemondemo"]
// //不需要针对函数插装的包名和类名
// methodBlacklist = ["com.didichuxing.doraemondemo.dokit"]
// }
// }
//}
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation files('libs/javabase64-1.2.jar') implementation files('libs/javabase64-1.2.jar')
...@@ -84,7 +122,6 @@ dependencies { ...@@ -84,7 +122,6 @@ dependencies {
kapt rootProject.ext.dependencies["butterknife-compiler"] kapt rootProject.ext.dependencies["butterknife-compiler"]
api rootProject.ext.dependencies["BaseRecyclerViewAdapter"] api rootProject.ext.dependencies["BaseRecyclerViewAdapter"]
implementation rootProject.ext.dependencies["fastjson"] implementation rootProject.ext.dependencies["fastjson"]
// api rootProject.ext.dependencies["zxing"]
implementation rootProject.ext.dependencies["progressmanager"] implementation rootProject.ext.dependencies["progressmanager"]
implementation rootProject.ext.dependencies["autosize"] implementation rootProject.ext.dependencies["autosize"]
// test // test
...@@ -97,7 +134,6 @@ dependencies { ...@@ -97,7 +134,6 @@ dependencies {
api 'com.github.lihangleo2:ShadowLayout:2.1.6' api 'com.github.lihangleo2:ShadowLayout:2.1.6'
//時間選擇控件 //時間選擇控件
api 'com.contrarywind:Android-PickerView:3.2.4' api 'com.contrarywind:Android-PickerView:3.2.4'
// implementation 'org.aspectj:aspectjrt:1.8.9'
//商米打印庫 //商米打印庫
api 'com.sunmi:printerlibrary:1.0.7' api 'com.sunmi:printerlibrary:1.0.7'
//上下拉刷新 //上下拉刷新
...@@ -114,13 +150,15 @@ dependencies { ...@@ -114,13 +150,15 @@ dependencies {
api rootProject.ext.dependencies["pickerview"] api rootProject.ext.dependencies["pickerview"]
//底部功能導航view //底部功能導航view
api 'com.github.ittianyu:BottomNavigationViewEx:2.0.4' api 'com.github.ittianyu:BottomNavigationViewEx:2.0.4'
//滴滴開源 哆啦A夢:辅助开发工具、测试效率工具、视觉辅助工具
// debugImplementation rootProject.ext.dependencies["doraemonkit"]
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.3'
releaseImplementation 'com.didichuxing.doraemonkit:dokitx-no-op:3.3.3'
api rootProject.ext.dependencies["permissionx"] api rootProject.ext.dependencies["permissionx"]
api rootProject.ext.dependencies["design"] api rootProject.ext.dependencies["design"]
api rootProject.ext.dependencies["appcompat-v7"] api rootProject.ext.dependencies["appcompat-v7"]
implementation 'cn.bingoogolapple:bga-photopicker:1.2.8@aar' implementation 'cn.bingoogolapple:bga-photopicker:1.2.8@aar'
implementation 'cn.bingoogolapple:bga-baseadapter:1.2.9@aar' implementation 'cn.bingoogolapple:bga-baseadapter:1.2.9@aar'
implementation 'cn.bingoogolapple:bga-flowlayout:1.0.0@aar' implementation 'cn.bingoogolapple:bga-flowlayout:1.0.0@aar'
......
base-module/src/main/AndroidManifest.xml
<manifest package="com.gingersoft.gsa.cloud.base" <manifest
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gingersoft.gsa.cloud.base">
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:supportsRtl="true" android:supportsRtl="true"
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java → base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
package com.gingersoft.gsa.cloud.base.application; package com.gingersoft.gsa.cloud.app;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
...@@ -7,10 +7,9 @@ import android.content.pm.PackageManager; ...@@ -7,10 +7,9 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.didichuxing.doraemonkit.DoraemonKit;
import com.elvishew.xlog.LogConfiguration; import com.elvishew.xlog.LogConfiguration;
import com.elvishew.xlog.LogLevel; import com.elvishew.xlog.LogLevel;
import com.elvishew.xlog.XLog; import com.elvishew.xlog.XLog;
...@@ -25,20 +24,15 @@ import com.gingersoft.gsa.cloud.base.BuildConfig; ...@@ -25,20 +24,15 @@ import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.utils.AidlUtil; import com.gingersoft.gsa.cloud.base.utils.AidlUtil;
import com.gingersoft.gsa.cloud.base.utils.FileUtils; import com.gingersoft.gsa.cloud.base.utils.FileUtils;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler; import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.utils.xlog.MyBackupStrategy; import com.gingersoft.gsa.cloud.base.utils.xlog.MyBackupStrategy;
import com.gingersoft.gsa.cloud.bean.expandInfo.ExpandInfoSetting; import com.gingersoft.gsa.cloud.config.DoraemonKitConfig;
import com.gingersoft.gsa.cloud.bean.expandInfo.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.bean.expandInfo.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.constans.PrintConstans; import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.constans.UserConstans; import com.gingersoft.gsa.cloud.constans.UserConstans;
import com.gingersoft.gsa.cloud.database.DaoManager; import com.gingersoft.gsa.cloud.database.DaoManager;
import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
import com.gingersoft.gsa.cloud.database.utils.ExpandInfoDaoUtils;
import com.gingersoft.gsa.cloud.ui.loadsir.CustomCallback; import com.gingersoft.gsa.cloud.ui.loadsir.CustomCallback;
import com.gingersoft.gsa.cloud.ui.loadsir.EmptyCallback; import com.gingersoft.gsa.cloud.ui.loadsir.EmptyCallback;
import com.gingersoft.gsa.cloud.ui.loadsir.ErrorCallback; import com.gingersoft.gsa.cloud.ui.loadsir.ErrorCallback;
...@@ -52,16 +46,16 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout; ...@@ -52,16 +46,16 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.footer.ClassicsFooter; import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
import com.scwang.smartrefresh.layout.header.ClassicsHeader; import com.scwang.smartrefresh.layout.header.ClassicsHeader;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.autosize.AutoSize; import me.jessyan.autosize.AutoSize;
import me.jessyan.autosize.AutoSizeConfig; import me.jessyan.autosize.AutoSizeConfig;
import me.jessyan.autosize.onAdaptListener; import me.jessyan.autosize.onAdaptListener;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager; import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import com.gingersoft.gsa.cloud.config.expandInfo.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandInfo.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
/** /**
* Created by Wyh on 2019/12/21. * Created by Wyh on 2019/12/21.
...@@ -125,6 +119,8 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -125,6 +119,8 @@ public class GsaCloudApplication extends BaseApplication {
// QMUISwipeBackActivityManager.init(this); // QMUISwipeBackActivityManager.init(this);
//初始化主題管理器 //初始化主題管理器
// QDSkinManager.install(this); // QDSkinManager.install(this);
//初始化哆啦A夢
initDoraemonKit();
//初始化上下拉刷新 //初始化上下拉刷新
initRefresh(); initRefresh();
//初始化加载反馈页管理框架 //初始化加载反馈页管理框架
...@@ -161,6 +157,10 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -161,6 +157,10 @@ public class GsaCloudApplication extends BaseApplication {
// Tracker.INSTANCE.initialize(this); // Tracker.INSTANCE.initialize(this);
} }
private void initDoraemonKit() {
DoraemonKit.install(getAppContext(), DoraemonKitConfig.PRODUCE_ID);
}
public Activity getCurrentActivity() { public Activity getCurrentActivity() {
return mCurrentActivity; return mCurrentActivity;
...@@ -238,6 +238,8 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -238,6 +238,8 @@ public class GsaCloudApplication extends BaseApplication {
RetrofitUrlManager.getInstance().putDomain("ricepon_cloud_gsa", HttpsConstans.ricepon_cloud_gsa); RetrofitUrlManager.getInstance().putDomain("ricepon_cloud_gsa", HttpsConstans.ricepon_cloud_gsa);
//61177 //61177
RetrofitUrlManager.getInstance().putDomain("ricepon_member", HttpsConstans.RICEPON_MEMBER_61177); RetrofitUrlManager.getInstance().putDomain("ricepon_member", HttpsConstans.RICEPON_MEMBER_61177);
//餐廳模塊請求地址
RetrofitUrlManager.getInstance().putDomain("ricepon_restaurant", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_RESTAURANT);
} }
private void initPrint() { private void initPrint() {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/BaseResultOld.java 0 → 100644
package com.gingersoft.gsa.cloud.base.common.bean;
import com.jakewharton.rxbinding2.internal.GenericTypeNullable;
import lombok.Getter;
/**
* @author : bin
* @create date: 2020-11-05
* @update date: 2020-11-05
* @description:
*/
@Getter
public class BaseResultOld {
/**
* code : "0"
* sysTime : 1579079565872
*/
private int code;
private long sysTime;
private String errMsg;
}
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/expand/UIStyleConfiguration.java deleted 100644 → 0
package com.gingersoft.gsa.cloud.base.common.bean.expand;
public class UIStyleConfiguration {
}
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/ClipboardUtils.java
...@@ -5,7 +5,7 @@ import android.content.ClipboardManager; ...@@ -5,7 +5,7 @@ import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
/** /**
* <pre> * <pre>
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java
package com.gingersoft.gsa.cloud.base.utils; package com.gingersoft.gsa.cloud.base.utils;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
import com.gingersoft.gsa.cloud.bean.expandInfo.ExpandInfoSetting; import com.gingersoft.gsa.cloud.config.expandInfo.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.bean.expandInfo.FunctionExtendedConfiguration; import com.gingersoft.gsa.cloud.config.expandInfo.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.bean.expandInfo.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.constans.ExpandConstant; import com.gingersoft.gsa.cloud.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.database.bean.ExpandInfo; import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantInfoUtils.java
...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.base.utils; ...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.base.utils;
import android.content.Context; import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean; import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
import java.util.ArrayList; import java.util.ArrayList;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
...@@ -12,7 +12,7 @@ import android.widget.Toast; ...@@ -12,7 +12,7 @@ import android.widget.Toast;
import com.elvishew.xlog.XLog; import com.elvishew.xlog.XLog;
import com.gingersoft.gsa.cloud.base.Api; import com.gingersoft.gsa.cloud.base.Api;
import com.gingersoft.gsa.cloud.base.BuildConfig; import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.utils.FileUtils; import com.gingersoft.gsa.cloud.base.utils.FileUtils;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
...@@ -37,9 +37,11 @@ import java.util.HashMap; ...@@ -37,9 +37,11 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import io.reactivex.Observable;
import io.reactivex.Observer; import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import static com.gingersoft.gsa.cloud.constans.AppConstans.RP_ERROR; import static com.gingersoft.gsa.cloud.constans.AppConstans.RP_ERROR;
...@@ -144,30 +146,54 @@ public class AppCrashHandler implements UncaughtExceptionHandler { ...@@ -144,30 +146,54 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
if (ex == null) { if (ex == null) {
return false; return false;
} }
Observable.just(0)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<Integer>() {
@Override
public void accept(@io.reactivex.annotations.NonNull Integer integer) throws Exception {
Looper.prepare();
String showText = ErrorStr;
Throwable cause = ex.getCause();
if (cause != null && BuildConfig.DEBUG) {
StackTraceElement[] stackTrace = cause.getStackTrace();
if (stackTrace != null && stackTrace.length > 0) {
String causeName = cause.getClass().getSimpleName();
//使用Toast来显示异常信息 String fileName = stackTrace[0].getFileName();
new Thread() { fileName = fileName.substring(0, fileName.length() - 4);
@Override int lineNumber = stackTrace[0].getLineNumber();
public void run() { showText += "-" + fileName + "-" + lineNumber + "-" + causeName;
Looper.prepare(); OkHttp3Utils.noticePersonnel(RP_ERROR, showText);
String showText = ErrorStr; }
Throwable cause = ex.getCause(); }
if (cause != null && BuildConfig.DEBUG) { Toast.makeText(mContext, showText, Toast.LENGTH_LONG).show();
StackTraceElement[] stackTrace = cause.getStackTrace(); Looper.loop();
if (stackTrace != null && stackTrace.length > 0) {
String causeName = cause.getClass().getSimpleName();
String fileName = stackTrace[0].getFileName();
fileName = fileName.substring(0, fileName.length() - 4);
int lineNumber = stackTrace[0].getLineNumber();
showText += "-" + fileName + "-" + lineNumber + "-" + causeName;
OkHttp3Utils.noticePersonnel(RP_ERROR, showText);
} }
} });
Toast.makeText(mContext, showText, Toast.LENGTH_LONG).show(); //使用Toast来显示异常信息
Looper.loop(); // new Thread() {
} // @Override
}.start(); // public void run() {
// Looper.prepare();
// String showText = ErrorStr;
// Throwable cause = ex.getCause();
// if (cause != null && BuildConfig.DEBUG) {
// StackTraceElement[] stackTrace = cause.getStackTrace();
// if (stackTrace != null && stackTrace.length > 0) {
// String causeName = cause.getClass().getSimpleName();
//
// String fileName = stackTrace[0].getFileName();
// fileName = fileName.substring(0, fileName.length() - 4);
// int lineNumber = stackTrace[0].getLineNumber();
// showText += "-" + fileName + "-" + lineNumber + "-" + causeName;
// OkHttp3Utils.noticePersonnel(RP_ERROR, showText);
// }
// }
// Toast.makeText(mContext, showText, Toast.LENGTH_LONG).show();
// Looper.loop();
// }
// }.start();
final Writer result = new StringWriter(); final Writer result = new StringWriter();
final PrintWriter printWriter = new PrintWriter(result); final PrintWriter printWriter = new PrintWriter(result);
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
package com.gingersoft.gsa.cloud.base.utils.okhttpUtils; package com.gingersoft.gsa.cloud.base.utils.okhttpUtils;
import com.gingersoft.gsa.cloud.base.BuildConfig; import com.gingersoft.gsa.cloud.app.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;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.constans.AppConstans; import com.gingersoft.gsa.cloud.constans.AppConstans;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/other/SPUtils.java
...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.base.utils.other; ...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.base.utils.other;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/xlog/DateFileNameGenerator.java
package com.gingersoft.gsa.cloud.base.utils.xlog; package com.gingersoft.gsa.cloud.base.utils.xlog;
import com.elvishew.xlog.printer.file.naming.FileNameGenerator; import com.elvishew.xlog.printer.file.naming.FileNameGenerator;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/DoraemonKitConfig.java 0 → 100644
package com.gingersoft.gsa.cloud.config;
/**
* @author : bin
* @create date: 2020-11-07
* @update date: 2020-11-07
* @description:
*/
public class DoraemonKitConfig {
public static final String PRODUCE_ID = "72c44cfa50ce2d7325e407bf31d93173";
}
base-module/src/main/java/com/gingersoft/gsa/cloud/config/LogInfoConfig.java 0 → 100644
package com.gingersoft.gsa.cloud.config;
/**
* @author : bin
* @create date: 2020-11-05
* @update date: 2020-11-05
* @description:
*/
public class LogInfoConfig {
}
base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/ExpandInfoSetting.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/expandconfig/ExpandInfoSetting.java
package com.gingersoft.gsa.cloud.bean.expandInfo; package com.gingersoft.gsa.cloud.config.expandInfo;
import android.util.SparseArray;
import com.gingersoft.gsa.cloud.base.Api; import com.gingersoft.gsa.cloud.base.Api;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
...@@ -29,7 +27,7 @@ import lombok.Setter; ...@@ -29,7 +27,7 @@ import lombok.Setter;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import static com.gingersoft.gsa.cloud.base.application.GsaCloudApplication.getAppContext; import static com.gingersoft.gsa.cloud.app.GsaCloudApplication.getAppContext;
/** /**
* @author : bin * @author : bin
...@@ -57,14 +55,14 @@ public class ExpandInfoSetting { ...@@ -57,14 +55,14 @@ public class ExpandInfoSetting {
public <T> T getValue() { public <T> T getValue() {
if (valueInt != null) { if (valueChar != null) {
return (T) valueInt;
} else if (valueChar != null) {
return (T) valueChar; return (T) valueChar;
} else if (valueBoolean != null) { } else if (valueBoolean != null) {
return (T) valueBoolean; return (T) valueBoolean;
} else if (valueDateTime != null) { } else if (valueDateTime != null) {
return (T) valueDateTime; return (T) valueDateTime;
} else if (valueInt != null) {
return (T) valueInt;
} }
return null; return null;
} }
...@@ -94,7 +92,7 @@ public class ExpandInfoSetting { ...@@ -94,7 +92,7 @@ public class ExpandInfoSetting {
@Override @Override
public void onNext(String s) { public void onNext(String s) {
int i = 1;
} }
@Override @Override
......
base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/FunctionExtendedConfiguration.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/expandconfig/FunctionExtendedConfiguration.java
package com.gingersoft.gsa.cloud.bean.expandInfo; package com.gingersoft.gsa.cloud.config.expandInfo;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
/** /**
* @author : bin * @author : bin
* @create date: 2020-10-20 * @create date: 2020-10-20
...@@ -103,75 +105,114 @@ public class FunctionExtendedConfiguration { ...@@ -103,75 +105,114 @@ public class FunctionExtendedConfiguration {
.remark("餐檯模式下單頁多少秒不操作返回餐檯頁面") .remark("餐檯模式下單頁多少秒不操作返回餐檯頁面")
.build(); .build();
public <T>T getRoundingVaule() { /**
* skyorder相關
*/
private ExpandInfoSetting QRCodeTimeSlice = ExpandInfoSetting.builder()
.valueChar("00,15,30,45")
.remark("QRCode交台时间片（分）使用逗号分隔")
.build();
private ExpandInfoSetting SkyQRCodeTableFlagText = ExpandInfoSetting.builder()
.valueChar("S")
.remark("skyorder QRCode餐檯標記")
.build();
private ExpandInfoSetting SkyQRCodePrintTopInfo = ExpandInfoSetting.builder()
.valueChar("頂部打印可配置文字")
.remark("qrcode頂部文字")
.build();
private ExpandInfoSetting SkyQRCodePrintBottomInfo = ExpandInfoSetting.builder()
.valueChar("底部打印可配置文字")
.remark("qrcode底部文字")
.build();
public <T> T getRoundingVaule() {
return Rounding.getValue(); return Rounding.getValue();
} }
public <T>T getRoundingDecimalVaule() { public <T> T getRoundingDecimalVaule() {
return RoundingDecimal.getValue(); return RoundingDecimal.getValue();
} }
public <T>T getItemDecimalsVaule() { public <T> T getItemDecimalsVaule() {
return ItemDecimals.getValue(); return ItemDecimals.getValue();
} }
public <T>T getDeliveryPrintCountVaule() { public <T> T getDeliveryPrintCountVaule() {
return DeliveryPrintCount.getValue(); return DeliveryPrintCount.getValue();
} }
public <T>T getDeliveryClosingPCVaule() { public <T> T getDeliveryClosingPCVaule() {
return DeliveryClosingPC.getValue(); return DeliveryClosingPC.getValue();
} }
public <T>T getTableModePrintCountVaule() { public <T> T getTableModePrintCountVaule() {
return TableModePrintCount.getValue(); return TableModePrintCount.getValue();
} }
public <T>T getTableModeClosingPCVaule() { public <T> T getTableModeClosingPCVaule() {
return TableModeClosingPC.getValue(); return TableModeClosingPC.getValue();
} }
public <T>T getOrderReceivingTimeoutVaule() { public <T> T getOrderReceivingTimeoutVaule() {
return OrderReceivingTimeout.getValue(); return OrderReceivingTimeout.getValue();
} }
public <T>T getPrintMemberInfoVaule() { public <T> T getPrintMemberInfoVaule() {
return PrintMemberInfo.getValue(); return PrintMemberInfo.getValue();
} }
public <T>T getPrintPageVaule() { public <T> T getPrintPageVaule() {
return PrintPage.getValue(); return PrintPage.getValue();
} }
public <T>T getPrintMergerFoodVaule() { public <T> T getPrintMergerFoodVaule() {
return PrintMergerFood.getValue(); return PrintMergerFood.getValue();
} }
public <T>T getPrintStatisticsAmountVaule() { public <T> T getPrintStatisticsAmountVaule() {
return PrintStatisticsAmount.getValue(); return PrintStatisticsAmount.getValue();
} }
public <T>T getPrintFirstOrderVaule() { public <T> T getPrintFirstOrderVaule() {
return PrintFirstOrder.getValue(); return PrintFirstOrder.getValue();
} }
public <T>T getFrozenChainAutoOrderVaule() { public <T> T getFrozenChainAutoOrderVaule() {
return FrozenChainAutoOrder.getValue(); return FrozenChainAutoOrder.getValue();
} }
public <T>T getMergeSendFoodVaule() { public <T> T getMergeSendFoodVaule() {
return MergeSendFood.getValue(); return MergeSendFood.getValue();
} }
public <T>T getAutoPrinterPaperVaule() { public <T> T getAutoPrinterPaperVaule() {
return AutoPrinterPaper.getValue(); return AutoPrinterPaper.getValue();
} }
public <T>T getToPrintQRCodeVaule() { public <T> T getToPrintQRCodeVaule() {
return ToPrintQRCode.getValue(); return ToPrintQRCode.getValue();
} }
public <T>T getAutoQuitTimeVaule() { public <T> T getAutoQuitTimeVaule() {
return AutoQuitTime.getValue(); return AutoQuitTime.getValue();
} }
public <T> T getQRCodeTimeSliceVaule() {
return QRCodeTimeSlice.getValue();
}
public <T> T getSkyQRCodeTableFlagTextVaule() {
return SkyQRCodeTableFlagText.getValue();
}
public <T> T getSkyQRCodePrintTopInfoVaule() {
return SkyQRCodePrintTopInfo.getValue();
}
public <T> T getSkyQRCodePrintBottomInfoVaule() {
return SkyQRCodePrintBottomInfo.getValue();
}
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/UIStyleExtendedConfiguration.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/expandconfig/UIStyleExtendedConfiguration.java
package com.gingersoft.gsa.cloud.bean.expandInfo; package com.gingersoft.gsa.cloud.config.expandInfo;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
/** /**
* @author : bin * @author : bin
* @create date: 2020-10-20 * @create date: 2020-10-20
...@@ -116,6 +116,34 @@ public class UIStyleExtendedConfiguration { ...@@ -116,6 +116,34 @@ public class UIStyleExtendedConfiguration {
.remark("估清控制item字體大小") .remark("估清控制item字體大小")
.build(); .build();
/**
* skyorder相關
*/
/**
* skyorder Qrcode檯标识配置
*/
private ExpandInfoSetting SkyQRCodeTableFlagTextSize = ExpandInfoSetting.builder()
.valueInt(16)
.remark("skyorder QRCode餐檯標記字體大小")
.build();
private ExpandInfoSetting SkyQRCodeTableFlagTextColor = ExpandInfoSetting.builder()
.valueChar("#FFFFFF")
.remark("skyorder QRCode餐檯標記字體顏色")
.build();
private ExpandInfoSetting SkyQRCodeTableFlagBackgroupColor = ExpandInfoSetting.builder()
.valueChar("#f57c00")
.remark("skyorder QRCode餐檯標記背景顏色")
.build();
private ExpandInfoSetting SkyQRCodeTableFlagWith = ExpandInfoSetting.builder()
.valueInt(25)
.remark("skyorder QRCode餐檯標記寬度")
.build();
private ExpandInfoSetting SkyQRCodeTableFlagHeight = ExpandInfoSetting.builder()
.valueInt(25)
.remark("skyorder QRCode餐檯標記高度")
.build();
public <T> T getFoodGroupRowValue() { public <T> T getFoodGroupRowValue() {
return foodGroupRow.getValue(); return foodGroupRow.getValue();
...@@ -207,4 +235,24 @@ public class UIStyleExtendedConfiguration { ...@@ -207,4 +235,24 @@ public class UIStyleExtendedConfiguration {
public <T> T getSoldoutCtrlFoodFontSizeValue() { public <T> T getSoldoutCtrlFoodFontSizeValue() {
return soldoutCtrlFoodFontSize.getValue(); return soldoutCtrlFoodFontSize.getValue();
} }
public <T> T getSkyQRCodeTableFlagTextSizeValue() {
return SkyQRCodeTableFlagTextSize.getValue();
}
public <T> T getSkyQRCodeTableFlagTextColorValue() {
return SkyQRCodeTableFlagTextColor.getValue();
}
public <T> T getSkyQRCodeTableFlagBackgroupColorValue() {
return SkyQRCodeTableFlagBackgroupColor.getValue();
}
public <T> T getSkyQRCodeTableFlagWithValue() {
return SkyQRCodeTableFlagWith.getValue();
}
public <T> T getSkyQRCodeTableFlagHeightValue() {
return SkyQRCodeTableFlagHeight.getValue();
}
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/GlobalConfiguration.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/GlobalConfiguration.java
...@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.globalconfig; ...@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.globalconfig;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import com.gingersoft.gsa.cloud.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGlobalHttpHandler; import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGlobalHttpHandler;
import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGsonConfiguration; import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGsonConfiguration;
...@@ -14,10 +15,14 @@ import com.gingersoft.gsa.cloud.globalconfig.lifecyclesOptioins.MyAppLifecycles; ...@@ -14,10 +15,14 @@ import com.gingersoft.gsa.cloud.globalconfig.lifecyclesOptioins.MyAppLifecycles;
import com.jess.arms.base.delegate.AppLifecycles; import com.jess.arms.base.delegate.AppLifecycles;
import com.jess.arms.di.module.GlobalConfigModule; import com.jess.arms.di.module.GlobalConfigModule;
import com.jess.arms.integration.ConfigModule; import com.jess.arms.integration.ConfigModule;
import com.jess.arms.integration.cache.Cache;
import com.jess.arms.integration.cache.CacheType;
import com.jess.arms.utils.DataHelper; import com.jess.arms.utils.DataHelper;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
public class GlobalConfiguration implements ConfigModule { public class GlobalConfiguration implements ConfigModule {
...@@ -30,8 +35,8 @@ public class GlobalConfiguration implements ConfigModule { ...@@ -30,8 +35,8 @@ public class GlobalConfiguration implements ConfigModule {
.okhttpConfiguration(new MyOkhttpConfiguration()) .okhttpConfiguration(new MyOkhttpConfiguration())
.retrofitConfiguration(new MyRetrofitConfiguration()) .retrofitConfiguration(new MyRetrofitConfiguration())
.globalHttpHandler(new MyGlobalHttpHandler()) .globalHttpHandler(new MyGlobalHttpHandler())
.rxCacheConfiguration(new MyRxCacheConfiguration())
.responseErrorListener(new MyResponseErrorListener()) .responseErrorListener(new MyResponseErrorListener())
.rxCacheConfiguration(new MyRxCacheConfiguration())
.cacheFile(new File(DataHelper.getCacheFile(context), "rxCache")) .cacheFile(new File(DataHelper.getCacheFile(context), "rxCache"))
.gsonConfiguration(new MyGsonConfiguration()); .gsonConfiguration(new MyGsonConfiguration());
} }
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyGlobalHttpHandler.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyGlobalHttpHandler.java
package com.gingersoft.gsa.cloud.globalconfig.applyOptions; package com.gingersoft.gsa.cloud.globalconfig.applyOptions;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.constans.AppConstans; import com.gingersoft.gsa.cloud.constans.AppConstans;
import com.jess.arms.http.GlobalHttpHandler; import com.jess.arms.http.GlobalHttpHandler;
...@@ -43,7 +43,6 @@ public class MyGlobalHttpHandler implements GlobalHttpHandler { ...@@ -43,7 +43,6 @@ public class MyGlobalHttpHandler implements GlobalHttpHandler {
Headers headers = request.headers(); Headers headers = request.headers();
for (int i = 0; i < headers.size(); i++) { for (int i = 0; i < headers.size(); i++) {
builder.set(headers.name(i), headers.value(i)); builder.set(headers.name(i), headers.value(i));
} }
if(GsaCloudApplication.isLogin){ if(GsaCloudApplication.isLogin){
builder.set("token", token); builder.set("token", token);
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyOkhttpConfiguration.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyOkhttpConfiguration.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.globalconfig.applyOptions; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.globalconfig.applyOptions;
import android.content.Context; import android.content.Context;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.jess.arms.di.module.ClientModule; import com.jess.arms.di.module.ClientModule;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyResponseErrorListener.java
...@@ -7,7 +7,7 @@ import android.text.TextUtils; ...@@ -7,7 +7,7 @@ import android.text.TextUtils;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.google.gson.JsonIOException; import com.google.gson.JsonIOException;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/lifecyclesOptioins/MyActivityLifecycle.java → base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/lifecyclesOptioins/MyActivityLifecycle.java
...@@ -6,7 +6,7 @@ import android.app.Application; ...@@ -6,7 +6,7 @@ import android.app.Application;
import android.os.Bundle; import android.os.Bundle;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration; import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration;
import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils; import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils; import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
...@@ -39,7 +39,8 @@ public class HttpsConstans { ...@@ -39,7 +39,8 @@ public class HttpsConstans {
private static String HTTP_ADDRESS_URL_HK = "http://a.ricepon.com:58201";//香港測試 private static String HTTP_ADDRESS_URL_HK = "http://a.ricepon.com:58201";//香港測試
private static String HTTP_ADDRESS_URL_PRE = "http://prf-m.ricepon.com/";//預發佈 private static String HTTP_ADDRESS_URL_PRE = "http://prf-m.ricepon.com/";//預發佈
public static String CLOUD_GSA_API_PATH = "/ricepon-cloud-gsa/api/";//路徑 public static String CLOUD_GSA_API_PATH = "/ricepon-cloud-gsa/api/";//雲端GSA路徑
public static String RESTAURANT_API_PATH = "/ricepon-restaurant/api/";//餐廳模塊路徑
public static String ROOT_SERVER_YOU_CHANG_HK = "http://192.168.1.142:9012/api/"; //友常本地 public static String ROOT_SERVER_YOU_CHANG_HK = "http://192.168.1.142:9012/api/"; //友常本地
public static String ROOT_SERVER_ZHI_WANG_HK = "http://192.168.1.169:9012/api/"; //世維本地 public static String ROOT_SERVER_ZHI_WANG_HK = "http://192.168.1.169:9012/api/"; //世維本地
...@@ -97,6 +98,8 @@ public class HttpsConstans { ...@@ -97,6 +98,8 @@ public class HttpsConstans {
//默認url，配置這個值修改環境 //默認url，配置這個值修改環境
public static String ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL + CLOUD_GSA_API_PATH; public static String ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL + CLOUD_GSA_API_PATH;
public static String ROOT_SERVER_ADDRESS_FORMAL_RESTAURANT = HTTP_ADDRESS_URL_FORMAL + RESTAURANT_API_PATH;
public static String ROOT_SERVER = HTTP_ADDRESS_URL_FORMAL; public static String ROOT_SERVER = HTTP_ADDRESS_URL_FORMAL;
//修改這個值，配置外賣接單環境 //修改這個值，配置外賣接單環境
...@@ -128,6 +131,7 @@ public class HttpsConstans { ...@@ -128,6 +131,7 @@ public class HttpsConstans {
_SERVER_ADDRESS = HTTP_ADDRESS_URL_FORMAL + WECHAR_REPORT_PATH; _SERVER_ADDRESS = HTTP_ADDRESS_URL_FORMAL + WECHAR_REPORT_PATH;
ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL; ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL;
ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL + CLOUD_GSA_API_PATH; ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL + CLOUD_GSA_API_PATH;
ROOT_SERVER_ADDRESS_FORMAL_RESTAURANT = HTTP_ADDRESS_URL_FORMAL + RESTAURANT_API_PATH;
ROOT_URL = ROOT_FORMAL_URL; ROOT_URL = ROOT_FORMAL_URL;
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
...@@ -140,6 +144,7 @@ public class HttpsConstans { ...@@ -140,6 +144,7 @@ public class HttpsConstans {
_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH; _SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;
ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS; ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS;
ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_HK + CLOUD_GSA_API_PATH; ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_HK + CLOUD_GSA_API_PATH;
ROOT_SERVER_ADDRESS_FORMAL_RESTAURANT = HTTP_ADDRESS_URL_HK + RESTAURANT_API_PATH;
ROOT_URL = ROOT_HK_TEST_URL; ROOT_URL = ROOT_HK_TEST_URL;
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
...@@ -152,6 +157,7 @@ public class HttpsConstans { ...@@ -152,6 +157,7 @@ public class HttpsConstans {
_SERVER_ADDRESS = HTTP_ADDRESS_URL_PRE + WECHAR_REPORT_PATH; _SERVER_ADDRESS = HTTP_ADDRESS_URL_PRE + WECHAR_REPORT_PATH;
ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_PRE; ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_PRE;
ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_PRE + CLOUD_GSA_API_PATH; ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_PRE + CLOUD_GSA_API_PATH;
ROOT_SERVER_ADDRESS_FORMAL_RESTAURANT = HTTP_ADDRESS_URL_PRE + RESTAURANT_API_PATH;
ROOT_URL = HTTP_ADDRESS_URL_PRE; ROOT_URL = HTTP_ADDRESS_URL_PRE;
REPORT_SERVER_ADDRESS = HTTP_ADDRESS_URL_PRE + REPORT_PATH; REPORT_SERVER_ADDRESS = HTTP_ADDRESS_URL_PRE + REPORT_PATH;
WECHAR_REPORT_SERVER_ADDRESS = HTTP_ADDRESS_URL_PRE + WECHAR_REPORT_PATH; WECHAR_REPORT_SERVER_ADDRESS = HTTP_ADDRESS_URL_PRE + WECHAR_REPORT_PATH;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/constans/PrintConstans.java
...@@ -3,17 +3,14 @@ package com.gingersoft.gsa.cloud.constans; ...@@ -3,17 +3,14 @@ package com.gingersoft.gsa.cloud.constans;
public class PrintConstans { public class PrintConstans {
public static final int SO_TIMEOUT = 10 * 1000;//讀取/輸入io流數據超時的時間 public static final int SO_TIMEOUT = 10 * 1000;//讀取/輸入io流數據超時的時間
public static final int PRINT_TIMEOUT = 5 * 1000;//打印機連接超時時間 public static final int PRINT_TIMEOUT = 5 * 1000;//打印機連接超時時間
//默認打印方式 //默認打印方式
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 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";
public final static String SETTLEMENT_REPORT = "settlement_report"; public final static String SETTLEMENT_REPORT = "settlement_report";
/** /**
* 0：上菜紙 * 0：上菜紙
* 1：印單 * 1：印單
...@@ -25,6 +22,7 @@ public class PrintConstans { ...@@ -25,6 +22,7 @@ public class PrintConstans {
* 7：外賣接單結賬單 * 7：外賣接單結賬單
*/ */
public static final String PRINT_TYPE = "print_type";//打印類型 public static final String PRINT_TYPE = "print_type";//打印類型
public static final String PRINT_CONTENT = "print_content";//打印內容
public static final String PRINT_LOADING = "is_show_loading";//是否顯示加載框 public static final String PRINT_LOADING = "is_show_loading";//是否顯示加載框
public final static int PRINT_TEST = -1;//測試頁 public final static int PRINT_TEST = -1;//測試頁
...@@ -36,7 +34,7 @@ public class PrintConstans { ...@@ -36,7 +34,7 @@ public class PrintConstans {
public final static int PRINT_OTHER_ORDER = 5;//接單內容打印 外送印單 public final static int PRINT_OTHER_ORDER = 5;//接單內容打印 外送印單
public final static int PRINT_INSTRUCTION = 6;//開錢箱 public final static int PRINT_INSTRUCTION = 6;//開錢箱
public final static int PRINT_OTHER_CLOSING = 7;//外賣結賬單 public final static int PRINT_OTHER_CLOSING = 7;//外賣結賬單
public final static int PRINT_SKYORDER_QRCODE = 8;//skyorder QRCode
public final static String PRINT_MODEL_N5 = "N5"; public final static String PRINT_MODEL_N5 = "N5";
public final static String PRINT_MODEL_WISEPOS = "WiseposPlus"; public final static String PRINT_MODEL_WISEPOS = "WiseposPlus";
......
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/PrintContent.java 0 → 100644
package com.gingersoft.gsa.cloud.print.bean;
/**
* @author : bin
* @create date: 2020-11-06
* @update date: 2020-11-06
* @description:打印實體接口 所有打印實體類都實現這個接口
* */
public interface PrintContent {
}
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/PrintQRCodeContent.java 0 → 100644
package com.gingersoft.gsa.cloud.print.bean;
import android.os.Parcel;
import android.os.Parcelable;
import java.io.Serializable;
import lombok.Getter;
import lombok.Setter;
/**
* @author : bin
* @create date: 2020-11-06
* @update date: 2020-11-06
* @description:skyorder 打印實體
* */
@Getter
@Setter
public class PrintQRCodeContent implements PrintContent, Parcelable {
private String printTableName;
private String printTopInfo;
private String BottonInfo;
private String printQrcode;
private String printTime;
private String printPeopleNum;
private String printMealEndTime;
private String printBottonInfo;
public PrintQRCodeContent() {
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(this.printTableName);
dest.writeString(this.printTopInfo);
dest.writeString(this.BottonInfo);
dest.writeString(this.printQrcode);
dest.writeString(this.printTime);
dest.writeString(this.printPeopleNum);
dest.writeString(this.printMealEndTime);
dest.writeString(this.printBottonInfo);
}
protected PrintQRCodeContent(Parcel in) {
this.printTableName = in.readString();
this.printTopInfo = in.readString();
this.BottonInfo = in.readString();
this.printQrcode = in.readString();
this.printTime = in.readString();
this.printPeopleNum = in.readString();
this.printMealEndTime = in.readString();
this.printBottonInfo = in.readString();
}
public static final Parcelable.Creator<PrintQRCodeContent> CREATOR = new Parcelable.Creator<PrintQRCodeContent>() {
@Override
public PrintQRCodeContent createFromParcel(Parcel source) {
return new PrintQRCodeContent(source);
}
@Override
public PrintQRCodeContent[] newArray(int size) {
return new PrintQRCodeContent[size];
}
};
}
base-module/src/main/java/com/gingersoft/gsa/cloud/service/GetInfoUpdateService.kt
...@@ -19,7 +19,7 @@ import android.widget.RemoteViews ...@@ -19,7 +19,7 @@ import android.widget.RemoteViews
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import com.gingersoft.gsa.cloud.base.R import com.gingersoft.gsa.cloud.base.R
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.SoundPoolUtils import com.gingersoft.gsa.cloud.base.utils.SoundPoolUtils
import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/BaseRetryDialog.java
...@@ -12,6 +12,7 @@ import android.widget.LinearLayout; ...@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.database.bean.Discount; import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.ui.widget.dialog.DialogAnimationListener;
import com.google.gson.JsonIOException; import com.google.gson.JsonIOException;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
...@@ -46,6 +47,9 @@ public abstract class BaseRetryDialog extends Dialog { ...@@ -46,6 +47,9 @@ public abstract class BaseRetryDialog extends Dialog {
private static final String TAG = "BaseRetryDialog"; private static final String TAG = "BaseRetryDialog";
private Context mContext; private Context mContext;
private OnRetryListener onRetryListener;
protected DialogAnimationListener dialogAnimationListener;
public BaseRetryDialog(@NonNull Context context,int style) { public BaseRetryDialog(@NonNull Context context,int style) {
super(context, style); super(context, style);
mContext = context; mContext = context;
...@@ -110,12 +114,14 @@ public abstract class BaseRetryDialog extends Dialog { ...@@ -110,12 +114,14 @@ public abstract class BaseRetryDialog extends Dialog {
} }
}; };
private OnRetryListener onRetryListener;
public void setOnRetryListener(OnRetryListener onRetryListener) { public void setOnRetryListener(OnRetryListener onRetryListener) {
this.onRetryListener = onRetryListener; this.onRetryListener = onRetryListener;
} }
public void setDialogAnimationListener(DialogAnimationListener dialogAnimationListener) {
this.dialogAnimationListener = dialogAnimationListener;
}
public interface OnRetryListener { public interface OnRetryListener {
void onRetryClick(); void onRetryClick();
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/DialogAnimationListener.java 0 → 100644
package com.gingersoft.gsa.cloud.ui.widget.dialog;
/**
* @author : bin
* @create date: 2020-11-05
* @update date: 2020-11-05
* @description:
*/
public interface DialogAnimationListener {
/**
* 顯示動畫結束回調
*/
void showAnimEnd();
/**
* 隱藏動畫結束回調
*/
void dismissAnimEnd();
}
base-module/src/main/res/drawable/selector_new_order_radio_bg.xml
...@@ -4,6 +4,4 @@ ...@@ -4,6 +4,4 @@
<item android:drawable="@drawable/shape_delivery_item_btn_normal"/> <item android:drawable="@drawable/shape_delivery_item_btn_normal"/>
</selector> </selector>
\ No newline at end of file
build.gradle
...@@ -27,6 +27,8 @@ buildscript { ...@@ -27,6 +27,8 @@ buildscript {
classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
classpath 'com.didichuxing.doraemonkit:dokitx-plugin:3.3.3'
// classpath 'org.aspectj:aspectjtools:1.8.13' // add // classpath 'org.aspectj:aspectjtools:1.8.13' // add
// classpath 'org.aspectj:aspectjrt:1.8.13' // add // classpath 'org.aspectj:aspectjrt:1.8.13' // add
// classpath fileTree(dir: 'plugins', include: ['*.jar']) // classpath fileTree(dir: 'plugins', include: ['*.jar'])
......
coldchain-module/src/main/debug/AndroidManifest.xml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:label="@string/app_name" android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_android"> android:networkSecurityConfig="@xml/network_android">
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/ColdChainMainPresenter.java
...@@ -12,7 +12,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean; ...@@ -12,7 +12,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem; import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateRestaurantStateBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateRestaurantStateBean;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
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;
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderDetailsPresenter.java
...@@ -9,7 +9,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean; ...@@ -9,7 +9,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean;
import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean; import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem; import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.FileUtils; import com.gingersoft.gsa.cloud.base.utils.FileUtils;
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.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderListPresenter.java
...@@ -9,7 +9,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.OrderList; ...@@ -9,7 +9,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.OrderList;
import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean; import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem; import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
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;
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/SupplementOrderPresenter.java
...@@ -6,7 +6,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants; ...@@ -6,7 +6,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants;
import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract; import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean; import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementResultBean; import com.gingersoft.coldchain_module.mvp.model.bean.SupplementResultBean;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil; import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/ColdChainMainActivity.java
...@@ -35,7 +35,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.OrderList; ...@@ -35,7 +35,7 @@ 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;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
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;
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java
...@@ -25,7 +25,7 @@ import com.gingersoft.coldchain_module.mvp.presenter.OrderDetailsPresenter; ...@@ -25,7 +25,7 @@ import com.gingersoft.coldchain_module.mvp.presenter.OrderDetailsPresenter;
import com.gingersoft.coldchain_module.mvp.ui.adapter.MyPrintDocumentAdapter; import com.gingersoft.coldchain_module.mvp.ui.adapter.MyPrintDocumentAdapter;
import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderDetailsBtnAdapter; import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderDetailsBtnAdapter;
import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderDetailsFoodAdapter; import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderDetailsFoodAdapter;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; 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.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/SupplementOrderActivity.java
...@@ -17,7 +17,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants; ...@@ -17,7 +17,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants;
import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract; import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract;
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.SupplementOrderPresenter; import com.gingersoft.coldchain_module.mvp.presenter.SupplementOrderPresenter;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil; import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/fragment/OrderListFragment.java
...@@ -24,7 +24,7 @@ import com.gingersoft.coldchain_module.mvp.presenter.OrderListPresenter; ...@@ -24,7 +24,7 @@ import com.gingersoft.coldchain_module.mvp.presenter.OrderListPresenter;
import com.gingersoft.coldchain_module.mvp.ui.activity.ColdChainMainActivity; import com.gingersoft.coldchain_module.mvp.ui.activity.ColdChainMainActivity;
import com.gingersoft.coldchain_module.mvp.ui.activity.OrderDetailsActivity; import com.gingersoft.coldchain_module.mvp.ui.activity.OrderDetailsActivity;
import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderListAdapter; import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderListAdapter;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.print.bean.OrderDetails; import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
import com.jess.arms.base.BaseFragment; import com.jess.arms.base.BaseFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
......
config.gradle
ext { ext {
android = [ android = [
compileSdkVersion: 28, compileSdkVersion: 29,
buildToolsVersion: '28.0.3', buildToolsVersion: '29.0.3',
minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19 minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
targetSdkVersion : 28, targetSdkVersion : 29,
//正式版: 1.0.3 3 //正式版: 1.0.3 3
//內部測試版:1.2.0 20 //內部測試版:1.2.0 20
versionCode : 10, versionCode : 12,
versionName : "1.1.0" versionName : "1.1.2"
] ]
version = [ version = [
androidSupportSdkVersion: "28+", androidSupportSdkVersion: "29+",
retrofitSdkVersion : '2.3.0', retrofitSdkVersion : '2.3.0',
dagger2SdkVersion : "2.19", dagger2SdkVersion : "2.19",
glideSdkVersion : "4.9.0", glideSdkVersion : "4.9.0",
...@@ -131,10 +131,11 @@ ext { ...@@ -131,10 +131,11 @@ ext {
"immersionbar" : "com.gyf.immersionbar:immersionbar:3.0.0", "immersionbar" : "com.gyf.immersionbar:immersionbar:3.0.0",
// fragment快速实现（可选） // fragment快速实现（可选）
"immersionbar-components" : "com.gyf.immersionbar:immersionbar-components:3.0.0", "immersionbar-components" : "com.gyf.immersionbar:immersionbar-components:3.0.0",
//獲取權限
"permissionx" : 'com.permissionx.guolindev:permissionx:1.3.1', "permissionx" : 'com.permissionx.guolindev:permissionx:1.3.1',
//美團點評-日誌監聽https://github.com/Meituan-Dianping/Logan/tree/master/Example/Logan-Android
"logan" : 'com.dianping.android.sdk:logan:1.2.4' //滴滴開源 哆啦A夢:辅助开发工具、测试效率工具、视觉辅助工具
"doraemonkit" : 'com.didichuxing.doraemonkit:dokitx:3.3.3'
] ]
} }
database-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
...@@ -48,9 +48,13 @@ public class Discount { ...@@ -48,9 +48,13 @@ public class Discount {
public static final byte DISCOUNT_TYPE_KEYBOARD = 3; public static final byte DISCOUNT_TYPE_KEYBOARD = 3;
public static final byte DISCOUNT_TYPE_FREE_SERVICE_CHARGE = 4; public static final byte DISCOUNT_TYPE_FREE_SERVICE_CHARGE = 4;
/** /**
* 折扣可使用范围#0:食品;1:账单; * 折扣可使用范围#0:食品;1:账单;2:全部;
*/ */
private String discountType; private String discountType;
public static final byte discount_scope_commodity = 0;
public static final byte discount_scope_bill = 1;
public static final byte discount_scope_ALL = 2;
/** /**
* 状态#0:启用;1:禁用; * 状态#0:启用;1:禁用;
*/ */
...@@ -75,6 +79,11 @@ public class Discount { ...@@ -75,6 +79,11 @@ public class Discount {
* 落單類型 0：餐檯模式，1：外賣模式，2：外送模式，3：自取模式 * 落單類型 0：餐檯模式，1：外賣模式，2：外送模式，3：自取模式
*/ */
private String placeOrderType; private String placeOrderType;
public static final byte ORDER_TYPE_MEAL_STAND = 0;
public static final byte ORDER_TYPE_TAKEAWAY = 1;
public static final byte ORDER_TYPE_DELIVERY = 2;
public static final byte ORDER_TYPE_SELF_COLLECTION = 3;
/** /**
* 折扣上限 * 折扣上限
*/ */
......
database-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/FoodCombo.java
...@@ -19,10 +19,10 @@ public class FoodCombo { ...@@ -19,10 +19,10 @@ public class FoodCombo {
@Property(nameInDb = "_id") @Property(nameInDb = "_id")
private Long id; private Long id;
private Long fid; //食品ID private Long fid;
private int comId;//套餐ID private int comId;
private int seqNo; private int seqNo;
private int diffAmt; private double diffAmt;
/**套餐最大選擇數*/ /**套餐最大選擇數*/
private int selectQty; private int selectQty;
private String createTime; private String createTime;
...@@ -36,8 +36,9 @@ public class FoodCombo { ...@@ -36,8 +36,9 @@ public class FoodCombo {
private int deletes; private int deletes;
private int restaurantId; private int restaurantId;
@Generated(hash = 1268234634)
public FoodCombo(Long id, Long fid, int comId, int seqNo, int diffAmt, @Generated(hash = 531762563)
public FoodCombo(Long id, Long fid, int comId, int seqNo, double diffAmt,
int selectQty, String createTime, String defModifier, int selectQty, String createTime, String defModifier,
String excModifier, int autoNext, int multipleSelect, String updateTime, String excModifier, int autoNext, int multipleSelect, String updateTime,
int conditions, int isRT, int deletes, int restaurantId) { int conditions, int isRT, int deletes, int restaurantId) {
...@@ -63,46 +64,6 @@ public class FoodCombo { ...@@ -63,46 +64,6 @@ public class FoodCombo {
public FoodCombo() { public FoodCombo() {
} }
// private String defmodifier;
// private String excmodifier;
// /**
// * 自定義字段
// */
// @Transient
// private String name;
// @Transient
// private long parentId;
// /**
// * 價格
// */
// @Transient
// private double price = 0.00;
// /**
// * 是否自動展開
// */
// @Transient
// private int autoMode = 0;
// /**
// * 是否备注细项
// */
// @Transient
// private boolean isModifier;
// /**
// * 背景顏色
// */
// @Transient
// private int bgColor = Color.parseColor("#067878");
// /**
// * 字體顏色
// */
// @Transient
// private int fontColor = Color.parseColor("#FFFFFF");
// /**
// * 套餐細項
// */
// @Transient
// private Modifier modifier;
public Long getId() { public Long getId() {
return id; return id;
...@@ -120,7 +81,7 @@ public class FoodCombo { ...@@ -120,7 +81,7 @@ public class FoodCombo {
return seqNo; return seqNo;
} }
public int getDiffAmt() { public double getDiffAmt() {
return diffAmt; return diffAmt;
} }
...@@ -184,7 +145,7 @@ public class FoodCombo { ...@@ -184,7 +145,7 @@ public class FoodCombo {
this.seqNo = seqNo; this.seqNo = seqNo;
} }
public void setDiffAmt(int diffAmt) { public void setDiffAmt(double diffAmt) {
this.diffAmt = diffAmt; this.diffAmt = diffAmt;
} }
......
database-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/FoodComboDao.java
...@@ -28,7 +28,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> { ...@@ -28,7 +28,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> {
public final static Property Fid = new Property(1, Long.class, "fid", false, "FID"); public final static Property Fid = new Property(1, Long.class, "fid", false, "FID");
public final static Property ComId = new Property(2, int.class, "comId", false, "COM_ID"); public final static Property ComId = new Property(2, int.class, "comId", false, "COM_ID");
public final static Property SeqNo = new Property(3, int.class, "seqNo", false, "SEQ_NO"); public final static Property SeqNo = new Property(3, int.class, "seqNo", false, "SEQ_NO");
public final static Property DiffAmt = new Property(4, int.class, "diffAmt", false, "DIFF_AMT"); public final static Property DiffAmt = new Property(4, double.class, "diffAmt", false, "DIFF_AMT");
public final static Property SelectQty = new Property(5, int.class, "selectQty", false, "SELECT_QTY"); public final static Property SelectQty = new Property(5, int.class, "selectQty", false, "SELECT_QTY");
public final static Property CreateTime = new Property(6, String.class, "createTime", false, "CREATE_TIME"); public final static Property CreateTime = new Property(6, String.class, "createTime", false, "CREATE_TIME");
public final static Property DefModifier = new Property(7, String.class, "defModifier", false, "DEF_MODIFIER"); public final static Property DefModifier = new Property(7, String.class, "defModifier", false, "DEF_MODIFIER");
...@@ -59,7 +59,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> { ...@@ -59,7 +59,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> {
"\"FID\" INTEGER," + // 1: fid "\"FID\" INTEGER," + // 1: fid
"\"COM_ID\" INTEGER NOT NULL ," + // 2: comId "\"COM_ID\" INTEGER NOT NULL ," + // 2: comId
"\"SEQ_NO\" INTEGER NOT NULL ," + // 3: seqNo "\"SEQ_NO\" INTEGER NOT NULL ," + // 3: seqNo
"\"DIFF_AMT\" INTEGER NOT NULL ," + // 4: diffAmt "\"DIFF_AMT\" REAL NOT NULL ," + // 4: diffAmt
"\"SELECT_QTY\" INTEGER NOT NULL ," + // 5: selectQty "\"SELECT_QTY\" INTEGER NOT NULL ," + // 5: selectQty
"\"CREATE_TIME\" TEXT," + // 6: createTime "\"CREATE_TIME\" TEXT," + // 6: createTime
"\"DEF_MODIFIER\" TEXT," + // 7: defModifier "\"DEF_MODIFIER\" TEXT," + // 7: defModifier
...@@ -94,7 +94,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> { ...@@ -94,7 +94,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> {
} }
stmt.bindLong(3, entity.getComId()); stmt.bindLong(3, entity.getComId());
stmt.bindLong(4, entity.getSeqNo()); stmt.bindLong(4, entity.getSeqNo());
stmt.bindLong(5, entity.getDiffAmt()); stmt.bindDouble(5, entity.getDiffAmt());
stmt.bindLong(6, entity.getSelectQty()); stmt.bindLong(6, entity.getSelectQty());
String createTime = entity.getCreateTime(); String createTime = entity.getCreateTime();
...@@ -139,7 +139,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> { ...@@ -139,7 +139,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> {
} }
stmt.bindLong(3, entity.getComId()); stmt.bindLong(3, entity.getComId());
stmt.bindLong(4, entity.getSeqNo()); stmt.bindLong(4, entity.getSeqNo());
stmt.bindLong(5, entity.getDiffAmt()); stmt.bindDouble(5, entity.getDiffAmt());
stmt.bindLong(6, entity.getSelectQty()); stmt.bindLong(6, entity.getSelectQty());
String createTime = entity.getCreateTime(); String createTime = entity.getCreateTime();
...@@ -181,7 +181,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> { ...@@ -181,7 +181,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> {
cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1), // fid cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1), // fid
cursor.getInt(offset + 2), // comId cursor.getInt(offset + 2), // comId
cursor.getInt(offset + 3), // seqNo cursor.getInt(offset + 3), // seqNo
cursor.getInt(offset + 4), // diffAmt cursor.getDouble(offset + 4), // diffAmt
cursor.getInt(offset + 5), // selectQty cursor.getInt(offset + 5), // selectQty
cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // createTime cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // createTime
cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // defModifier cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // defModifier
...@@ -203,7 +203,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> { ...@@ -203,7 +203,7 @@ public class FoodComboDao extends AbstractDao<FoodCombo, Void> {
entity.setFid(cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1)); entity.setFid(cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1));
entity.setComId(cursor.getInt(offset + 2)); entity.setComId(cursor.getInt(offset + 2));
entity.setSeqNo(cursor.getInt(offset + 3)); entity.setSeqNo(cursor.getInt(offset + 3));
entity.setDiffAmt(cursor.getInt(offset + 4)); entity.setDiffAmt(cursor.getDouble(offset + 4));
entity.setSelectQty(cursor.getInt(offset + 5)); entity.setSelectQty(cursor.getInt(offset + 5));
entity.setCreateTime(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6)); entity.setCreateTime(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
entity.setDefModifier(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7)); entity.setDefModifier(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
......
database-module/src/main/java/com/gingersoft/gsa/cloud/database/utils/ComboItemDaoUtils.java
...@@ -174,33 +174,33 @@ public class ComboItemDaoUtils { ...@@ -174,33 +174,33 @@ public class ComboItemDaoUtils {
} }
Cursor c = mManager.getDaoSession().getFoodDao().getDatabase().rawQuery(sql, null); Cursor c = mManager.getDaoSession().getFoodDao().getDatabase().rawQuery(sql, null);
while (c.moveToNext()) { while (c.moveToNext()) {
ComboItem order = new ComboItem(); ComboItem item = new ComboItem();
order.setFid(c.getLong(c.getColumnIndex("FID"))); item.setFid(c.getLong(c.getColumnIndex("FID")));
order.setComId(c.getLong(c.getColumnIndex("COM_ID"))); item.setComId(c.getLong(c.getColumnIndex("COM_ID")));
// order.setPrice(c.getDouble(c.getColumnIndex("PRICE"))); // item.setPrice(c.getDouble(c.getColumnIndex("PRICE")));
order.setPrice(c.getDouble(c.getColumnIndex("DIFF_AMT"))); item.setPrice(c.getDouble(c.getColumnIndex("DIFF_AMT")));
order.setSeqNo(c.getLong(c.getColumnIndex("SEQ_NO"))); item.setSeqNo(c.getLong(c.getColumnIndex("SEQ_NO")));
order.setQty(c.getLong(c.getColumnIndex("QTY"))); item.setQty(c.getLong(c.getColumnIndex("QTY")));
order.setName(c.getString(c.getColumnIndex("FOOD_NAME"))); item.setName(c.getString(c.getColumnIndex("FOOD_NAME")));
order.setName1(c.getString(c.getColumnIndex("FOOD_NAME1"))); item.setName1(c.getString(c.getColumnIndex("FOOD_NAME1")));
order.setName2(c.getString(c.getColumnIndex("FOOD_NAME2"))); item.setName2(c.getString(c.getColumnIndex("FOOD_NAME2")));
order.setVisible(c.getLong(c.getColumnIndex("VISIBLE"))); item.setVisible(c.getLong(c.getColumnIndex("VISIBLE")));
order.setAutoMode(c.getInt(c.getColumnIndex("AUTO_MOD"))); item.setAutoMode(c.getInt(c.getColumnIndex("AUTO_MOD")));
order.setSelectQty(c.getInt(c.getColumnIndex("SELECT_QTY"))); item.setSelectQty(c.getInt(c.getColumnIndex("SELECT_QTY")));
order.setFoodSummary(c.getString(c.getColumnIndex("FOOD_SUMMARY"))); item.setFoodSummary(c.getString(c.getColumnIndex("FOOD_SUMMARY")));
order.setInvisible(c.getLong(c.getColumnIndex("INVISIBLE"))); item.setInvisible(c.getLong(c.getColumnIndex("INVISIBLE")));
order.setPrintSeting(c.getString(c.getColumnIndex("PRINT_SETING"))); item.setPrintSeting(c.getString(c.getColumnIndex("PRINT_SETING")));
order.setAblediscount(c.getLong(c.getColumnIndex("ABLE_DISCOUNT"))); item.setAblediscount(c.getLong(c.getColumnIndex("ABLE_DISCOUNT")));
order.setPointsAdd(c.getDouble(c.getColumnIndex("POINTS_ADD"))); item.setPointsAdd(c.getDouble(c.getColumnIndex("POINTS_ADD")));
order.setPointsRatio(c.getLong(c.getColumnIndex("POINTS_RATIO"))); item.setPointsRatio(c.getLong(c.getColumnIndex("POINTS_RATIO")));
order.setPointsRedeem(c.getDouble(c.getColumnIndex("POINTS_REDEEM"))); item.setPointsRedeem(c.getDouble(c.getColumnIndex("POINTS_REDEEM")));
order.setServiceCharge(c.getInt(c.getColumnIndex("SERVICE_CHARGE"))); item.setServiceCharge(c.getInt(c.getColumnIndex("SERVICE_CHARGE")));
String defmodifier = c.getString(c.getColumnIndex("DEF_MODIFIER")); String defmodifier = c.getString(c.getColumnIndex("DEF_MODIFIER"));
if (!TextUtils.isEmpty(defmodifier) && !", ".equals(defmodifier)) { if (!TextUtils.isEmpty(defmodifier) && !", ".equals(defmodifier)) {
order.setDefmodifier(defmodifier); item.setDefmodifier(defmodifier);
} }
// if (order.isVisible()) { // if (item.isVisible()) {
comboItems.add(order); comboItems.add(item);
// } // }
} }
c.close(); c.close();
......
delivery_pick_module/src/main/debug/AndroidManifest.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/ServiceCreator.kt
package com.gingersoft.gsa.delivery_pick_mode.data.network package com.gingersoft.gsa.delivery_pick_mode.data.network
import android.util.Log import android.util.Log
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes import com.gingersoft.gsa.cloud.base.utils.encryption.Aes
import com.gingersoft.gsa.cloud.constans.AppConstans import com.gingersoft.gsa.cloud.constans.AppConstans
import com.gingersoft.gsa.cloud.constans.HttpsConstans import com.gingersoft.gsa.cloud.constans.HttpsConstans
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/HistoryOrderViewModel.kt
...@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData ...@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
import com.gingersoft.gsa.cloud.base.order.order.TakeawayOrder import com.gingersoft.gsa.cloud.base.order.order.TakeawayOrder
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt
...@@ -2,7 +2,6 @@ package com.gingersoft.gsa.delivery_pick_mode.model.viewModel ...@@ -2,7 +2,6 @@ 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
import android.util.Log
import android.view.Gravity import android.view.Gravity
import android.view.WindowManager import android.view.WindowManager
import android.widget.TextView import android.widget.TextView
...@@ -13,7 +12,7 @@ import androidx.lifecycle.viewModelScope ...@@ -13,7 +12,7 @@ import androidx.lifecycle.viewModelScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.app.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.order.bean.mealManger.MyOrderManage import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
import com.gingersoft.gsa.cloud.base.order.order.TakeawayOrder import com.gingersoft.gsa.cloud.base.order.order.TakeawayOrder
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/model/PrjQueryModel.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.model; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.delivery_pick_mode.mvp.bean.PrjQueryBean; import com.gingersoft.gsa.delivery_pick_mode.mvp.bean.PrjQueryBean;
import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.PrjQueryContract; import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.PrjQueryContract;
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/service/GetInfoUpdateService.kt
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
//import android.widget.RemoteViews //import android.widget.RemoteViews
//import androidx.annotation.RequiresApi //import androidx.annotation.RequiresApi
//import androidx.core.app.NotificationCompat //import androidx.core.app.NotificationCompat
//import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication //import com.gingersoft.gsa.cloud.app.GsaCloudApplication
//import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils //import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils
//import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil //import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil
//import com.gingersoft.gsa.cloud.constans.AppConstans //import com.gingersoft.gsa.cloud.constans.AppConstans
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
...@@ -21,7 +21,7 @@ import androidx.lifecycle.Observer ...@@ -21,7 +21,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.order.order.BaseOrder import com.gingersoft.gsa.cloud.base.order.order.BaseOrder
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils import com.gingersoft.gsa.cloud.base.utils.other.SPUtils
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
...@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager ...@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.Skeleton
import com.ethanhua.skeleton.ViewSkeletonScreen import com.ethanhua.skeleton.ViewSkeletonScreen
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.app.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.cloud.base.widget.DialogUtils import com.gingersoft.gsa.cloud.base.widget.DialogUtils
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/PayActivity.kt
...@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat ...@@ -7,7 +7,7 @@ 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.app.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.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/DeliveryFragment.kt
...@@ -8,7 +8,7 @@ import android.widget.Button ...@@ -8,7 +8,7 @@ import android.widget.Button
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.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.ui.utils.AppDialog import com.gingersoft.gsa.cloud.ui.utils.AppDialog
import com.gingersoft.gsa.delivery_pick_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.DeliveryViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.DeliveryViewModel
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/PlaceholderFragment.kt
...@@ -7,7 +7,7 @@ import androidx.lifecycle.MutableLiveData ...@@ -7,7 +7,7 @@ import androidx.lifecycle.MutableLiveData
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.app.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.delivery_pick_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/UpdateDeliveryFragment.kt
...@@ -6,7 +6,7 @@ import android.view.View ...@@ -6,7 +6,7 @@ import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager 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.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.delivery_pick_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
......
download-module/src/main/debug/AndroidManifest.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
package="com.gingersoft.gsa.cloud.download"> package="com.gingersoft.gsa.cloud.download">
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/download_data_app_name" android:label="@string/download_data_app_name"
......
download-module/src/main/java/com/gingersoft/gsa/cloud/download/ComponentDownload.java
package com.gingersoft.gsa.cloud.download; package com.gingersoft.gsa.cloud.download;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCResult; 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.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.constans.ResultConstans;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.download.mvp.ui.activity.DownloadActivity; import com.gingersoft.gsa.cloud.download.mvp.ui.activity.DownloadActivity;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
......
download-module/src/main/java/com/gingersoft/gsa/cloud/download/mvp/presenter/DownloadPresenter.java
...@@ -4,7 +4,7 @@ import android.app.Application; ...@@ -4,7 +4,7 @@ import android.app.Application;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.Api; import com.gingersoft.gsa.cloud.base.Api;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.FoodBean; import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;
import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration; import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration;
......
gradle.properties
...@@ -28,3 +28,17 @@ POM_GIT_URL=https://github.com/Tencent/QMUI_Android/ ...@@ -28,3 +28,17 @@ POM_GIT_URL=https://github.com/Tencent/QMUI_Android/
POM_SITE_URL=https://qmuiteam.com/android POM_SITE_URL=https://qmuiteam.com/android
BUILD_TYPE = release BUILD_TYPE = release
#dokit全局配置
# 插件开关
DOKIT_PLUGIN_SWITCH=true
# 插件日志
DOKIT_LOG_SWITCH=true
# webview 的全限定名
DOKIT_WEBVIEW_CLASS_NAME=com/didichuxing/doraemonkit/widget/webview/MyWebView
#dokit 慢函数开关
DOKIT_METHOD_SWITCH=true
#dokit 函数调用栈层级
DOKIT_METHOD_STACK_LEVEL=4
#0:调用栈模式 打印函数调用栈 需添加指定入口 默认为application onCreate 和attachBaseContext
#1:普通模式 运行时打印某个函数的耗时 全局业务代码函数插入
DOKIT_METHOD_STRATEGY=0
login-module/build.gradle
ext.mainApp = true //设置为true，表示此module为主app module，一直以application方式编译 ext.mainApp = true //设置为true，表示此module为主app module，一直以application方式编译
apply from: rootProject.file("cc-settings.gradle") apply from: rootProject.file("cc-settings.gradle")
apply plugin: 'com.jakewharton.butterknife' apply plugin: 'com.jakewharton.butterknife'
apply plugin: 'com.didi.dokit'
android { android {
signingConfigs { signingConfigs {
GSAndroidNew { GSAndroidNew {
...@@ -75,6 +77,42 @@ android { ...@@ -75,6 +77,42 @@ android {
} }
} }
//dokit 扩展
dokitExt {
//通用设置
comm {
//地图经纬度开关
gpsSwitch true
//网络开关
networkSwitch true
//大图开关
bigImgSwitch true
//webView js 抓包
webViewSwitch true
}
slowMethod {
//调用栈模式配置
stackMethod {
//默认值为 5ms 小于该值的函数在调用栈中不显示
thresholdTime 5
//调用栈函数入口
enterMethods = ["com.didichuxing.doraemondemo.MainDebugActivity.test1"]
//黑名单 粒度最小到类 暂不支持到方法
methodBlacklist = ["com.facebook.drawee.backends.pipeline.Fresco"]
}
//普通模式配置
normalMethod {
//默认值为 500ms 小于该值的函数在运行时不会在控制台中被打印
thresholdTime 100
//需要针对函数插装的包名
packageNames = ["com.didichuxing.doraemondemo"]
//不需要针对函数插装的包名和类名
methodBlacklist = ["com.didichuxing.doraemondemo.dokit"]
}
}
}
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
......
login-module/src/main/AndroidManifest.xml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/user_login_name" android:label="@string/user_login_name"
......
login-module/src/main/debug/AndroidManifest.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
package="com.gingersoft.gsa.cloud.login"> package="com.gingersoft.gsa.cloud.login">
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher"
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/LoginInterfaceImpl.java
...@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.RestaurantInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java
...@@ -4,7 +4,7 @@ import android.app.Activity; ...@@ -4,7 +4,7 @@ import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.content.Intent; import android.content.Intent;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
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.okhttpUtils.OkHttp3Utils; import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/ChooseRestaurantActivity.java
...@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.RestaurantInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/SwitchServerActivity.java
...@@ -10,7 +10,7 @@ import android.widget.TextView; ...@@ -10,7 +10,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/WelcomeActivity.java
...@@ -17,7 +17,7 @@ import androidx.annotation.Nullable; ...@@ -17,7 +17,7 @@ import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.viewpager2.widget.ViewPager2; import androidx.viewpager2.widget.ViewPager2;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.constans.UserConstans; import com.gingersoft.gsa.cloud.constans.UserConstans;
......
main-module/src/main/debug/AndroidManifest.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/ExpandListPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
...@@ -6,7 +6,7 @@ import android.net.Uri; ...@@ -6,7 +6,7 @@ import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract; import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.CheckVersionRequest; import com.gingersoft.gsa.cloud.main.mvp.model.bean.CheckVersionRequest;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/QrCodePresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.main.mvp.contract.QrCodeContract; import com.gingersoft.gsa.cloud.main.mvp.contract.QrCodeContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.RestaurantQrBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.RestaurantQrBean;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementContract; import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReport; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReport;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java
...@@ -4,7 +4,7 @@ import android.app.Activity; ...@@ -4,7 +4,7 @@ import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementReportContract; import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementReportContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SendSettlement; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SendSettlement;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LanguageActivity.java
...@@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat; ...@@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.listener.OnItemClickListener; import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.LanguageUtils; import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LookLogActivity.kt
...@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat ...@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
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.application.GsaCloudApplication import com.gingersoft.gsa.cloud.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.FileUtils import com.gingersoft.gsa.cloud.base.utils.FileUtils
import com.gingersoft.gsa.cloud.main.R import com.gingersoft.gsa.cloud.main.R
import kotlinx.android.synthetic.main.activity_look_log.* import kotlinx.android.synthetic.main.activity_look_log.*
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -23,7 +23,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -23,7 +23,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.RestaurantInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
...@@ -20,7 +20,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator; ...@@ -20,7 +20,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.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.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.LanguageUtils; import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/BusinessReportFragment.java
...@@ -14,11 +14,10 @@ import androidx.annotation.Nullable; ...@@ -14,11 +14,10 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.PrintTransitUtils; import com.gingersoft.gsa.cloud.base.utils.PrintTransitUtils;
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.constans.PrintConstans; import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/HomeFragment.java
...@@ -10,9 +10,8 @@ import android.widget.ImageView; ...@@ -10,9 +10,8 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
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.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.di.component.DaggerHomeComponent; import com.gingersoft.gsa.cloud.main.di.component.DaggerHomeComponent;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
...@@ -13,7 +13,7 @@ import android.widget.TextView; ...@@ -13,7 +13,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; 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.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/PaymentMethodReportFragment.java
...@@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment; ...@@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
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.main.R; import com.gingersoft.gsa.cloud.main.R;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/SalesFragment.java
...@@ -16,11 +16,10 @@ import androidx.fragment.app.Fragment; ...@@ -16,11 +16,10 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager; 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.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
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.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.di.component.DaggerSalesComponent; import com.gingersoft.gsa.cloud.main.di.component.DaggerSalesComponent;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/DailyBusinessView.java
...@@ -4,7 +4,6 @@ import android.content.Context; ...@@ -4,7 +4,6 @@ import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
...@@ -13,12 +12,11 @@ import androidx.core.content.ContextCompat; ...@@ -13,12 +12,11 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.widget.BaseReloadView; import com.gingersoft.gsa.cloud.base.widget.BaseReloadView;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.BusinessBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.BusinessBean;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.BusinessInfoAdapter; import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.BusinessInfoAdapter;
import com.gingersoft.gsa.cloud.ui.view.ReloadView;
import java.util.List; import java.util.List;
......
manager-module/src/main/debug/AndroidManifest.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
package="com.gingersoft.gsa.cloud.manager"> package="com.gingersoft.gsa.cloud.manager">
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/manager_app_name" android:label="@string/manager_app_name"
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/TableManageModel.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.manager.mvp.model; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.manager.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.manager.mvp.model.service.TableManageService; import com.gingersoft.gsa.cloud.manager.mvp.model.service.TableManageService;
import com.google.gson.Gson; import com.google.gson.Gson;
...@@ -14,12 +14,9 @@ import com.jess.arms.di.scope.ActivityScope; ...@@ -14,12 +14,9 @@ import com.jess.arms.di.scope.ActivityScope;
import javax.inject.Inject; import javax.inject.Inject;
import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract; import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
import com.jess.arms.utils.ArmsUtils;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.functions.Function; import io.reactivex.functions.Function;
import okhttp3.FormBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableManagePresenter.java
...@@ -4,7 +4,7 @@ import android.app.Application; ...@@ -4,7 +4,7 @@ import android.app.Application;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea; import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddAreaFragment.java
...@@ -10,7 +10,7 @@ import android.widget.Button; ...@@ -10,7 +10,7 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.PopupWindow; import android.widget.PopupWindow;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea; import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
...@@ -14,7 +14,7 @@ import android.widget.Button; ...@@ -14,7 +14,7 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AreaListFragment.java
...@@ -13,7 +13,7 @@ import android.widget.CompoundButton; ...@@ -13,7 +13,7 @@ import android.widget.CompoundButton;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea; import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
......
order-advance-module/src/main/debug/AndroidManifest.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.app.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:label="@string/app_name" android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_android"> android:networkSecurityConfig="@xml/network_android">
......
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderBean.java
...@@ -147,7 +147,9 @@ public class OrderBean { ...@@ -147,7 +147,9 @@ public class OrderBean {
private Long id; private Long id;
private String productName; private String productName;
private long productId; private long productId;
//單價 /**
* 單價
*/
private double price; private double price;
private double lunchboxPrice; private double lunchboxPrice;
private int number; private int number;
...@@ -173,12 +175,12 @@ public class OrderBean { ...@@ -173,12 +175,12 @@ public class OrderBean {
private Long discountId; private Long discountId;
/**折扣實體*/ /**折扣實體*/
private RestaurantDiscountVO restaurantDiscountVO; private RestaurantDiscountVO restaurantDiscountVO;
/** /**
* 是否参与折扣#0:不參與;1:參與; * 是否参与服務費#0:不參與;1:參與;
**/ **/
private byte scAble = 1; private byte scAble = 1;
/** /**
* 額外食品加分 * 額外食品加分
*/ */
...@@ -341,10 +343,6 @@ public class OrderBean { ...@@ -341,10 +343,6 @@ public class OrderBean {
return restaurantDiscountVO; return restaurantDiscountVO;
} }
public void setRestaurantDiscountVO(RestaurantDiscountVO restaurantDiscountVO) {
this.restaurantDiscountVO = restaurantDiscountVO;
}
public byte getScAble() { public byte getScAble() {
return scAble; return scAble;
} }
......
ss 0 → 100644
This diff is collapsed. Click to expand it.
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