Skip to content

S
supplier
Commit 476dc755 by 宁斌
Options

新增自定義日誌類型

parent 338ec9ae
Showing with 233 additions and 79 deletions
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -591,7 +591,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
showMessage("再按一次退出應用");
mExitTime = System.currentTimeMillis();
} else {
// finish();
finish();
ArmsUtils.exitApp();
// System.exit(0);
}
......
component-table/src/main/AndroidManifest.xml
......@@ -13,6 +13,8 @@
<application android:networkSecurityConfig="@xml/network_android">
<activity android:name=".mvp.ui.activity.CoordinatorlayoutActivity" />
<activity
android:name=".mvp.ui.activity.TableActivity"
android:launchMode="singleTop"
......
component-table/src/main/debug/AndroidManifest.xml
......@@ -10,6 +10,7 @@
android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_android"
android:theme="@style/AppTheme">
<activity android:name=".mvp.ui.activity.CoordinatorlayoutActivity" />
<activity
android:name=".mvp.ui.activity.orderManager.OrderDetailActivity"
android:launchMode="singleTop"/>
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/CancelOrder.java
......@@ -83,7 +83,7 @@ public class CancelOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosSuccess(VoidRespose response) {
LoganManager.w_code(TAG, "onPosSuccess: " + response.toString());
LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
if (cancelListener != null) {
cancelListener.refeshOrders();
}
......@@ -91,7 +91,7 @@ public class CancelOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosException(Exception e) {
LoganManager.w_code(TAG, "onPosException： " + e.getMessage());
LoganManager.w_order(TAG, "onPosException： " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
......@@ -109,17 +109,17 @@ public class CancelOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosInvalid(String e) {
LoganManager.w_code(TAG, "onPosInvalid: " + e);
LoganManager.w_order(TAG, "onPosInvalid: " + e);
}
@Override
public void onUpdateStatusSuccess(VoidRespose response) {
LoganManager.w_code(TAG, "onUpdateStatusSuccess: " + response.toString());
LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
}
@Override
public void onUpdateStatusError(Throwable e) {
LoganManager.w_code(TAG, "onUpdateStatusError： " + e.getMessage());
LoganManager.w_order(TAG, "onUpdateStatusError： " + e.getMessage());
if (mActivity.findFragment(PosActionStatusExceptionFragment.class) == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(datasBean.getPayTxnId());
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/RefundOrder.java
......@@ -80,7 +80,7 @@ public class RefundOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosSuccess(RefundRespose response) {
LoganManager.w_code(TAG, "onPosSuccess: " + response.toString());
LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
if(refundListener != null){
refundListener.refeshOrders();
}
......@@ -88,7 +88,7 @@ public class RefundOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosException(Exception e) {
LoganManager.w_code(TAG, "onPosException: " + e.getMessage());
LoganManager.w_order(TAG, "onPosException: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
......@@ -106,18 +106,18 @@ public class RefundOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosInvalid(String e) {
LoganManager.w_code(TAG, "onPosInvalid: " + e);
LoganManager.w_order(TAG, "onPosInvalid: " + e);
}
@Override
public void onUpdateStatusSuccess(RefundRespose response) {
LoganManager.w_code(TAG, "onUpdateStatusSuccess: " + response.toString());
LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
}
@Override
public void onUpdateStatusError(Throwable e) {
LoganManager.w_code(TAG, "onUpdateStatusError: " + e.getMessage());
LoganManager.w_order(TAG, "onUpdateStatusError: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/TipsOrder.java
......@@ -68,7 +68,7 @@ public class TipsOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosSuccess(AdjustTipRespose response) {
LoganManager.w_code(TAG, "onPosSuccess: " + response.toString());
LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
if(tipsListener != null){
tipsListener.refeshOrders();
}
......@@ -76,7 +76,7 @@ public class TipsOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosException(Exception e) {
LoganManager.w_code(TAG, "onPosException: " + e.getMessage());
LoganManager.w_order(TAG, "onPosException: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
......@@ -94,17 +94,17 @@ public class TipsOrder implements Strategy<OrderManagerResponse> {
@Override
public void onPosInvalid(String e) {
LoganManager.w_code(TAG, "onPosInvalid: " + e.toString());
LoganManager.w_order(TAG, "onPosInvalid: " + e.toString());
}
@Override
public void onUpdateStatusSuccess(AdjustTipRespose response) {
LoganManager.w_code(TAG, "onUpdateStatusSuccess: " + response.toString());
LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
}
@Override
public void onUpdateStatusError(Throwable e) {
LoganManager.w_code(TAG, "onUpdateStatusError: " + e.getMessage());
LoganManager.w_order(TAG, "onUpdateStatusError: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/table/TableAction.java
......@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.action.table;
import android.app.Activity;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.patterns.Strategy;
import lombok.Data;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
......@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.presenter;
import android.app.Activity;
import android.app.Application;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
......@@ -14,6 +15,7 @@ import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.table.TableExtBean;
import com.gingersoft.gsa.cloud.common.function.XFunctionManager;
import com.gingersoft.gsa.cloud.common.function.XFunctionViews;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.database.bean.Food;
......@@ -44,6 +46,7 @@ import com.gingersoft.gsa.cloud.table.mvp.action.table.ResetTableAction;
import com.gingersoft.gsa.cloud.table.mvp.action.table.SplitTableAction;
import com.gingersoft.gsa.cloud.table.mvp.action.table.TableAction;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.CoordinatorlayoutActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog;
......@@ -934,11 +937,13 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
@Override
public void resetTable(TableBean.DataBean tableBean) {
LoganManager.w_tableMode(TAG, mTableAction.getActionTitle() + " tableName=" + tableBean.getTableName());
initTable(tableBean.getId(), tableBean.getTableNumber(), true);
}
@Override
public void resetSkyTable(TableBean.DataBean tableBean) {
LoganManager.w_tableMode(TAG, mTableAction.getActionTitle() + " tableName=" + tableBean.getTableName());
if (tableBean.getScanId() == null) {
mRootView.showMessage(tableBean.getTableName() + "不是skyorder檯");
return;
......@@ -948,6 +953,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
@Override
public void moveTable(TableBean.DataBean tableBean) {
LoganManager.w_tableMode(TAG, mTableAction.getActionTitle() + " tableName=" + tableBean.getTableName());
// if (dataBean.getId() == tableBean.getId()) {
// CommonTipDialog.showSurpisedDialog(IActivity, "相同檯不能轉移", null, null, null, null, null);
// return;
......@@ -958,6 +964,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
@Override
public void splitTableAction(TableBean.DataBean tableBean) {
LoganManager.w_tableMode(TAG, mTableAction.getActionTitle() + " tableName=" + tableBean.getTableName());
splitTable(tableBean);
}
......@@ -1052,6 +1059,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
public void startTablePolling() {
if (mTablesPollingDisposable == null) {
LoganManager.w_tableMode(TAG, "start.....tables polling");
mTablesPollingDisposable = RxJavaUtils.polling(GoldConstants.refreshTime)
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new Consumer<Long>() {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/CoordinatorlayoutActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.table.R;
import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent;
/**
* @作者: bin
* @創建時間: 2021-02-02 11:42
* @更新時間: 2021-02-02 11:42
* @描述:
*/
public class Coordinatorlayout {
public class CoordinatorlayoutActivity extends BaseActivity {
@Override
public void setupActivityComponent(@NonNull AppComponent appComponent) {
}
@Override
public int initView(@Nullable Bundle savedInstanceState) {
return R.layout.activitiy_coordinator;
}
@Override
public void initData(@Nullable Bundle savedInstanceState) {
}
@Override
public void initIntent() {
}
@Override
public void initTopBar() {
}
@Override
public void initLanguage() {
}
@Override
public void initLayoutParams() {
}
@Override
public void initLayoutVisible() {
}
}
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
......@@ -466,7 +466,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
.callAsyncCallbackOnMainThread(new IComponentCallback() {
@Override
public void onResult(CC cc, CCResult result) {
LoganManager.w_code(TAG, "printOpenInstructionAndBill " + "是否成功：" + result.isSuccess());
LoganManager.w_tableMode(TAG, "printOpenInstructionAndBill " + "是否成功：" + result.isSuccess());
mAppManager.killActivity("PrintActivity");
}
});
......@@ -495,7 +495,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
.callAsyncCallbackOnMainThread(new IComponentCallback() {
@Override
public void onResult(CC cc, CCResult result) {
LoganManager.w_code(TAG, "printBill " + "是否成功打印：" + result.isSuccess());
LoganManager.w_tableMode(TAG, "printBill " + "是否成功打印：" + result.isSuccess());
printEndBack();
}
});
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
......@@ -11,6 +11,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.SimpleAdapter;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
......@@ -20,9 +21,11 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.GoldConstants;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.table.R;
......@@ -63,6 +66,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.LogManager;
import butterknife.BindView;
import butterknife.OnClick;
......@@ -212,18 +216,20 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@Override
public void onClick(View v) {
getTables(true, null);
LoganManager.w_tableMode(TAG, "手動刷新餐檯數據");
launchActivity(new Intent(mContext, CoordinatorlayoutActivity.class));
// getTables(true, null);
}
});
rightButton2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LoganManager.w_tableMode(TAG, "跳轉數據下載頁");
CC.obtainBuilder(ComponentName.COMPONENT_DOWNLOAD)
.setActionName("showDownloadActivity")
.addParam("fromPage", 2)
.build()
.call();
// LoganManager.uploadLog(mContext, true);
}
});
mTopBar.setTitle("餐檯模式");
......@@ -315,9 +321,11 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
public void longClickSkyorder() {
boolean state = mPresenter.setSkyorderMode();
if (state) {
LoganManager.w_tableMode(TAG, "長按鎖定Skyorder模式");
mTopBar.setTitle("打印skyorder");
mPresenter.openSkyorderMode();
} else {
LoganManager.w_tableMode(TAG, "長按解鎖Skyorder模式");
canceTableAction();
}
setLockVisibility(state);
......@@ -326,6 +334,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@OnClick(R2.id.rl_skyorder)
public void clickSkyorder() {
LoganManager.w_tableMode(TAG, "點擊Skyorder按鈕");
TableAction tableAction = mPresenter.getTableActionByClass(PrintSkyorderAction.class);
if (tableAction != null) {
mPresenter.setTableAction(tableAction);
......@@ -340,6 +349,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@Override
public void setCurrentTableAction(TableAction action) {
LoganManager.w_tableMode(TAG, "點擊" + action.getActionTitle() + "操作");
btn_cancel_operat.setVisibility(View.VISIBLE);
ll_table_operat_content.setVisibility(View.VISIBLE);
// rv_bottom_function.setVisibility(View.INVISIBLE);
......@@ -359,6 +369,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@Override
public void canceTableAction() {
LoganManager.w_tableMode(TAG, "餐檯操作");
btn_cancel_operat.setVisibility(View.INVISIBLE);
ll_table_operat_content.setVisibility(View.INVISIBLE);
// rv_bottom_function.setVisibility(View.VISIBLE);
......@@ -439,7 +450,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
}
});
} else {
setCenterContentMarginBottom(QMUIDisplayHelper.dp2px(this,60));
setCenterContentMarginBottom(QMUIDisplayHelper.dp2px(this, 60));
}
}
......@@ -555,6 +566,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@Override
public void onTabSelected(int index) {
LoganManager.w_tableMode(TAG, "當前頁面【" + mTabTitles[index] + "】");
switch (index) {
case 0:
//setBottomFunctionVisibility(false);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/AllOrderFragment.java
......@@ -10,9 +10,7 @@ import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2;
......@@ -21,7 +19,6 @@ import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager.AllOrderPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration;
import com.google.gson.JsonIOException;
import com.google.gson.JsonParseException;
import com.jess.arms.base.BaseFragment;
......@@ -32,16 +29,11 @@ import com.qmuiteam.qmui.widget.QMUIEmptyView;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import org.json.JSONException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.List;
import butterknife.BindView;
import butterknife.OnClick;
import static com.jess.arms.utils.Preconditions.checkNotNull;
......
component-table/src/main/res/layout/activitiy_coordinator.xml
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="100dp"
android:background="#222222"
android:gravity="center"
android:text="该区域可折叠"
android:textColor="@android:color/white"
android:textSize="30sp"
app:layout_scrollFlags="scroll" />
<TextView
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="#DD012D"
android:gravity="center"
android:text="该区域为上滑至头部固定区域"
android:textColor="@android:color/white"
android:textSize="20sp" />
</com.google.android.material.appbar.AppBarLayout>
<!-- <com.google.android.material.bottomappbar.BottomAppBar-->
<!-- android:id="@+id/bar"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="bottom"-->
<!-- android:fitsSystemWindows="true"/>-->
<!-- <com.google.android.material.floatingactionbutton.FloatingActionButton-->
<!-- android:id="@+id/fab"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:layout_anchor="@+id/bar"-->
<!-- app:srcCompat="@drawable/ic_account"/>-->
<!-- <FrameLayout-->
<!-- android:id="@+id/bottom_drawer"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:elevation="16dp"-->
<!-- app:behavior_hideable="true"-->
<!-- app:layout_behavior="@string/bottom_sheet_behavior">-->
<!-- <com.google.android.material.navigation.NavigationView-->
<!-- android:id="@+id/navigation_view"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content" />-->
<!-- </FrameLayout>-->
</androidx.coordinatorlayout.widget.CoordinatorLayout>
component-table/src/main/res/layout/table_dialog_cancel_food.xml
......@@ -79,7 +79,7 @@
android:id="@+id/slider_food_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme"
android:theme="@style/ThemeOverlay.PrimaryPalette.Red"
android:valueFrom="0"
android:valueTo="11"
android:stepSize="1" />
......
component-table/src/main/res/values/styles.xml
......@@ -8,5 +8,8 @@
<item name="colorAccent">@color/table_colorAccent</item>
</style>
<style name="ThemeOverlay.PrimaryPalette.Red" parent="">
<item name="colorPrimary">#e53935</item>
<item name="colorPrimaryDark">#ab000d</item>
</style>
</resources>
config.gradle
......@@ -39,6 +39,7 @@ ext {
"cardview-v7" : 'androidx.cardview:cardview:1.0.0',
"annotations" : 'androidx.annotation:annotation:1.0.0',
"recyclerview-v7" : 'androidx.recyclerview:recyclerview:1.0.0',
"coordinatorlayout" : 'androidx.coordinatorlayout:coordinatorlayout:1.1.0',
//network
"retrofit" : "com.squareup.retrofit2:retrofit:${version["retrofitSdkVersion"]}",
......
library-common/build.gradle
......@@ -128,7 +128,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'com.android.support:design:28.0.0'
// implementation 'com.android.support:design:28.0.0'
implementation 'com.gcssloop.recyclerview:pagerlayoutmanager:2.3.8'
//陰影背景
api 'com.github.lihangleo2:ShadowLayout:2.1.6'
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/config/globalconfig/applyOptions/MyGlobalHttpHandler.java
......@@ -14,6 +14,7 @@ public class MyGlobalHttpHandler implements GlobalHttpHandler {
public Response onHttpResultResponse(String httpResult, Interceptor.Chain chain, Response response) {
// 统一处理http响应。eg:状态码不是200时，根据状态码做相应的处理。
LoganManager.w_network("接收請求: " + httpResult);
return response;
}
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/restaurant/RestaurantInfoManager.java
......@@ -31,10 +31,10 @@ public class RestaurantInfoManager {
if (restaurantInfo == null) {
restaurantInfo = new RestaurantInfo();
}
brandInfo.setBrandId((Integer) SPUtils.get(UserConstans.brandId, 1));
brandInfo.setBrandId((Integer) SPUtils.get(UserConstans.brandId, 0));
brandInfo.setBrandName((String) SPUtils.get(UserConstans.brandName, ""));
restaurantInfo.setGsPosShopId((String) SPUtils.get(UserConstans.gsPosShopId, "-1"));
restaurantInfo.setRestaurantId((Integer) SPUtils.get(UserConstans.restaurantId, 26));
restaurantInfo.setRestaurantId((Integer) SPUtils.get(UserConstans.restaurantId, 0));
restaurantInfo.setRestaurantName((String) SPUtils.get(UserConstans.restaurantName, ""));
}
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/logan/LoganManager.java
......@@ -26,7 +26,6 @@ public class LoganManager {
private static final String TAG = LoganManager.class.getSimpleName();
public static void w_code(String TAG, String log) {
Logan.w(log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
......@@ -42,15 +41,7 @@ public class LoganManager {
//網絡日誌比較重要立即寫入本地
// Logan.f();
if (BuildConfig.DEBUG) {
printLog("Network", log);
}
}
public static void w_database(String TAG,String log) {
Logan.w("database-->"+log, LoganConfig.CODE_LEVLE);
// Logan.f();
if (BuildConfig.DEBUG) {
printLog(TAG, log);
printLog("network", log);
}
}
......@@ -61,12 +52,6 @@ public class LoganManager {
printLog("AppCrashHandler", log);
}
public static void w_printer(String TAG,String log) {
Logan.w("printer-->"+log, LoganConfig.CODE_LEVLE);
// Logan.f();
printLog(TAG, log);
}
public static void w_H5(String log) {
Logan.w(log, LoganConfig.H5_LEVLE);
}
......@@ -75,6 +60,41 @@ public class LoganManager {
Logan.w(log, LoganConfig.native_LEVLE);
}
/*******************************自定義業務日誌類型**************************************/
private static final String DATABASE_BUSINESS_TAG = "database-> ";
private static final String PRINTER_BUSINESS_TAG = "printer-> ";
private static final String TABLEMODE_BUSINESS_TAG = "tableMode-> ";
private static final String ORDER_BUSINESS_TAG = "order-> ";
private static final String PAY_BUSINESS_TAG = "pay-> ";
public static void w_database(String TAG, String log) {
Logan.w(DATABASE_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
if (BuildConfig.DEBUG) {
printLog(TAG, log);
}
}
public static void w_printer(String TAG, String log) {
Logan.w(PRINTER_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
}
public static void w_tableMode(String TAG, String log) {
Logan.w(TABLEMODE_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
}
public static void w_order(String TAG, String log) {
Logan.w(ORDER_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
}
public static void w_pay(String TAG, String log) {
Logan.w(PAY_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
}
private static void printLog(String TAG, String log) {
if (BuildConfig.DEBUG) {
LogUtil.d(TAG, log);
......@@ -85,7 +105,7 @@ public class LoganManager {
* 上傳日誌到服務器
*/
public static void uploadLog(Context context, boolean showToast) {
String memberId = UserContext.newInstance().getMemberName() + "_" + UserContext.newInstance().getMemberId();
String memberId = UserContext.newInstance().getMemberName() + "_" + UserContext.newInstance().getMemberId();
String deviceId = DeviceUtils.getDeviceId(GsaCloudApplication.getAppContext());
String AppVersion = DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()) + "_" + DeviceUtils.getVersionCode(GsaCloudApplication.getAppContext());
String BuildVersion = android.os.Build.VERSION.RELEASE + "";
......@@ -106,7 +126,7 @@ public class LoganManager {
}
}
});
LoganManager.w_code(TAG,"上傳日誌到服務器: " + statusCode + ", details: " + resultData);
LoganManager.w_code(TAG, "上傳日誌到服務器: " + statusCode + ", details: " + resultData);
}
});
}
......
library-common/src/main/res/values-v21/styles.xml
......@@ -2,7 +2,9 @@
<resources>
<style name="AppTheme" parent="PublicTheme">
<!-- 頂部標題theme -->
<item name="QMUITopBarStyle">@style/QDTopBar</item>
<!-- TabItem theme -->
<item name="QMUITabSegmentStyle">@style/QMUITabSegmentStyle</item>
</style>
......
library-common/src/main/res/values/styles.xml
......@@ -19,7 +19,9 @@
<!-- <item name="QMUITabSegmentStyle">@style/QMUITabSegmentStyle</item>-->
<!-- </style>-->
<style name="PublicTheme" parent="QMUI.Compat.NoActionBar">
<!-- 必須配置app自己的theme -->
<item name="app_primary_color">?attr/qmui_config_color_blue</item>
<item name="app_content_bg_color">@color/qmui_config_color_white</item>
......@@ -360,6 +362,7 @@
<item name="android:layout_height">@dimen/button_height</item>
<item name="android:background">@drawable/shape_app_btn</item>
</style>
<style name="app_small_btn_style">
<item name="android:textSize">@dimen/dp_14</item>
<item name="android:textColor">@color/white</item>
......@@ -423,6 +426,7 @@
<item name="android:textColor">@color/color_3c</item>
<item name="android:background">@null</item>
</style>
<style name="AppEditTextStyle_333">
<item name="android:textColorHint">@color/hint_color</item>
<item name="android:textSize">@dimen/dp_16</item>
......@@ -430,6 +434,7 @@
<item name="android:textColor">@color/theme_333_color</item>
<item name="android:background">@null</item>
</style>
<style name="otherOrder_delivery_setting_layout_style">
<item name="android:paddingRight">@dimen/dp_20</item>
</style>
......
library-database/src/main/java/com/gingersoft/gsa/cloud/database/utils/ComboItemDaoUtils.java
......@@ -170,7 +170,7 @@ public class ComboItemDaoUtils {
// }
if (fid > 0) {
sql = sql + " where r.FID='" + fid + "' order by c.SEQ_NO,f.CREATE_TIME desc";
sql = sql + " where r.FID='" + fid + "' order by c.COM_ID,f.CREATE_TIME desc";
}
Cursor c = mManager.getDaoSession().getFoodDao().getDatabase().rawQuery(sql, null);
while (c.moveToNext()) {
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/command/CommandImpl.java
......@@ -48,7 +48,7 @@ public class CommandImpl implements ICommand {
@Override
public void onRequest(Context context, String request) {
LoganManager.w_code(TAG, "onRequest : " + request);
LoganManager.w_pay(TAG, "onRequest : " + request);
try {
JSONObject msgObj = new JSONObject(request);
......@@ -83,7 +83,7 @@ public class CommandImpl implements ICommand {
@Override
public void onResponse(Context context, String response) {
LoganManager.w_code(TAG, "onResponse : " + response);
LoganManager.w_pay(TAG, "onResponse : " + response);
AppManager appManager = ArmsUtils.obtainAppComponentFromContext(context).appManager();
//kill掉hyweb支付頁
......@@ -142,7 +142,7 @@ public class CommandImpl implements ICommand {
*/
private void returnLastActivity(Context context, Activity currentActivity) {
if (currentActivity != null) {
LoganManager.w_code(TAG, "currentActivity : " + currentActivity.getClass().getName());
LoganManager.w_pay(TAG, "currentActivity : " + currentActivity.getClass().getName());
//返回上次操作的頁面
Intent intent = new Intent();
intent.setComponent(currentActivity.getComponentName());
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/imp/RefundActionImpl.java
......@@ -138,7 +138,7 @@ public class RefundActionImpl extends IPosAction<RefundRespose> {
@Override
public void onNext(String result) {
LoganManager.w_code(TAG, "RefundResponse onNext :" + result);
LoganManager.w_pay(TAG, "RefundResponse onNext :" + result);
if (!TextUtils.isEmpty(result)) {
BaseResult baseResult = GsonUtils.GsonToBean(result, BaseResult.class);
......@@ -158,7 +158,7 @@ public class RefundActionImpl extends IPosAction<RefundRespose> {
@Override
public void onError(Throwable e) {
LoganManager.w_code(TAG, "RefundResponse onError :" + e.getMessage());
LoganManager.w_pay(TAG, "RefundResponse onError :" + e.getMessage());
onUpdateStatusError(new Exception(e.getMessage()));
}
......@@ -197,7 +197,7 @@ public class RefundActionImpl extends IPosAction<RefundRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(posMatter));
String json = GsonUtils.GsonString(posMatter);
LoganManager.w_code(TAG, "RefundRequest JSON :" + json);
LoganManager.w_pay(TAG, "RefundRequest JSON :" + json);
return requestBody;
}
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/imp/RetrievalActionImpl.java
......@@ -129,7 +129,7 @@ public class RetrievalActionImpl extends IPosAction<RetrievalRespose> {
@Override
public void onNext(String result) {
LoganManager.w_code(TAG, "RetrievalResponse onNext :" + result);
LoganManager.w_pay(TAG, "RetrievalResponse onNext :" + result);
if (!TextUtils.isEmpty(result)) {
BaseResult baseResult = GsonUtils.GsonToBean(result, BaseResult.class);
......@@ -149,7 +149,7 @@ public class RetrievalActionImpl extends IPosAction<RetrievalRespose> {
@Override
public void onError(Throwable e) {
LoganManager.w_code(TAG, "RetrievalResponse onError :" + e.getMessage());
LoganManager.w_pay(TAG, "RetrievalResponse onError :" + e.getMessage());
}
@Override
......@@ -194,7 +194,7 @@ public class RetrievalActionImpl extends IPosAction<RetrievalRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(mealOrderPayRequest));
String json = GsonUtils.GsonString(mealOrderPayRequest);
LoganManager.w_code(TAG, "SaleRequest JSON :" + json);
LoganManager.w_pay(TAG, "SaleRequest JSON :" + json);
return requestBody;
}
......@@ -208,7 +208,7 @@ public class RetrievalActionImpl extends IPosAction<RetrievalRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(posMatter));
String json = GsonUtils.GsonString(posMatter);
LoganManager.w_code(TAG, "RefundRequest JSON :" + json);
LoganManager.w_pay(TAG, "RefundRequest JSON :" + json);
return requestBody;
}
......@@ -226,7 +226,7 @@ public class RetrievalActionImpl extends IPosAction<RetrievalRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(posMatter));
String json = GsonUtils.GsonString(posMatter);
LoganManager.w_code(TAG, "VoidRequest JSON :" + json);
LoganManager.w_pay(TAG, "VoidRequest JSON :" + json);
return requestBody;
}
......@@ -241,7 +241,7 @@ public class RetrievalActionImpl extends IPosAction<RetrievalRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(posMatter));
String json = GsonUtils.GsonString(posMatter);
LoganManager.w_code(TAG, "TipRequest JSON :" + json);
LoganManager.w_pay(TAG, "TipRequest JSON :" + json);
return requestBody;
}
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/imp/SaleActionImpl.java
......@@ -179,7 +179,7 @@ public class SaleActionImpl extends IPosAction<SaleRespose> {
@Override
public void onNext(String result) {
LoganManager.w_code(TAG, "SaleResponse onNext :" + result);
LoganManager.w_pay(TAG, "SaleResponse onNext :" + result);
if (!TextUtils.isEmpty(result)) {
BaseResult baseResult = GsonUtils.GsonToBean(result, BaseResult.class);
......@@ -200,7 +200,7 @@ public class SaleActionImpl extends IPosAction<SaleRespose> {
@Override
public void onError(Throwable e) {
LoganManager.w_code(TAG, "SaleResponse onError :" + e.getMessage());
LoganManager.w_pay(TAG, "SaleResponse onError :" + e.getMessage());
}
@Override
......@@ -273,7 +273,7 @@ public class SaleActionImpl extends IPosAction<SaleRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(mMealOrderPayRequest));
String json = GsonUtils.GsonString(mMealOrderPayRequest);
LoganManager.w_code(TAG, "SaleRequest JSON :" + json);
LoganManager.w_pay(TAG, "SaleRequest JSON :" + json);
return requestBody;
}
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/imp/TipsActionImpl.java
......@@ -146,7 +146,7 @@ public class TipsActionImpl extends IPosAction<AdjustTipRespose> {
@Override
public void onNext(String result) {
LoganManager.w_code(TAG, "TipResponse onNext :" + result);
LoganManager.w_pay(TAG, "TipResponse onNext :" + result);
if (!TextUtils.isEmpty(result)) {
BaseResult baseResult = GsonUtils.GsonToBean(result, BaseResult.class);
......@@ -167,7 +167,7 @@ public class TipsActionImpl extends IPosAction<AdjustTipRespose> {
@Override
public void onError(Throwable e) {
LoganManager.w_code(TAG, "TipResponse onError :" + e.getMessage());
LoganManager.w_pay(TAG, "TipResponse onError :" + e.getMessage());
}
@Override
......@@ -206,7 +206,7 @@ public class TipsActionImpl extends IPosAction<AdjustTipRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(posMatter));
String json = GsonUtils.GsonString(posMatter);
LoganManager.w_code(TAG, "TipRequest JSON :" + json);
LoganManager.w_pay(TAG, "TipRequest JSON :" + json);
return requestBody;
}
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/imp/VoidActionImpl.java
......@@ -140,7 +140,7 @@ public class VoidActionImpl extends IPosAction<VoidRespose> {
@Override
public void onNext(String result) {
LoganManager.w_code(TAG, "VoidResponse onNext :" + result);
LoganManager.w_pay(TAG, "VoidResponse onNext :" + result);
if (!TextUtils.isEmpty(result)) {
BaseResult baseResult = GsonUtils.GsonToBean(result, BaseResult.class);
......@@ -160,7 +160,7 @@ public class VoidActionImpl extends IPosAction<VoidRespose> {
@Override
public void onError(Throwable e) {
LoganManager.w_code(TAG, "VoidResponse onError :" + e.getMessage());
LoganManager.w_pay(TAG, "VoidResponse onError :" + e.getMessage());
}
@Override
......@@ -198,7 +198,7 @@ public class VoidActionImpl extends IPosAction<VoidRespose> {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(posMatter));
String json = GsonUtils.GsonString(posMatter);
LoganManager.w_code(TAG, "VoidRequest JSON :" + json);
LoganManager.w_pay(TAG, "VoidRequest JSON :" + json);
return requestBody;
}
......
library-qm-qmui/src/main/res/values/qmui_themes.xml
......@@ -427,6 +427,8 @@
<item name="windowNoTitle">true</item>
</style>
<!-- <style name="QMUI.Compat.NoActionBar" parent="QMUI.NoActionBar" />-->
<style name="QMUI.Compat.NoActionBar" parent="QMUI.NoActionBar" />
<!-- ListView Start -->
......
library-ui/build.gradle
......@@ -73,4 +73,5 @@ dependencies {
api rootProject.ext.dependencies["butterknife"]
kapt rootProject.ext.dependencies["butterknife-compiler"]
api rootProject.ext.dependencies["xpopup"]
api rootProject.ext.dependencies["coordinatorlayout"]
}
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