Skip to content

S
supplier
Commit e8c65531 by 王宇航
Options

首頁側滑登出、廚房單打印

parent b5fb8a06
Showing with 1152 additions and 246 deletions
arms/src/main/java/com/jess/arms/base/DefaultAdapter.java
...@@ -56,7 +56,7 @@ public abstract class DefaultAdapter<T> extends RecyclerView.Adapter<BaseHolder< ...@@ -56,7 +56,7 @@ public abstract class DefaultAdapter<T> extends RecyclerView.Adapter<BaseHolder<
mHolder.setOnItemClickListener(new BaseHolder.OnViewClickListener() {//设置Item点击事件 mHolder.setOnItemClickListener(new BaseHolder.OnViewClickListener() {//设置Item点击事件
@Override @Override
public void onViewClick(View view, int position) { public void onViewClick(View view, int position) {
if (mOnItemClickListener != null && mInfos.size() > 0) { if (mOnItemClickListener != null && mInfos != null && mInfos.size() > 0) {
mOnItemClickListener.onItemClick(view, viewType, mInfos.get(position), position); mOnItemClickListener.onItemClick(view, viewType, mInfos.get(position), position);
} }
} }
......
cc/src/main/java/com/billy/cc/core/component/CCUtil.java
...@@ -39,12 +39,13 @@ public class CCUtil { ...@@ -39,12 +39,13 @@ public class CCUtil {
/** /**
* 将一个json对象解析为map对象 * 将一个json对象解析为map对象
*
* @param json json对象 * @param json json对象
* @return map对象 * @return map对象
*/ */
public static Map<String, Object> convertToMap(JSONObject json) { public static Map<String, Object> convertToMap(JSONObject json) {
Map<String, Object> params = null; Map<String, Object> params = null;
try{ try {
if (json != null) { if (json != null) {
params = new HashMap<>(json.length()); params = new HashMap<>(json.length());
Iterator<String> keys = json.keys(); Iterator<String> keys = json.keys();
...@@ -56,12 +57,12 @@ public class CCUtil { ...@@ -56,12 +57,12 @@ public class CCUtil {
value = null; value = null;
} }
params.put(key, value); params.put(key, value);
} catch(Exception e) { } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
} }
} }
} }
} catch(Exception e) { } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
} }
return params; return params;
...@@ -80,43 +81,43 @@ public class CCUtil { ...@@ -80,43 +81,43 @@ public class CCUtil {
} else if (v instanceof SparseArray) { } else if (v instanceof SparseArray) {
Map<Integer, Object> map = new HashMap<>(); Map<Integer, Object> map = new HashMap<>();
SparseArray sp = (SparseArray) v; SparseArray sp = (SparseArray) v;
for(int i = 0; i < sp.size(); i++) { for (int i = 0; i < sp.size(); i++) {
map.put(sp.keyAt(i), sp.valueAt(i)); map.put(sp.keyAt(i), sp.valueAt(i));
} }
return convertToJson(map); return convertToJson(map);
} else if (v instanceof SparseIntArray) { } else if (v instanceof SparseIntArray) {
Map<Integer, Integer> map = new HashMap<>(); Map<Integer, Integer> map = new HashMap<>();
SparseIntArray sp = (SparseIntArray) v; SparseIntArray sp = (SparseIntArray) v;
for(int i = 0; i < sp.size(); i++) { for (int i = 0; i < sp.size(); i++) {
map.put(sp.keyAt(i), sp.valueAt(i)); map.put(sp.keyAt(i), sp.valueAt(i));
} }
return convertToJson(map); return convertToJson(map);
} else if (v instanceof SparseBooleanArray) { } else if (v instanceof SparseBooleanArray) {
Map<Integer, Boolean> map = new HashMap<>(); Map<Integer, Boolean> map = new HashMap<>();
SparseBooleanArray sp = (SparseBooleanArray) v; SparseBooleanArray sp = (SparseBooleanArray) v;
for(int i = 0; i < sp.size(); i++) { for (int i = 0; i < sp.size(); i++) {
map.put(sp.keyAt(i), sp.valueAt(i)); map.put(sp.keyAt(i), sp.valueAt(i));
} }
return convertToJson(map); return convertToJson(map);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 && v instanceof SparseLongArray) { } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 && v instanceof SparseLongArray) {
Map<Integer, Long> map = new HashMap<>(); Map<Integer, Long> map = new HashMap<>();
SparseLongArray sp = (SparseLongArray) v; SparseLongArray sp = (SparseLongArray) v;
for(int i = 0; i < sp.size(); i++) { for (int i = 0; i < sp.size(); i++) {
map.put(sp.keyAt(i), sp.valueAt(i)); map.put(sp.keyAt(i), sp.valueAt(i));
} }
return convertToJson(map); return convertToJson(map);
} else if ( v instanceof String || v instanceof Integer } else if (v instanceof String || v instanceof Integer
|| v instanceof Long || v instanceof Float || v instanceof Long || v instanceof Float
|| v instanceof Double || v instanceof Boolean || v instanceof Double || v instanceof Boolean
|| v instanceof Short || v instanceof Byte || v instanceof Short || v instanceof Byte
|| v instanceof CharSequence || v instanceof Character || v instanceof CharSequence || v instanceof Character
) { ) {
return v; return v;
} else { } else {
try { try {
jsonString = RemoteParamUtil.convertObject2JsonString(v); jsonString = RemoteParamUtil.convertObject2JsonString(v);
} catch(Exception e) { } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
jsonString = null; jsonString = null;
} }
...@@ -143,12 +144,13 @@ public class CCUtil { ...@@ -143,12 +144,13 @@ public class CCUtil {
* 将一个map对象转换成json对象 * 将一个map对象转换成json对象
* 1. 用于日志输出 * 1. 用于日志输出
* 2. 用于需要将CC或CCResult转成json进行传递的场景（如：JsBridge传值） * 2. 用于需要将CC或CCResult转成json进行传递的场景（如：JsBridge传值）
*
* @param map map对象 * @param map map对象
* @return json对象 * @return json对象
*/ */
public static JSONObject convertToJson(Map<?, ?> map) { public static JSONObject convertToJson(Map<?, ?> map) {
if (map != null) { if (map != null) {
try{ try {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
for (Map.Entry<?, ?> entry : map.entrySet()) { for (Map.Entry<?, ?> entry : map.entrySet()) {
Object value = entry.getValue(); Object value = entry.getValue();
...@@ -163,7 +165,7 @@ public class CCUtil { ...@@ -163,7 +165,7 @@ public class CCUtil {
} }
} }
return json; return json;
} catch(Exception e) { } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
} }
} }
...@@ -172,10 +174,11 @@ public class CCUtil { ...@@ -172,10 +174,11 @@ public class CCUtil {
private static Boolean isRunningMainProcess = null; private static Boolean isRunningMainProcess = null;
private static String curProcessName = null; private static String curProcessName = null;
/** /**
* 进程是否以包名在运行（当前进程是否为主进程） * 进程是否以包名在运行（当前进程是否为主进程）
*/ */
public static boolean isMainProcess(){ public static boolean isMainProcess() {
if (isRunningMainProcess == null) { if (isRunningMainProcess == null) {
Application application = CC.getApplication(); Application application = CC.getApplication();
if (application == null) { if (application == null) {
...@@ -188,6 +191,7 @@ public class CCUtil { ...@@ -188,6 +191,7 @@ public class CCUtil {
/** /**
* 获取当前进程的名称 * 获取当前进程的名称
*
* @return 进程名 * @return 进程名
*/ */
public static String getCurProcessName() { public static String getCurProcessName() {
...@@ -209,7 +213,7 @@ public class CCUtil { ...@@ -209,7 +213,7 @@ public class CCUtil {
} }
} }
} }
} catch (Exception e){ } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
} }
return PROCESS_UNKNOWN; return PROCESS_UNKNOWN;
...@@ -230,7 +234,7 @@ public class CCUtil { ...@@ -230,7 +234,7 @@ public class CCUtil {
} }
} }
} }
} catch (Exception e){ } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
} }
return null; return null;
...@@ -238,6 +242,7 @@ public class CCUtil { ...@@ -238,6 +242,7 @@ public class CCUtil {
/** /**
* 反射获取application对象 * 反射获取application对象
*
* @return application * @return application
*/ */
static Application initApplication() { static Application initApplication() {
...@@ -247,7 +252,7 @@ public class CCUtil { ...@@ -247,7 +252,7 @@ public class CCUtil {
if (app != null) { if (app != null) {
return app; return app;
} }
} catch(Exception e) { } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
} }
try { try {
...@@ -265,7 +270,7 @@ public class CCUtil { ...@@ -265,7 +270,7 @@ public class CCUtil {
public static void put(JSONObject json, String key, Object value) { public static void put(JSONObject json, String key, Object value) {
try { try {
json.put(key, value); json.put(key, value);
} catch(Exception e) { } catch (Exception e) {
CCUtil.printStackTrace(e); CCUtil.printStackTrace(e);
} }
} }
...@@ -278,10 +283,11 @@ public class CCUtil { ...@@ -278,10 +283,11 @@ public class CCUtil {
* 跳转到指定的activity， * 跳转到指定的activity，
* 并将CC的参数通过extra传递给该activity， * 并将CC的参数通过extra传递给该activity，
* 可通过以下方式获取指定参数：<br> * 可通过以下方式获取指定参数：<br>
* 1. {@link CCUtil#getNavigateParam(Bundle, String, Object)}<br> * 1. {@link CCUtil#getNavigateParam(Bundle, String, Object)}<br>
* 2. {@link CCUtil#getNavigateParam(Activity, String, Object)}<br> * 2. {@link CCUtil#getNavigateParam(Activity, String, Object)}<br>
* 可通过 {@link #getNavigateCallId(Activity)} 获取调起该页面的CC.callId * 可通过 {@link #getNavigateCallId(Activity)} 获取调起该页面的CC.callId
* @param cc 当前CC调用 *
* @param cc 当前CC调用
* @param activityClass 要跳转到的activity * @param activityClass 要跳转到的activity
*/ */
public static void navigateTo(CC cc, Class<? extends Activity> activityClass) { public static void navigateTo(CC cc, Class<? extends Activity> activityClass) {
...@@ -293,9 +299,30 @@ public class CCUtil { ...@@ -293,9 +299,30 @@ public class CCUtil {
} }
/** /**
* 跳转到指定的activity，
* 并将CC的参数通过extra传递给该activity，
* 可通过以下方式获取指定参数：<br>
* 1. {@link CCUtil#getNavigateParam(Bundle, String, Object)}<br>
* 2. {@link CCUtil#getNavigateParam(Activity, String, Object)}<br>
* 可通过 {@link #getNavigateCallId(Activity)} 获取调起该页面的CC.callId
*
* @param cc 当前CC调用
* @param activityClass 要跳转到的activity
*/
public static void navigateClearTopTo(CC cc, Class<? extends Activity> activityClass) {
Intent intent = createNavigateIntent(cc, activityClass);
RemoteCC remoteCC = new RemoteCC(cc);
intent.putExtra(EXTRA_KEY_REMOTE_CC, remoteCC);
intent.putExtra(EXTRA_KEY_CALL_ID, cc.getCallId());
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
cc.getContext().startActivity(intent);
}
/**
* 为activity跳转创建一个intent，如果调用方没设置context * 为activity跳转创建一个intent，如果调用方没设置context
* 使用application来startActivity时自动添加{@link Intent#FLAG_ACTIVITY_NEW_TASK} * 使用application来startActivity时自动添加{@link Intent#FLAG_ACTIVITY_NEW_TASK}
* @param cc CC对象 *
* @param cc CC对象
* @param activityClass 要跳转的activity * @param activityClass 要跳转的activity
* @return intent * @return intent
*/ */
...@@ -311,10 +338,11 @@ public class CCUtil { ...@@ -311,10 +338,11 @@ public class CCUtil {
/** /**
* 在组件类中通过{@link #navigateTo(CC, Class)}跳转页面后，可通过此方法快捷获取CC的参数 * 在组件类中通过{@link #navigateTo(CC, Class)}跳转页面后，可通过此方法快捷获取CC的参数
* @param activity activity *
* @param key key * @param activity activity
* @param key key
* @param defaultValue 默认值 * @param defaultValue 默认值
* @param <T> 返回值的类型，可根据接收值及defaultValue的类型来自动确定 * @param <T> 返回值的类型，可根据接收值及defaultValue的类型来自动确定
* @return CC中携带的参数（若参数列表中不包含该参数，则返回默认值defaultValue） * @return CC中携带的参数（若参数列表中不包含该参数，则返回默认值defaultValue）
*/ */
public static <T> T getNavigateParam(@NonNull Activity activity, String key, T defaultValue) { public static <T> T getNavigateParam(@NonNull Activity activity, String key, T defaultValue) {
...@@ -335,12 +363,14 @@ public class CCUtil { ...@@ -335,12 +363,14 @@ public class CCUtil {
} }
return null; return null;
} }
/** /**
* 在组件类中通过{@link #navigateTo(CC, Class)}跳转页面后，可通过此方法快捷获取CC的参数 * 在组件类中通过{@link #navigateTo(CC, Class)}跳转页面后，可通过此方法快捷获取CC的参数
* @param bundle bundle参数 *
* @param key 需要取值的key * @param bundle bundle参数
* @param key 需要取值的key
* @param defaultValue 默认值 * @param defaultValue 默认值
* @param <T> 返回值的类型，可根据接收值及defaultValue的类型来自动确定 * @param <T> 返回值的类型，可根据接收值及defaultValue的类型来自动确定
* @return CC中携带的参数（若参数列表中不包含该参数，则返回默认值defaultValue） * @return CC中携带的参数（若参数列表中不包含该参数，则返回默认值defaultValue）
*/ */
public static <T> T getNavigateParam(Bundle bundle, String key, T defaultValue) { public static <T> T getNavigateParam(Bundle bundle, String key, T defaultValue) {
......
download-data/src/main/debug/AndroidManifest.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<!-- arms配置 --> <!-- arms配置 -->
<meta-data <meta-data
android:name="network.config.GlobalConfiguration" android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" /> android:value="ConfigModule" />
<meta-data <meta-data
......
download-data/src/main/java/com/gingersoft/gsa/cloud/download/mvp/presenter/DownloadPresenter.java
...@@ -4,6 +4,7 @@ import android.app.Application; ...@@ -4,6 +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.common.bean.FoodBean; import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.database.bean.Combo; import com.gingersoft.gsa.cloud.database.bean.Combo;
import com.gingersoft.gsa.cloud.database.bean.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.FoodModifier; import com.gingersoft.gsa.cloud.database.bean.FoodModifier;
...@@ -261,12 +262,11 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -261,12 +262,11 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
private void endDownReturn() { private void endDownReturn() {
mRootView.showMessage("跳轉到首頁");
CC.obtainBuilder("Component.Main") CC.obtainBuilder("Component.Main")
.setActionName("showMainActivity") .setActionName("showMainActivity")
.build() .build()
.call(); .call();
mRootView.killMyself(); mRootView.killMyself();
} }
......
main/build.gradle
...@@ -44,16 +44,17 @@ android { ...@@ -44,16 +44,17 @@ android {
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(include: ['*.jar'], dir: 'libs')
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"] annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
debugImplementation rootProject.ext.dependencies["canary-debug"] debugImplementation rootProject.ext.dependencies["canary-debug"]
releaseImplementation rootProject.ext.dependencies["canary-release"] releaseImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["canary-release"] testImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["junit"] testImplementation rootProject.ext.dependencies["junit"]
implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"] implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"]
implementation 'com.github.Liberuman:ShadowDrawable:0.1'//陰影背景 implementation 'com.github.Liberuman:ShadowDrawable:0.1'
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'//報表圖 //陰影背景
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
//報表圖
implementation project(':chart') implementation project(':chart')
implementation files('libs/nineoldandroids-2.4.0.jar')
} }
main/src/main/debug/AndroidManifest.xml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</activity> </activity>
<meta-data <meta-data
android:name="network.config.GlobalConfiguration" android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
android:value="ConfigModule" /> android:value="ConfigModule" />
<meta-data <meta-data
android:name="design_width_in_dp" android:name="design_width_in_dp"
......
main/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java
...@@ -72,7 +72,7 @@ public class ComponentMain implements IComponent { ...@@ -72,7 +72,7 @@ public class ComponentMain implements IComponent {
} }
private void openActivity(CC cc) { private void openActivity(CC cc) {
CCUtil.navigateTo(cc, NewMainActivity.class); CCUtil.navigateClearTopTo(cc, NewMainActivity.class);
CC.sendCCResult(cc.getCallId(), CCResult.success()); CC.sendCCResult(cc.getCallId(), CCResult.success());
} }
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/contract/NewMainContract.java
...@@ -3,6 +3,9 @@ package com.gingersoft.gsa.cloud.main.mvp.contract; ...@@ -3,6 +3,9 @@ package com.gingersoft.gsa.cloud.main.mvp.contract;
import com.jess.arms.mvp.IView; import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
import io.reactivex.Observable;
import okhttp3.RequestBody;
/** /**
* ================================================ * ================================================
...@@ -19,11 +22,11 @@ import com.jess.arms.mvp.IModel; ...@@ -19,11 +22,11 @@ import com.jess.arms.mvp.IModel;
public interface NewMainContract { public interface NewMainContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息 //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView { interface View extends IView {
void loginOut();
} }
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存 //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel { interface Model extends IModel {
Observable<Object> loginOut(RequestBody requestBody);
} }
} }
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/NewMainModel.java
...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.main.mvp.model; ...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.main.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.main.mvp.model.service.MainService;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.MainActivity;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jess.arms.integration.IRepositoryManager; import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel; import com.jess.arms.mvp.BaseModel;
...@@ -12,6 +14,9 @@ import javax.inject.Inject; ...@@ -12,6 +14,9 @@ import javax.inject.Inject;
import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract; import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract;
import io.reactivex.Observable;
import okhttp3.RequestBody;
/** /**
* ================================================ * ================================================
...@@ -43,4 +48,10 @@ public class NewMainModel extends BaseModel implements NewMainContract.Model { ...@@ -43,4 +48,10 @@ public class NewMainModel extends BaseModel implements NewMainContract.Model {
this.mGson = null; this.mGson = null;
this.mApplication = null; this.mApplication = null;
} }
@Override
public Observable<Object> loginOut(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(MainService.class)
.loginOut(requestBody);
}
} }
\ No newline at end of file
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/HomeTurnoverBean.java
...@@ -45,19 +45,23 @@ public class HomeTurnoverBean { ...@@ -45,19 +45,23 @@ public class HomeTurnoverBean {
public static class DataBean { public static class DataBean {
/** /**
* Business_amount : 2734.00 * Business_amount : 2734.00 營業總金額
* Bill_decimal : 0.00 * Bill_decimal : 0.00
* discount : -23.00 * discount : -23.00 折扣
* TipsAmount : 0.00 * TipsAmount : 0.00
* CreditCardAmount : 0.00 * CreditCardAmount : 0.00
* people : 62.00 * people : 62.00 消費人數 營業總金額除以賬單數量=平均值
* sales : 2685.00 * sales : 2685.00 項目總金額
* number_bill : 31.00 * number_bill : 31.00 賬單數量 營業總金額除以賬單數量=平均值
* billNum_skyOder : 1.00 * billNum_skyOder : 1.00
* billPrice_table : 2623.00 * billPrice_table : 2623.00
* billPrice_skyOder : 111.00 * billPrice_skyOder : 111.00
* billNum_table : 30.00 * billNum_table : 30.00
* servicecharge : 72.00 * billNum_Takeout
* CreditCardNum
* billPrice_Takeout
* TipsNum
* servicecharge : 72.00 服務費
*/ */
private String Business_amount; //營業總金額 private String Business_amount; //營業總金額
private String Bill_decimal; private String Bill_decimal;
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/service/MainService.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.model.service;
import io.reactivex.Observable;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.POST;
/**
* Created by Wyh on 2020/2/22.
*/
public interface MainService {
@POST("gsa/logout" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<Object> loginOut(@Body RequestBody requestBody);
}
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
package com.gingersoft.gsa.cloud.main.mvp.presenter; package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import android.content.Intent;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import okhttp3.FormBody;
import okhttp3.Request;
import okhttp3.RequestBody;
import javax.inject.Inject; import javax.inject.Inject;
import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract; import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract;
import com.jess.arms.utils.RxLifecycleUtils;
/** /**
...@@ -50,4 +61,24 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa ...@@ -50,4 +61,24 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
this.mImageLoader = null; this.mImageLoader = null;
this.mApplication = null; this.mApplication = null;
} }
public void loginOut(){
RequestBody requestBody = new FormBody.Builder()
.build();
mModel.loginOut(requestBody)
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(""))
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<Object>(mErrorHandler) {
@Override
public void onNext(@NonNull Object info) {
mRootView.loginOut();
}
});
}
} }
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -3,35 +3,34 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.activity; ...@@ -3,35 +3,34 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.widget.LinearLayout;
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.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.di.component.DaggerNewMainComponent; import com.gingersoft.gsa.cloud.main.di.component.DaggerNewMainComponent;
import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SectionItem; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SectionItem;
import com.gingersoft.gsa.cloud.main.mvp.presenter.NewMainPresenter;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.MainOrderingAdapter; import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.MainOrderingAdapter;
import com.gingersoft.gsa.cloud.main.mvp.ui.view.SlidingMenu;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.gingersoft.gsa.cloud.main.mvp.contract.NewMainContract;
import com.gingersoft.gsa.cloud.main.mvp.presenter.NewMainPresenter;
import com.gingersoft.gsa.cloud.main.R;
import com.qmuiteam.qmui.widget.section.QMUISection;
import com.sxu.shadowdrawable.ShadowDrawable; import com.sxu.shadowdrawable.ShadowDrawable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx; import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx;
...@@ -49,7 +48,7 @@ import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx; ...@@ -49,7 +48,7 @@ import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a> * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================ * ================================================
*/ */
public class NewMainActivity extends BaseActivity<NewMainPresenter> implements NewMainContract.View { public class NewMainActivity extends BaseActivity<NewMainPresenter> implements NewMainContract.View, View.OnClickListener {
@BindView(R2.id.rv_ordering_meals) @BindView(R2.id.rv_ordering_meals)
RecyclerView rvOrdering;//點餐 RecyclerView rvOrdering;//點餐
@BindView(R2.id.rv_management) @BindView(R2.id.rv_management)
...@@ -57,6 +56,15 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -57,6 +56,15 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
@BindView(R2.id.rv_staff_management) @BindView(R2.id.rv_staff_management)
RecyclerView rvStaffManagement;//管理 RecyclerView rvStaffManagement;//管理
// @BindView(R2.id.drawer_layout)
// DrawerLayout drawerLayout;
@BindView(R2.id.slideMenu)
SlidingMenu slideMenu;
@BindView(R2.id.layout_ordering_meals)
LinearLayout orderingMeals;
@BindView(R2.id.layout_management)
LinearLayout layoutManagement;
@Override @Override
public void setupActivityComponent(@NonNull AppComponent appComponent) { public void setupActivityComponent(@NonNull AppComponent appComponent) {
...@@ -75,11 +83,12 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -75,11 +83,12 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
ShadowDrawable.setShadowDrawable(findViewById(R.id.layout_ordering_meals), Color.parseColor("#FFFFFF"), dpToPx(5), initDrawerLayout();
ShadowDrawable.setShadowDrawable(orderingMeals, Color.parseColor("#FFFFFF"), dpToPx(5),
Color.parseColor("#73888888"), dpToPx(5), 0, 2); Color.parseColor("#73888888"), dpToPx(5), 0, 2);
ShadowDrawable.setShadowDrawable(findViewById(R.id.layout_management), Color.parseColor("#FFFFFF"), dpToPx(5), ShadowDrawable.setShadowDrawable(layoutManagement, Color.parseColor("#FFFFFF"), dpToPx(5),
Color.parseColor("#00000000"), dpToPx(5), 0, 2); Color.parseColor("#00000000"), dpToPx(5), 0, 2);
List<SectionItem> data = new ArrayList<>(); List<SectionItem> data = new ArrayList<>();
data.add(new SectionItem(R.drawable.ic_dining_table_mode, "餐檯模式")); data.add(new SectionItem(R.drawable.ic_dining_table_mode, "餐檯模式"));
data.add(new SectionItem(R.drawable.ic_delivery_mode, "外送模式")); data.add(new SectionItem(R.drawable.ic_delivery_mode, "外送模式"));
...@@ -93,11 +102,11 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -93,11 +102,11 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
} }
}); });
adapter.setOnItemClickListener((adapter1, view, position) -> { adapter.setOnItemClickListener((adapter1, view, position) -> {
if(data.get(position).getText().equals("餐檯模式")){ if (data.get(position).getText().equals("餐檯模式")) {
CC.obtainBuilder("Component.Table") CC.obtainBuilder("Component.Table")
.setActionName("showTableActivity") .setActionName("showTableActivity")
.build() .build()
.call(); .call();
} }
}); });
rvOrdering.setAdapter(adapter); rvOrdering.setAdapter(adapter);
...@@ -119,7 +128,7 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -119,7 +128,7 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
rvManagement.setAdapter(managementAdapter); rvManagement.setAdapter(managementAdapter);
managementAdapter.setOnItemClickListener((adapter12, view, position) -> { managementAdapter.setOnItemClickListener((adapter12, view, position) -> {
if(managementData.get(position).getText().equals("打印管理")){ if (managementData.get(position).getText().equals("打印管理")) {
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("showPrintActivity") .setActionName("showPrintActivity")
.build() .build()
...@@ -142,6 +151,9 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -142,6 +151,9 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
rvStaffManagement.setAdapter(staffAdapter); rvStaffManagement.setAdapter(staffAdapter);
} }
private void initDrawerLayout() {
}
@Override @Override
public void initIntent() { public void initIntent() {
...@@ -194,4 +206,47 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -194,4 +206,47 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
public void killMyself() { public void killMyself() {
finish(); finish();
} }
public View.OnClickListener mSlidingMenuOnclick = new View.OnClickListener() {
@Override
public void onClick(View v) {
slideMenu.toggle();
}
};
@OnClick({R2.id.layout_login_out})
@Override
public void onClick(View v) {
if (v.getId() == R.id.layout_login_out) {
//登出
mPresenter.loginOut();
}
}
@Override
public void loginOut() {
GsaCloudApplication.isLogin = false;
CC.obtainBuilder("User.Component.Login")
.setActionName("showActivityA")
.build()
.call();
finish();
}
private long mExitTime;
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if ((System.currentTimeMillis() - mExitTime) > 2000) {
showMessage("再按一次退出應用");
mExitTime = System.currentTimeMillis();
} else {
finish();
System.exit(0);
}
return true;
}
return super.onKeyDown(keyCode, event);
}
} }
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
...@@ -4,16 +4,14 @@ import android.content.Intent; ...@@ -4,16 +4,14 @@ import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.DashPathEffect; import android.graphics.DashPathEffect;
import android.graphics.Paint;
import android.os.Bundle; import android.os.Bundle;
import android.os.Message; import android.os.Message;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.daivd.chart.component.axis.BaseAxis;
import com.daivd.chart.component.axis.HorizontalAxis; import com.daivd.chart.component.axis.HorizontalAxis;
import com.daivd.chart.component.axis.VerticalAxis; import com.daivd.chart.component.axis.VerticalAxis;
import com.daivd.chart.component.base.IAxis; import com.daivd.chart.component.base.IAxis;
...@@ -23,36 +21,33 @@ import com.daivd.chart.data.LineData; ...@@ -23,36 +21,33 @@ import com.daivd.chart.data.LineData;
import com.daivd.chart.data.style.FontStyle; import com.daivd.chart.data.style.FontStyle;
import com.daivd.chart.data.style.LineStyle; import com.daivd.chart.data.style.LineStyle;
import com.daivd.chart.data.style.PointStyle; import com.daivd.chart.data.style.PointStyle;
import com.daivd.chart.listener.OnClickColumnListener;
import com.daivd.chart.provider.component.point.Point; import com.daivd.chart.provider.component.point.Point;
import com.daivd.chart.provider.component.tip.MultiLineBubbleTip;
import com.daivd.chart.utils.DensityUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
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.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.di.component.DaggerMainTopComponent;
import com.gingersoft.gsa.cloud.main.mvp.contract.MainTopContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.HomeTurnoverBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.HomeTurnoverBean;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.MainActivity; import com.gingersoft.gsa.cloud.main.mvp.presenter.MainTopPresenter;
import com.gingersoft.gsa.cloud.main.mvp.ui.view.CustomMarkView; import com.gingersoft.gsa.cloud.main.mvp.ui.activity.NewMainActivity;
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;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.gingersoft.gsa.cloud.main.di.component.DaggerMainTopComponent;
import com.gingersoft.gsa.cloud.main.mvp.contract.MainTopContract;
import com.gingersoft.gsa.cloud.main.mvp.presenter.MainTopPresenter;
import com.gingersoft.gsa.cloud.main.R;
import com.sxu.shadowdrawable.ShadowDrawable; import com.sxu.shadowdrawable.ShadowDrawable;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx; import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx;
...@@ -70,20 +65,42 @@ import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx; ...@@ -70,20 +65,42 @@ import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a> * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================ * ================================================
*/ */
public class MainTopFragment extends BaseFragment<MainTopPresenter> implements MainTopContract.View { public class MainTopFragment extends BaseFragment<MainTopPresenter> implements MainTopContract.View, View.OnClickListener {
// line_chart_view // line_chart_view
@BindView(R2.id.line_chart_view) @BindView(R2.id.line_chart_view)
LineChart lineChart; LineChart lineChart;
@BindView(R2.id.tv_today_amount) @BindView(R2.id.tv_today_amount)
TextView tvTurnover; TextView tvTurnover;//今日營業額
@BindView(R2.id.tv_today_time) @BindView(R2.id.tv_today_time)
TextView time; TextView time;//今日日期
@BindView(R2.id.tv_compare_today_state)
ImageView ivTurnoverTrend;//較昨日營業額趨勢
@BindView(R2.id.tv_compare_today_size)
TextView tvTurnoverTrend;//今日較昨日營業額差距
@BindView(R2.id.tv_total_amount_project) @BindView(R2.id.tv_total_amount_project)
TextView tvProjectAmount;//項目總金額 TextView tvProjectAmount;//項目總金額
@BindView(R2.id.tv_consumers_number) @BindView(R2.id.tv_consumers_number)
TextView tvConsumersNumber;//消費人數 TextView tvConsumersNumber;//消費人數
@BindView(R2.id.tv_bill_number) @BindView(R2.id.tv_bill_number)
TextView tvBillNumber;//賬單數 TextView tvBillNumber;//賬單數
@BindView(R2.id.iv_project_amount_state)
ImageView ivProjectAmountState;//今日項目額度較昨日上漲或下跌圖標
@BindView(R2.id.tv_project_amount_trend)
TextView tvProjectAmountTrend;//今日項目額度較昨日上漲或下跌數據
@BindView(R2.id.tv_per_capita_consumption)
TextView tvPerCapitaConsumption;//人均消費
@BindView(R2.id.iv_people_trend)
ImageView ivPeopleTrend;//人數趨勢圖標
@BindView(R2.id.tv_people_trend)
TextView tvPeopleTrend;//人數較昨日上漲或下跌數量
@BindView(R2.id.tv_average_consumption_per_order)
TextView tvAveragePerOrder;//平均每單消費
@BindView(R2.id.iv_bill_trend)
ImageView ivBillTrend;//賬單數量趨勢
@BindView(R2.id.tv_bill_trend)
TextView tvBillTrend;//賬單數量較昨日上漲或下跌數量
@BindView(R2.id.iv_personal_center)
ImageView iv_personal_center;
public static MainTopFragment newInstance() { public static MainTopFragment newInstance() {
MainTopFragment fragment = new MainTopFragment(); MainTopFragment fragment = new MainTopFragment();
return fragment; return fragment;
...@@ -113,9 +130,10 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -113,9 +130,10 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
mPresenter.getRestaurantReport( "26");//GsaCloudApplication.getRestaurantId(mContext) 獲取餐廳營業信息 mPresenter.getRestaurantReport(GsaCloudApplication.getRestaurantId(mContext) + "");//GsaCloudApplication.getRestaurantId(mContext) 獲取餐廳營業信息
time.setText(TimeUtils.getCurrentTimeInString(new SimpleDateFormat("YYYY-MM-dd E"))); time.setText(TimeUtils.getCurrentTimeInString(new SimpleDateFormat("yyyy-MM-dd E")));
loadReport();//加載報表線形圖 loadReport();//加載報表線形圖
iv_personal_center.setOnClickListener(((NewMainActivity) Objects.requireNonNull(getActivity())).mSlidingMenuOnclick);
} }
private void loadReport() { private void loadReport() {
...@@ -134,25 +152,25 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -134,25 +152,25 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
List<LineData> ColumnDatas = new ArrayList<>(); List<LineData> ColumnDatas = new ArrayList<>();
//第一條線 //第一條線
ArrayList<Double> tempList1 = new ArrayList<>(); ArrayList<Double> tempList1 = new ArrayList<>();
tempList1.add(12350d); tempList1.add(0d);
tempList1.add(12340d); tempList1.add(0d);
tempList1.add(2450d); tempList1.add(0d);
tempList1.add(1470d); tempList1.add(0d);
tempList1.add(1690d); tempList1.add(0d);
tempList1.add(1570d); tempList1.add(0d);
final LineData columnData1 = new LineData("今日", "℃", getResources().getColor(R.color.theme_color), tempList1); final LineData columnData1 = new LineData("今日", "℃", getResources().getColor(R.color.theme_color), tempList1);
columnData1.setLineStyle(new LineStyle(mContext, 5, getResources().getColor(R.color.theme_color))); columnData1.setLineStyle(new LineStyle(mContext, 5, getResources().getColor(R.color.theme_color)));
//第二條線 //第二條線
ArrayList<Double> humidityList = new ArrayList<>(); ArrayList<Double> humidityList = new ArrayList<>();
humidityList.add(1340d); humidityList.add(0d);
humidityList.add(1320d); humidityList.add(0d);
humidityList.add(480d); humidityList.add(0d);
humidityList.add(590d); humidityList.add(0d);
humidityList.add(360d); humidityList.add(0d);
humidityList.add(1830d); humidityList.add(0d);
humidityList.add(1980d); humidityList.add(0d);
humidityList.add(1490d); humidityList.add(0d);
LineData columnData2 = new LineData("昨日", "", getResources().getColor(R.color.today_line), humidityList); LineData columnData2 = new LineData("昨日", "", getResources().getColor(R.color.today_line), humidityList);
columnData2.setLineStyle(new LineStyle(mContext, 5, getResources().getColor(R.color.today_line))); columnData2.setLineStyle(new LineStyle(mContext, 5, getResources().getColor(R.color.today_line)));
ColumnDatas.add(columnData1); ColumnDatas.add(columnData1);
...@@ -179,7 +197,7 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -179,7 +197,7 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
horizontalAxis.setAxisDirection(IAxis.AxisDirection.BOTTOM); horizontalAxis.setAxisDirection(IAxis.AxisDirection.BOTTOM);
//不顯示網格 //不顯示網格
horizontalAxis.setDrawGrid(false); horizontalAxis.setDrawGrid(false);
horizontalAxis.getAxisStyle().setWidth(mContext,1).setColor(res.getColor(R.color.theme_color)); horizontalAxis.getAxisStyle().setWidth(mContext, 1).setColor(res.getColor(R.color.theme_color));
//设置线条样式 //设置线条样式
verticalAxis.getAxisStyle().setWidth(mContext, 1).setColor(res.getColor(R.color.theme_color)); verticalAxis.getAxisStyle().setWidth(mContext, 1).setColor(res.getColor(R.color.theme_color));
//設置網格虛線樣式 //設置網格虛線樣式
...@@ -308,14 +326,59 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -308,14 +326,59 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
@Override @Override
public void loadBusinessInfo(Map<String, HomeTurnoverBean.DataBean> dataBeanMap) { public void loadBusinessInfo(Map<String, HomeTurnoverBean.DataBean> dataBeanMap) {
//通過今天的日期取得今天的報表信息
HomeTurnoverBean.DataBean bean = dataBeanMap.get(TimeUtils.getCurrentTimeInString(TimeUtils.DATE_FORMAT_DATE));//TimeUtils.getCurrentTimeInString(TimeUtils.DATE_FORMAT_DATE) HomeTurnoverBean.DataBean bean = dataBeanMap.get(TimeUtils.getCurrentTimeInString(TimeUtils.DATE_FORMAT_DATE));//TimeUtils.getCurrentTimeInString(TimeUtils.DATE_FORMAT_DATE)
HomeTurnoverBean.DataBean yesterdayBean = dataBeanMap.get(TimeUtils.getOldDate(-1));//TimeUtils.getCurrentTimeInString(TimeUtils.DATE_FORMAT_DATE)
if (bean != null) { if (bean != null) {
tvTurnover.setText(bean.getBusiness_amount()); tvTurnover.setText(bean.getBusiness_amount());
tvProjectAmount.setText(bean.getSales()); tvProjectAmount.setText(bean.getSales());
tvConsumersNumber.setText(bean.getPeople()); tvConsumersNumber.setText(bean.getPeople());
tvBillNumber.setText(bean.getNumber_bill()); tvBillNumber.setText(bean.getNumber_bill());
if (Float.parseFloat(bean.getPeople()) != 0) {
//人均消費
tvPerCapitaConsumption.setText(Float.parseFloat(bean.getBusiness_amount()) / Float.parseFloat(bean.getPeople()) + "");
}
if (Integer.parseInt(bean.getNumber_bill()) != 0) {
//每單平均消費
tvAveragePerOrder.setText(Float.parseFloat(bean.getBusiness_amount()) / Integer.parseInt(bean.getNumber_bill()) + "");
}
if (yesterdayBean != null) {
double turnover = MoneyUtil.sub(Double.parseDouble(bean.getBusiness_amount()), Double.parseDouble(yesterdayBean.getBusiness_amount()));
ivTurnoverTrend.setImageResource(getTrendImg(turnover));
tvTurnoverTrend.setText(String.format(getString(R.string.format_one_point), turnover));
double sales = MoneyUtil.sub(Double.parseDouble(bean.getSales()), Double.parseDouble(yesterdayBean.getSales()));
tvProjectAmountTrend.setText(String.format(getString(R.string.format_one_point), sales));
ivProjectAmountState.setImageResource(getTrendImg(sales));
int people = Integer.parseInt(bean.getPeople()) - Integer.parseInt(yesterdayBean.getPeople());
ivPeopleTrend.setImageResource(getTrendImg(people));
tvPeopleTrend.setText(people + "");
int billNum = Integer.parseInt(bean.getNumber_bill()) - Integer.parseInt(yesterdayBean.getNumber_bill());
ivBillTrend.setImageResource(getTrendImg(billNum));
tvBillTrend.setText(billNum + "");
}
}
}
private int getTrendImg(double amount) {
if (amount > 0) {
return R.drawable.ic_rise;
} else if (amount < 0) {
return R.drawable.ic_down;
} else {
return -1;
} }
}
@OnClick({R2.id.iv_personal_center})
@Override
public void onClick(View v) {
if(v.getId() == R.id.iv_personal_center){
//個人中心
}
} }
} }
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/SlidingMenu.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.ui.view;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.ViewGroup;
import android.widget.HorizontalScrollView;
import android.widget.LinearLayout;
import com.daivd.chart.utils.DensityUtils;
import com.gingersoft.gsa.cloud.main.R;
import com.jess.arms.utils.ArmsUtils;
import com.nineoldandroids.view.ViewHelper;
import com.sxu.shadowdrawable.ShadowDrawable;
/**
* des ：SlidingMenu 侧边栏 侧滑菜单
*/
public class SlidingMenu extends HorizontalScrollView {
private int mScreenWidth;
private int mMenuRightPadding;
private int mMenuWidth;
private int mHalfMenuWidth;
private boolean isOpen;
private boolean once;
private ViewGroup mMenu;
private ViewGroup mContent;
private Drawable contentBg;
public SlidingMenu(Context context) {
this(context, null);
}
public SlidingMenu(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public SlidingMenu(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mScreenWidth = ArmsUtils.getScreenWidth(context);
// TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.SlidingMenu, defStyleAttr, 0);
// int count = a.getIndexCount();
// for (int i = 0; i < count; i++) {
// int attr = a.getIndex(i);
// switch (attr) {
// case R.styleable.SlidingMenu_rightPadding: {
//// 默认是50
// mMenuRightPadding = a.getDimensionPixelSize(attr, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50f, getResources().getDisplayMetrics()));
// break;
// }
// }
// }
// a.recycle();
mMenuRightPadding = DensityUtils.dp2px(context, 140);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
/**
* 显示设置一个宽度
*/
if (!once) {
LinearLayout wrapper = (LinearLayout) getChildAt(0);
mMenu = (ViewGroup) wrapper.getChildAt(0);
mContent = (ViewGroup) wrapper.getChildAt(1);
contentBg = mContent.getBackground();
mMenuWidth = mScreenWidth - mMenuRightPadding;
mHalfMenuWidth = mMenuWidth / 2;
mMenu.getLayoutParams().width = mMenuWidth;
mContent.getLayoutParams().width = mScreenWidth;
}
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
super.onLayout(changed, l, t, r, b);
if (changed) {
// 将菜单隐藏
this.scrollTo(mMenuWidth, 0);
once = true;
}
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
int action = ev.getAction();
switch (action) {
// Up时，进行判断，如果显示区域大于菜单宽度一半则完全显示，否则隐藏
case MotionEvent.ACTION_UP: {
int scrollX = getScrollX();
if (scrollX > mHalfMenuWidth) {
this.smoothScrollTo(mMenuWidth, 0);
isOpen = false;
} else {
this.smoothScrollTo(0, 0);
isOpen = true;
}
return true;
}
}
return super.onTouchEvent(ev);
}
/**
* 打开菜单
*/
public void openMenu() {
if (isOpen)
return;
this.smoothScrollTo(0, 0);
isOpen = true;
ShadowDrawable.setShadowDrawable(mContent, Color.parseColor("#FFFFFF"), 50,
Color.parseColor("#73888888"), 50, 0, 2);
invalidate();
}
/**
* 关闭菜单
*/
public void closeMenu() {
if (isOpen) {
this.smoothScrollTo(mMenuWidth, 0);
isOpen = false;
mContent.setBackground(contentBg);
}
}
/**
* 切换菜单状态
*/
public void toggle() {
if (isOpen) {
closeMenu();
} else {
openMenu();
}
}
@Override
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
super.onScrollChanged(l, t, oldl, oldt);
float scale = l * 1.0f / mMenuWidth;
float leftScale = 1 - 0.3f * scale;
float rightScale = 0.8f + scale * 0.2f;
ViewHelper.setScaleX(mMenu, leftScale);
ViewHelper.setScaleY(mMenu, leftScale);
ViewHelper.setAlpha(mMenu, 0.6f + 0.4f * (1 - scale));
ViewHelper.setTranslationX(mMenu, mMenuWidth * scale * 0.7f);
ViewHelper.setPivotX(mContent, 0);
ViewHelper.setPivotY(mContent, mContent.getHeight() / 2);
ViewHelper.setScaleX(mContent, rightScale);
ViewHelper.setScaleY(mContent, rightScale);
}
}
\ No newline at end of file
main/src/main/res/drawable-xhdpi/ic_msg.png
main/src/main/res/drawable-xhdpi/ic_msg.png

4.45 KB | W: | H:

main/src/main/res/drawable-xhdpi/ic_msg.png

1.14 KB | W: | H:

main/src/main/res/drawable-xhdpi/ic_msg.png
main/src/main/res/drawable-xhdpi/ic_msg.png
main/src/main/res/drawable-xhdpi/ic_msg.png
main/src/main/res/drawable-xhdpi/ic_msg.png
  • 2-up
  • Swipe
  • Onion skin
main/src/main/res/layout/activity_new_main.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" <com.gingersoft.gsa.cloud.main.mvp.ui.view.SlidingMenu xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slideMenu"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="#F0edf1" android:layout_height="match_parent"
android:layout_height="match_parent"> android:background="@color/theme_color">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="horizontal"><!-- 側邊欄內容-->
<fragment
android:id="@+id/main_top_fragment"
android:name="com.gingersoft.gsa.cloud.main.mvp.ui.fragment.MainTopFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:id="@+id/layout_ordering_meals"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_10" android:layout_gravity="start"
android:layout_marginRight="@dimen/dp_10" android:background="@color/theme_color"
android:orientation="vertical" android:gravity="center_horizontal"
android:paddingTop="@dimen/dp_15" android:orientation="vertical">
android:paddingBottom="@dimen/dp_20">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_22" android:layout_marginTop="@dimen/dp_15"
android:text="點餐" android:text="个人中心"
android:textColor="#181818" android:textColor="@color/white"
android:textSize="@dimen/sp_17" /> android:textSize="@dimen/sp_17" />
<View <ImageView
android:layout_width="match_parent" android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_1" android:layout_height="@dimen/dp_76"
android:layout_marginTop="@dimen/dp_11" android:layout_marginTop="@dimen/dp_14"
android:background="#F0F0F0" /> android:src="@drawable/ic_header" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:text="NAME"
android:textColor="@color/white"
android:textSize="@dimen/sp_20" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="店鋪名稱"
android:textColor="@color/white"
android:textSize="@dimen/sp_20" />
<androidx.recyclerview.widget.RecyclerView <LinearLayout
android:id="@+id/rv_ordering_meals"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/main_recyclerview_marginLeft" android:layout_marginTop="@dimen/dp_37"
android:layout_marginTop="@dimen/dp_5" android:gravity="center_vertical"
android:layout_marginRight="@dimen/main_recyclerview_marginRight" /> android:orientation="horizontal">
</LinearLayout> <ImageView
android:layout_width="@dimen/dp_29"
android:layout_height="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_18"
android:src="@drawable/ic_mall_center" />
<LinearLayout <TextView
android:id="@+id/layout_management" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_14"
android:layout_marginLeft="@dimen/dp_10" android:text="商城中心"
android:layout_marginRight="@dimen/dp_10" android:textColor="@color/white"
android:layout_marginBottom="@dimen/dp_10" android:textSize="@dimen/sp_17" />
android:background="@color/white" </LinearLayout>
android:orientation="vertical"
android:paddingTop="@dimen/dp_16"
android:paddingBottom="@dimen/dp_16">
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginTop="@dimen/dp_28"
android:text="管理" android:gravity="center_vertical"
android:textColor="#181818" android:orientation="horizontal">
android:textSize="@dimen/sp_14" />
<ImageView
android:layout_width="@dimen/dp_29"
android:layout_height="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_18"
android:src="@drawable/ic_about_us" />
<androidx.recyclerview.widget.RecyclerView <TextView
android:id="@+id/rv_management" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
android:text="關於我們"
android:textColor="@color/white"
android:textSize="@dimen/sp_17" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/main_recyclerview_marginLeft" android:layout_marginTop="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_20" android:gravity="center_vertical"
android:layout_marginRight="@dimen/main_recyclerview_marginRight" /> android:orientation="horizontal">
<View <ImageView
android:layout_width="@dimen/dp_29"
android:layout_height="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_18"
android:src="@drawable/ic_password" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
android:text="修改密碼"
android:textColor="@color/white"
android:textSize="@dimen/sp_17" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_1" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_28"
android:background="#F0F0F0" /> android:gravity="center_vertical"
android:orientation="horizontal">
<TextView <ImageView
android:layout_width="@dimen/dp_29"
android:layout_height="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_18"
android:src="@drawable/ic_setting" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
android:text="設置"
android:textColor="@color/white"
android:textSize="@dimen/sp_17" />
</LinearLayout>
<View
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_20" android:layout_weight="1" />
android:text="員工"
android:layout_marginLeft="@dimen/dp_15" <LinearLayout
android:textColor="#181818" android:id="@+id/layout_login_out"
android:textSize="@dimen/sp_14" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_staff_management"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/main_recyclerview_marginLeft" android:layout_marginBottom="@dimen/dp_45"
android:layout_marginTop="@dimen/dp_20" android:gravity="center_vertical|bottom"
android:layout_marginRight="@dimen/main_recyclerview_marginRight" /> android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/dp_29"
android:layout_height="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_18"
android:src="@drawable/ic_loginout" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_6"
android:text="登出"
android:textColor="@color/white"
android:textSize="@dimen/sp_17" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<!-- 主頁內容-->
<androidx.core.widget.NestedScrollView
android:id="@+id/content_scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F0edf1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<fragment
android:id="@+id/main_top_fragment"
android:name="com.gingersoft.gsa.cloud.main.mvp.ui.fragment.MainTopFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/layout_ordering_meals"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:orientation="vertical"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_20">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_22"
android:text="點餐"
android:textColor="#181818"
android:textSize="@dimen/sp_17" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginTop="@dimen/dp_11"
android:background="#F0F0F0" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_ordering_meals"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/main_recyclerview_marginLeft"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginRight="@dimen/main_recyclerview_marginRight" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_management"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:background="@color/white"
android:orientation="vertical"
android:paddingTop="@dimen/dp_16"
android:paddingBottom="@dimen/dp_16">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:text="管理"
android:textColor="#181818"
android:textSize="@dimen/sp_14" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_management"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/main_recyclerview_marginLeft"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/main_recyclerview_marginRight" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginTop="@dimen/dp_20"
android:background="#F0F0F0" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:text="員工"
android:textColor="#181818"
android:textSize="@dimen/sp_14" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_staff_management"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/main_recyclerview_marginLeft"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/main_recyclerview_marginRight" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file </com.gingersoft.gsa.cloud.main.mvp.ui.view.SlidingMenu>
main/src/main/res/layout/fragment_main_top.xml
...@@ -28,9 +28,10 @@ ...@@ -28,9 +28,10 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:layout_width="@dimen/dp_22" android:id="@+id/iv_personal_center"
android:layout_height="@dimen/dp_25" android:layout_width="@dimen/dp_37"
android:src="@drawable/ic_personal_center" android:layout_height="@dimen/dp_37"
android:src="@drawable/ic_my"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -47,8 +48,8 @@ ...@@ -47,8 +48,8 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:layout_width="@dimen/dp_26" android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_28" android:layout_height="@dimen/dp_26"
android:src="@drawable/ic_msg" android:src="@drawable/ic_msg"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
...@@ -94,13 +95,11 @@ ...@@ -94,13 +95,11 @@
app:layout_constraintRight_toLeftOf="@id/tv_compare_today_state" app:layout_constraintRight_toLeftOf="@id/tv_compare_today_state"
app:layout_constraintTop_toBottomOf="@id/tv_today_amount" /> app:layout_constraintTop_toBottomOf="@id/tv_today_amount" />
<TextView
<ImageView
android:id="@+id/tv_compare_today_state" android:id="@+id/tv_compare_today_state"
android:layout_width="wrap_content" android:layout_width="@dimen/dp_8"
android:layout_height="wrap_content" android:layout_height="@dimen/dp_9"
android:text="↑"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@id/tv_compare_today_text" app:layout_constraintBottom_toBottomOf="@id/tv_compare_today_text"
app:layout_constraintLeft_toRightOf="@id/tv_compare_today_text" app:layout_constraintLeft_toRightOf="@id/tv_compare_today_text"
app:layout_constraintRight_toLeftOf="@id/tv_compare_today_size" app:layout_constraintRight_toLeftOf="@id/tv_compare_today_size"
...@@ -147,8 +146,8 @@ ...@@ -147,8 +146,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="160dp" android:layout_height="160dp"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:paddingRight="@dimen/dp_10" android:paddingRight="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="@id/cv_white_bg" app:layout_constraintLeft_toLeftOf="@id/cv_white_bg"
app:layout_constraintRight_toRightOf="@id/cv_white_bg" app:layout_constraintRight_toRightOf="@id/cv_white_bg"
...@@ -222,11 +221,12 @@ ...@@ -222,11 +221,12 @@
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
<ImageView <ImageView
android:id="@+id/iv_project_amount_state"
android:layout_width="@dimen/dp_8" android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_9" android:layout_height="@dimen/dp_9" />
android:src="@drawable/ic_rise" />
<TextView <TextView
android:id="@+id/tv_project_amount_trend"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#3c3c3c" android:textColor="#3c3c3c"
...@@ -258,17 +258,30 @@ ...@@ -258,17 +258,30 @@
android:textColor="#3c3c3c" android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="平均：1000" android:orientation="horizontal">
android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="平均："
android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_per_capita_consumption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -281,15 +294,14 @@ ...@@ -281,15 +294,14 @@
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
<ImageView <ImageView
android:id="@+id/iv_people_trend"
android:layout_width="@dimen/dp_8" android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_9" android:layout_height="@dimen/dp_9" />
android:src="@drawable/ic_rise" />
<TextView <TextView
android:id="@+id/tv_people_trend"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:text="1000"
android:textColor="#3c3c3c" android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
</LinearLayout> </LinearLayout>
...@@ -319,13 +331,25 @@ ...@@ -319,13 +331,25 @@
android:textColor="#3c3c3c" android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="平均：1000" android:orientation="horizontal">
android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="平均："
android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_average_consumption_per_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -341,14 +365,14 @@ ...@@ -341,14 +365,14 @@
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
<ImageView <ImageView
android:id="@+id/iv_bill_trend"
android:layout_width="@dimen/dp_8" android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_9" android:layout_height="@dimen/dp_9" />
android:src="@drawable/ic_down" />
<TextView <TextView
android:id="@+id/tv_bill_trend"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="1000"
android:textColor="#3c3c3c" android:textColor="#3c3c3c"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
</LinearLayout> </LinearLayout>
......
main/src/main/res/values/strings.xml
...@@ -23,4 +23,6 @@ ...@@ -23,4 +23,6 @@
<string name="function_manage">管理选项</string> <string name="function_manage">管理选项</string>
<string name="function_soldout_ctrl">沽清控制</string> <string name="function_soldout_ctrl">沽清控制</string>
<string name="quit_system">退出系統</string> <string name="quit_system">退出系統</string>
<string name="format_one_point">%1$.1f</string>
</resources> </resources>
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
...@@ -17,6 +17,7 @@ import com.billy.cc.core.component.CCUtil; ...@@ -17,6 +17,7 @@ import com.billy.cc.core.component.CCUtil;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PrinterManger.PrinterManager; import com.gingersoft.gsa.cloud.base.common.bean.PrinterManger.PrinterManager;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.PrintUtils; import com.gingersoft.gsa.cloud.base.utils.PrintUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.base.utils.view.ImageUtils; import com.gingersoft.gsa.cloud.base.utils.view.ImageUtils;
...@@ -39,7 +40,11 @@ import com.joe.print.mvp.ui.adapter.PrinterListAdapter; ...@@ -39,7 +40,11 @@ import com.joe.print.mvp.ui.adapter.PrinterListAdapter;
import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration; import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
...@@ -107,8 +112,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print ...@@ -107,8 +112,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
type = CCUtil.getNavigateParam(this, "type", 1001); type = CCUtil.getNavigateParam(this, "type", 1001);
if (type == 0) { if (type == 0) {
//上菜紙 //上菜紙
List<OrderDetail> foods = CCUtil.getNavigateParam(this, "NewFoods", new ArrayList<>()); bitmap = PrintUtils.getPrintBitmap(mContext, MyOrderManage.getInstance().getNewFoodList());
bitmap = PrintUtils.getPrintBitmap(mContext, foods);
} else if (type == 1) { } else if (type == 1) {
//印單 //印單
bitmap = PrintUtils.getPrintBitmap(mContext); bitmap = PrintUtils.getPrintBitmap(mContext);
...@@ -116,9 +120,22 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print ...@@ -116,9 +120,22 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
//結賬單 //結賬單
bitmap = PrintUtils.getPrintBillBitmap(mContext); bitmap = PrintUtils.getPrintBillBitmap(mContext);
} else if (type == 3) { } else if (type == 3) {
//廚房單 //廚房單，需要切紙
List<OrderDetail> foods = CCUtil.getNavigateParam(this, "NewFoods", new ArrayList<>()); List<OrderDetail> orderDetails = MyOrderManage.getInstance().getNewFoodList();
bitmap = PrintUtils.getKitChenPrintBitmap(mContext, foods); if (orderDetails != null) {
Map<String, List<OrderDetail>> map = new HashMap<>();
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
map = orderDetails.stream().collect(Collectors.groupingBy(OrderDetail::getPrintseting));
} else {
for (int i = 0; i < orderDetails.size(); i++) {
}
}
bitmap = PrintUtils.getKitChenPrintBitmap(mContext, MyOrderManage.getInstance().getNewFoodList());
} else {
ToastUtils.show(mContext, "食品列表為空，打印失敗");
finish();
}
} else { } else {
ToastUtils.show(mContext, "打印失敗"); ToastUtils.show(mContext, "打印失敗");
finish(); finish();
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
package com.gingersoft.gsa.cloud.base.application; package com.gingersoft.gsa.cloud.base.application;
import android.content.Context; import android.content.Context;
import android.util.Log;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.elvishew.xlog.LogConfiguration;
import com.elvishew.xlog.LogLevel;
import com.elvishew.xlog.interceptor.BlacklistTagsFilterInterceptor;
import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.common.bean.CurrentAndroidSetting; import com.gingersoft.gsa.cloud.base.common.bean.CurrentAndroidSetting;
import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans; import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans;
import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler; import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler;
...@@ -32,13 +37,21 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -32,13 +37,21 @@ public class GsaCloudApplication extends BaseApplication {
CC.enableVerboseLog(true); CC.enableVerboseLog(true);
CC.enableDebug(true); CC.enableDebug(true);
CC.enableRemoteCC(true); CC.enableRemoteCC(true);
// initXLog();
initGreenDao(); initGreenDao();
AppCrashHandler.getInstance().init(this, "test"); AppCrashHandler.getInstance().init(this, "test");
androidSetting = new CurrentAndroidSetting(); androidSetting = new CurrentAndroidSetting();
} }
private void initXLog(){
LogConfiguration config = new LogConfiguration.Builder()
.logLevel(BuildConfig.DEBUG? LogLevel.ALL: LogLevel.NONE)
.tag("GSA-TAG")
.addInterceptor(new BlacklistTagsFilterInterceptor("","",""))
.build();
}
private void initGreenDao() { private void initGreenDao() {
DaoManager mManager = DaoManager.getInstance(); DaoManager mManager = DaoManager.getInstance();
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
...@@ -5,6 +5,7 @@ import com.gingersoft.gsa.cloud.database.bean.Combo; ...@@ -5,6 +5,7 @@ import com.gingersoft.gsa.cloud.database.bean.Combo;
import com.gingersoft.gsa.cloud.database.bean.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.Modifier; import com.gingersoft.gsa.cloud.database.bean.Modifier;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -15,7 +16,8 @@ import java.util.List; ...@@ -15,7 +16,8 @@ import java.util.List;
* 修订历史：2020-02-18 * 修订历史：2020-02-18
* 描述：訂單實體類 * 描述：訂單實體類
*/ */
public class OrderDetail { public class OrderDetail implements Serializable {
private static final long serialVersionUID = -958791295551999853L;
/** /**
* 是否选择 * 是否选择
* 0 未选中 * 0 未选中
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/mealManage/MyOrderManage.java
...@@ -52,6 +52,8 @@ public class MyOrderManage { ...@@ -52,6 +52,8 @@ public class MyOrderManage {
private OrderBean orderBean; private OrderBean orderBean;
//食品列表 //食品列表
private List<OrderDetail> orderFoodList = new ArrayList<>(); private List<OrderDetail> orderFoodList = new ArrayList<>();
//本次送單食品，用於打印
private List<OrderDetail> newFoodList = new ArrayList<>();
// private List<DatasBean> comboOrders = new ArrayList<>(); // private List<DatasBean> comboOrders = new ArrayList<>();
// private List<MixOldOrder> MixOldOrders = new ArrayList<>(); // private List<MixOldOrder> MixOldOrders = new ArrayList<>();
// private List<MixComboGroupDiscount.DatasBean> mixComboGroup_Discounts; // private List<MixComboGroupDiscount.DatasBean> mixComboGroup_Discounts;
...@@ -1171,4 +1173,12 @@ public class MyOrderManage { ...@@ -1171,4 +1173,12 @@ public class MyOrderManage {
public void setBillMoney(List<PayMethod> billMoney) { public void setBillMoney(List<PayMethod> billMoney) {
this.billMoney = billMoney; this.billMoney = billMoney;
} }
public List<OrderDetail> getNewFoodList() {
return newFoodList;
}
public void setNewFoodList(List<OrderDetail> newFoodList) {
this.newFoodList = newFoodList;
}
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/FileUtils.java 0 → 100644
package com.gingersoft.gsa.cloud.base.utils;
import android.content.Context;
import android.os.Environment;
import android.text.TextUtils;
import com.elvishew.xlog.XLog;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2018/11/16
* 修订历史：2018/11/16
* 描述：7.0 兼容
* <files-path name="name" path="path" /> 对应getFilesDir()。
* <cache-path name="name" path="path" /> 对应getCacheDir()。
* <external-path name="name" path="path" /> 对应Environment.getExternalStorageDirectory()。
* <external-files-path name="name" path="path" /> 对应getExternalFilesDir()。
* <external-cache-path name="name" path="path" /> 对应getExternalCacheDir()。
*/
public class FileUtils {
public static String FirstFolder = "GSACloud";//一级目录
public static String file = "file";//文件文件夹
public static String Image = "image";//图片文件夹
public static String Log = "xLog";//日志存储
public static String ActionLog = "actionLog";//操作日志
public static String ErrorLog = "errorLog";//错误日志存储
public static String APK = "Download";//安装包目录放在系统目录
/*ALBUM_PATH取得机器的SD卡位置，File.separator为分隔符“/”*/
public final static String ALBUM_PATH = Environment.getExternalStorageDirectory() + File.separator + FirstFolder + File.separator;
public final static String IMAGE_PATH = ALBUM_PATH + Image + File.separator;
public final static String File_PATH = ALBUM_PATH + file + File.separator;
public final static String LOG_PATH = ALBUM_PATH + Log + File.separator;
public final static String ACTIONLOG_PATH = LOG_PATH + ActionLog + File.separator;
public final static String ERRORLOG_PATH = LOG_PATH + ErrorLog + File.separator;
public final static String APK_PATH = Environment.getExternalStorageDirectory() + File.separator + APK + File.separator;
public final static String FILE_EXTENSION_SEPARATOR = ".";
//操作日志單最大文件大小
public final static int ACTION_MAX_SIZE = 1024 * 1024 * 5;
//操作日志文件按照時間刪除
public final static int ACTION_MAX_FILE_TIME = 1000 * 60 * 60 * 12;
private FileUtils() {
throw new AssertionError();
}
public static StringBuilder readFile(String filePath, String charsetName) {
File file = new File(filePath);
StringBuilder fileContent = new StringBuilder("");
if (file == null || !file.isFile()) {
return null;
}
BufferedReader reader = null;
try {
InputStreamReader is = new InputStreamReader(new FileInputStream(
file), charsetName);
reader = new BufferedReader(is);
String line = null;
while ((line = reader.readLine()) != null) {
if (!fileContent.toString().equals("")) {
fileContent.append("\r\n");
}
fileContent.append(line);
}
reader.close();
return fileContent;
} catch (IOException e) {
throw new RuntimeException("IOException occurred. ", e);
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
throw new RuntimeException("IOException occurred. ", e);
}
}
}
}
/**
* 写文件
*
* @param
* @return boolean 返回类型
*/
public static boolean writeFile(String filePath, String content,
boolean append) {
if (TextUtils.isEmpty(content)) {
return false;
}
FileWriter fileWriter = null;
try {
makeDirs(filePath);
fileWriter = new FileWriter(filePath, append);
fileWriter.write(content);
fileWriter.close();
return true;
} catch (IOException e) {
throw new RuntimeException("IOException occurred. ", e);
} finally {
if (fileWriter != null) {
try {
fileWriter.close();
} catch (IOException e) {
throw new RuntimeException("IOException occurred. ", e);
}
}
}
}
/**
* 创建文件的路径
*
* @param
* @return boolean 返回类型
*/
public static boolean makeDirs(String filePath) {
String folderName = getFolderName(filePath);
if (TextUtils.isEmpty(folderName)) {
return false;
}
File folder = new File(folderName);
return (folder.exists() && folder.isDirectory()) ? true : folder.mkdirs();
}
public static String getFolderName(String filePath) {
if (TextUtils.isEmpty(filePath)) {
return filePath;
}
int filePosi = filePath.lastIndexOf(File.separator);
return (filePosi == -1) ? "" : filePath.substring(0, filePosi);
}
/**
* 写文本文件 在Android系统中，文件保存在 /data/data/PACKAGE_NAME/files 目录下
*
* @param context
*/
public static void write(Context context, String fileName, String content) {
if (content == null)
content = "";
try {
FileOutputStream fos = context.openFileOutput(fileName,
Context.MODE_PRIVATE);
fos.write(content.getBytes());
fos.close();
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 读取文本文件 文件保存在 /data/data/PACKAGE_NAME/files
*
* @param context
* @param fileName
* @return
*/
public static String read(Context context, String fileName) {
try {
FileInputStream in = context.openFileInput(fileName);
return readInStream(in);
} catch (Exception e) {
e.printStackTrace();
}
return "";
}
public static String readInStream(FileInputStream inStream) {
try {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
byte[] buffer = new byte[512];
int length = -1;
while ((length = inStream.read(buffer)) != -1) {
outStream.write(buffer, 0, length);
}
outStream.close();
inStream.close();
return outStream.toString();
} catch (IOException e) {
XLog.tag("FileTest").d(e.getMessage());
}
return null;
}
/**
* 创建文件
*
* @param folderPath
* @param fileName
* @return
*/
public static File createFile(String folderPath, String fileName) {
File destDir = new File(folderPath);
if (!destDir.exists()) {
destDir.mkdirs();
}
return new File(folderPath, fileName + fileName);
}
/*
* 在SD卡上创建目录
*/
public static File creatSDDir(String dirName) {
File dir = new File(dirName);
if (!dir.exists()) {
dir.mkdirs();
}
return dir;
}
/**
* 获取文件大小
*
* @param filePath
* @return
*/
public static long getFileSize(String filePath) {
long size = 0;
File file = new File(filePath);
if (file != null && file.exists()) {
size = file.length();
}
return size;
}
/*
* Java文件操作 获取文件扩展名
* */
public static String getExtensionName(String filename) {
if ((filename != null) && (filename.length() > 0)) {
int dot = filename.lastIndexOf('.');
if ((dot > -1) && (dot < (filename.length() - 1))) {
return filename.substring(dot + 1);
}
}
return filename;
}
/*
* Java文件操作 获取不带扩展名的文件名
* */
public static String getFileNameNoEx(String filename) {
if ((filename != null) && (filename.length() > 0)) {
int dot = filename.lastIndexOf('.');
if ((dot > -1) && (dot < (filename.length()))) {
return filename.substring(0, dot);
}
}
return filename;
}
}
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/PrintUtils.java
...@@ -203,14 +203,12 @@ public class PrintUtils { ...@@ -203,14 +203,12 @@ public class PrintUtils {
TextView tvOperator = view.findViewById(R.id.tv_operator); TextView tvOperator = view.findViewById(R.id.tv_operator);
RecyclerView rvFood = view.findViewById(R.id.rv_kitchen_food); RecyclerView rvFood = view.findViewById(R.id.rv_kitchen_food);
TextView tvTableNumber2 = view.findViewById(R.id.tv_kitchen_print_table_number2); TextView tvTableNumber2 = view.findViewById(R.id.tv_kitchen_print_table_number2);
if (foodList != null && foodList.size() > 0) { if (foodList != null && foodList.size() > 0 && foodList.get(0) != null) {
KitChenPrintFoodAdapter foodAdapter = new KitChenPrintFoodAdapter(foodList); KitChenPrintFoodAdapter foodAdapter = new KitChenPrintFoodAdapter(foodList);
rvFood.setLayoutManager(new LinearLayoutManager(context)); rvFood.setLayoutManager(new LinearLayoutManager(context));
rvFood.setAdapter(foodAdapter); rvFood.setAdapter(foodAdapter);
//廚房位置 //廚房位置
if (foodList.get(0) != null) { tvKitChenLocation.setText(foodList.get(0).getPrintseting());
tvKitChenLocation.setText(foodList.get(0).getPrintseting());
}
} }
if (OpenTableManage.getDefault().getTableBean() != null) { if (OpenTableManage.getDefault().getTableBean() != null) {
// 台號 // 台號
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
...@@ -12,10 +12,14 @@ import android.telecom.Call; ...@@ -12,10 +12,14 @@ import android.telecom.Call;
import android.util.Base64; import android.util.Base64;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.gingersoft.gsa.cloud.base.utils.FileUtils;
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.AppUtils; import com.gingersoft.gsa.cloud.base.utils.other.AppUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.jess.arms.utils.DeviceUtils;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
...@@ -201,7 +205,7 @@ public class AppCrashHandler implements UncaughtExceptionHandler { ...@@ -201,7 +205,7 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
// 把上面获取的堆栈信息转为字符串，打印出来 // 把上面获取的堆栈信息转为字符串，打印出来
String stacktrace = result.toString(); String stacktrace = result.toString();
printWriter.close(); printWriter.close();
LogUtil.d(TAG,stacktrace); LogUtil.d(TAG, stacktrace);
//收集设备信息 //收集设备信息
collectCrashDeviceInfo(mContext); collectCrashDeviceInfo(mContext);
...@@ -406,24 +410,22 @@ public class AppCrashHandler implements UncaughtExceptionHandler { ...@@ -406,24 +410,22 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
// 保存文件 // 保存文件
long timetamp = System.currentTimeMillis(); long timetamp = System.currentTimeMillis();
String time = format.format(new Date()); String time = format.format(new Date());
// String fileName = "crash-" + GSAApplication.machineName + "-" + DeviceUtils.getVersionName(GSAApplication.getAppContext()) + "-" + time + "-" + timetamp + "-" + info.get("versionName") + ".xml"; String fileName = "crash-" + "-" + DeviceUtils.getVersionName(mContext) + "-" + time + "-" + timetamp + "-" + info.get("versionName") + ".xml";
// if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {//外部存储卡 if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {//外部存储卡
// try { try {
// File dir = new File(FileUtils.ERRORLOG_PATH); File dir = new File(FileUtils.ERRORLOG_PATH);
// Log.i("CrashHandler", dir.toString()); Log.i("CrashHandler", dir.toString());
// //不存在就創建目錄 //不存在就創建目錄
// if (!dir.exists()) if (!dir.exists())
// dir.mkdirs(); dir.mkdirs();
// FileOutputStream fos = new FileOutputStream(new File(FileUtils.ERRORLOG_PATH, fileName)); FileOutputStream fos = new FileOutputStream(new File(FileUtils.ERRORLOG_PATH, fileName));
// fos.write(sb.toString().getBytes()); fos.write(sb.toString().getBytes());
// fos.close(); fos.close();
// return fileName; return fileName;
// } catch (FileNotFoundException e) { } catch (IOException e) {
// e.printStackTrace(); e.printStackTrace();
// } catch (IOException e) { }
// e.printStackTrace(); }
// }
// }
return null; return null;
} }
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/time/TimeUtils.java
package com.gingersoft.gsa.cloud.base.utils.time; package com.gingersoft.gsa.cloud.base.utils.time;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
...@@ -93,6 +95,28 @@ public class TimeUtils { ...@@ -93,6 +95,28 @@ public class TimeUtils {
} }
/** /**
* 获取前n天日期、后n天日期
*
* @param distanceDay 前几天 如获取前7天日期则传-7即可；如果后7天则传7
* @return
*/
public static String getOldDate(int distanceDay) {
SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
Date beginDate = new Date();
Calendar date = Calendar.getInstance();
date.setTime(beginDate);
date.set(Calendar.DATE, date.get(Calendar.DATE) + distanceDay);
Date endDate = null;
try {
endDate = dft.parse(dft.format(date.getTime()));
} catch (ParseException e) {
e.printStackTrace();
}
return dft.format(endDate);
}
/**
* 把日期型字符串转换为数字型字符串 * 把日期型字符串转换为数字型字符串
* *
* @param time * @param time
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -281,11 +281,11 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -281,11 +281,11 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
public void onNext(@NonNull BaseResult info) { public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
mRootView.showMessage("送單成功"); mRootView.showMessage("送單成功");
printSendOrder(MyOrderManage.getInstance().getOrderFoodList());
IActivity.returnTableActivity(true); IActivity.returnTableActivity(true);
} else { } else {
mRootView.showMessage("送單失敗"); mRootView.showMessage("送單失敗");
} }
printSendOrder(MyOrderManage.getInstance().getOrderFoodList());
} }
}); });
} }
...@@ -352,10 +352,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -352,10 +352,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
mRootView.showMessage("送單成功"); mRootView.showMessage("送單成功");
// mRootView.launchActivity(new Intent(IActivity, MealStandActivity.class)); // mRootView.launchActivity(new Intent(IActivity, MealStandActivity.class));
printSendOrder(newFoods);
} else { } else {
mRootView.showMessage("送單失敗"); mRootView.showMessage("送單失敗");
} }
printSendOrder(newFoods);
} }
}); });
} }
...@@ -364,9 +364,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -364,9 +364,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
* 打印上菜紙 * 打印上菜紙
*/ */
private void printSendOrder(List<OrderDetail> newFoods) { private void printSendOrder(List<OrderDetail> newFoods) {
MyOrderManage.getInstance().setNewFoodList(newFoods);
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam("NewFoods", newFoods)
.addParam("type", 3) .addParam("type", 3)
.build() .build()
.callAsync((cc, result) -> { .callAsync((cc, result) -> {
......
user-login/src/main/AndroidManifest.xml
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".mvp.ui.activity.LoginActivity" > <activity android:name=".mvp.ui.activity.LoginActivity"
android:launchMode="singleTop">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
......
user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java
...@@ -76,8 +76,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login ...@@ -76,8 +76,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
findViewById(R.id.tv_gsa_user_login).setOnClickListener(this); findViewById(R.id.tv_gsa_user_login).setOnClickListener(this);
edAccount = findViewById(R.id.ed_login_user_account);
edPwd = findViewById(R.id.ed_login_user_pwd);
// if(GsaCloudApplication.getLoginToken(mContext).length() > 0){ // if(GsaCloudApplication.getLoginToken(mContext).length() > 0){
// jumpActivity(); // jumpActivity();
// finish(); // finish();
......
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