1、餐檯結賬沒有會員也打印二維碼 2、支付ID調整

component-login/src/main/debug/AndroidManifest.xml

@@ -18,7 +18,7 @@
         android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true">
-        <activity android:name=".mvp.ui.activity.mvp.ui.activity.WelcomeActivity">
+        <activity android:name=".mvp.ui.activity.WelcomeActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -28,19 +28,19 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".mvp.ui.activity.mvp.ui.activity.LoginActivity"
+            android:name=".mvp.ui.activity.LoginActivity"
             android:launchMode="singleTask" />
 
-        <activity android:name=".mvp.ui.activity.mvp.ui.activity.SwitchServerActivity" />
+        <activity android:name=".mvp.ui.activity.SwitchServerActivity" />
 
         <!--   HywebPOS支付頁     -->
         <activity
             android:name="com.etps.aca.lib.activity.CommandActivity"
             android:exported="true" />
 
-        <activity android:name=".mvp.ui.activity.mvp.ui.activity.ChooseRestaurantActivity" />
-        <activity android:name=".mvp.ui.activity.mvp.ui.activity.LoginOutActivity" />
-        <activity android:name=".mvp.ui.activity.mvp.ui.activity.RecoverPasswordActivity" />
+        <activity android:name=".mvp.ui.activity.ChooseRestaurantActivity" />
+        <activity android:name=".mvp.ui.activity.LoginOutActivity" />
+        <activity android:name=".mvp.ui.activity.RecoverPasswordActivity" />
 
         <meta-data
             android:name="com.gingersoft.gsa.cloud.common.config.globalconfig.GlobalConfiguration"

component-login/src/main/java/com/gingersoft/gsa/cloud/login/ComponentLogin.java

@@ -10,9 +10,9 @@ import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.component.ComponentAction;
 import com.gingersoft.gsa.cloud.component.ComponentName;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.ChooseRestaurantActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.SwitchServerActivity;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.WelcomeActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.WelcomeActivity;
 import com.gingersoft.gsa.cloud.pay.pos.hyweb.command.CommandImpl;
 
 

component-login/src/main/java/com/gingersoft/gsa/cloud/login/di/component/LoginComponent.java

@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.login.di.component;
 import dagger.BindsInstance;
 import dagger.Component;
 
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.gingersoft.gsa.cloud.login.di.module.LoginModule;
 import com.gingersoft.gsa.cloud.login.mvp.contract.LoginContract;

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/LoginInterfaceImpl.java

@@ -23,13 +23,12 @@ import com.gingersoft.gsa.cloud.login.R;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.presenter.BaseLoginPresenter;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.ChooseRestaurantActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.SwitchServerActivity;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.adapter.LoginLimitAdapter;
 import com.gingersoft.gsa.cloud.ui.utils.DialogUtils;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.ChooseRestaurantDialog;
 import com.jess.arms.base.BaseActivity;
-
 import java.util.ArrayList;
 import java.util.List;
 

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java

@@ -3,7 +3,6 @@ package com.gingersoft.gsa.cloud.login.mvp.presenter;
 import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
-
 import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.common.constans.AppConstans;
@@ -15,18 +14,15 @@ import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.contract.BaseLoginContract;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.mvp.BasePresenter;
 import com.jess.arms.utils.DeviceUtils;
 import com.jess.arms.utils.RxLifecycleUtils;
-
 import java.util.List;
-
 import javax.inject.Inject;
-
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
 import io.reactivex.schedulers.Schedulers;

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/ChooseRestaurantPresenter.java

@@ -7,7 +7,7 @@ import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.contract.ChooseRestaurantContract;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.jess.arms.di.scope.ActivityScope;
@@ -15,11 +15,8 @@ import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.mvp.BasePresenter;
 import com.jess.arms.utils.RxLifecycleUtils;
-
 import java.util.List;
-
 import javax.inject.Inject;
-
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
 import io.reactivex.schedulers.Schedulers;

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/LoginPresenter.java

@@ -7,7 +7,7 @@ import com.gingersoft.gsa.cloud.common.oaId.DeviceID;
 import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
 import com.gingersoft.gsa.cloud.login.R;
 import com.gingersoft.gsa.cloud.login.mvp.contract.LoginContract;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
+import com.gingersoft.gsa.cloud.login.mvp.ui.activity.LoginActivity;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/RecoverPasswordPresenter.java

 package com.gingersoft.gsa.cloud.login.mvp.presenter;
 
 import android.app.Application;
-
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
 import com.jess.arms.http.imageloader.ImageLoader;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 import javax.inject.Inject;
-
 import com.gingersoft.gsa.cloud.login.mvp.contract.RecoverPasswordContract;
 
 

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/ChooseRestaurantActivity.java

@@ -32,8 +32,6 @@ import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.di.module.ChooseRestaurantModule;
 import com.gingersoft.gsa.cloud.login.mvp.contract.ChooseRestaurantContract;
 import com.gingersoft.gsa.cloud.login.mvp.presenter.ChooseRestaurantPresenter;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;
-import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.WelcomeActivity;
 import com.gingersoft.gsa.cloud.login.mvp.ui.adapter.LoginLimitAdapter;
 import com.gingersoft.gsa.cloud.ui.adapter.BasTextSectiontAdapter;
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/LoginActivity.java

-package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity;
+package com.gingersoft.gsa.cloud.login.mvp.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;

component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/WelcomeActivity.java

@@ -138,10 +138,10 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
                             intent.putExtra("form", clazz.getName());
                             launchActivity(intent);
                         } else {
-                            startActivity(new Intent(mContext, com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity.class));
+                            startActivity(new Intent(mContext,LoginActivity.class));
                         }
                     } else {
-                        startActivity(new Intent(mContext, com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity.class));
+                        startActivity(new Intent(mContext, LoginActivity.class));
                     }
                 }
             }
@@ -337,7 +337,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
             //去登陸頁，設置下次不顯示引導頁
             //立即體驗
             SPUtils.put(UserConstans.IS_GUIDE, false);
-            startActivity(new Intent(mContext, com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity.class));
+            startActivity(new Intent(mContext, LoginActivity.class));
         }
     }
 }

component-login/src/main/res/layout/layout_recover_password.xml

@@ -10,7 +10,7 @@
         android:id="@+id/iv_recover_pwd_back"
         android:layout_width="wrap_content"
         android:paddingLeft="@dimen/dp_15"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         android:src="@drawable/ic_black_back"
         custom:layout_constraintLeft_toLeftOf="parent"
         custom:layout_constraintTop_toTopOf="parent" />

component-main/src/main/debug/AndroidManifest.xml

@@ -34,6 +34,7 @@
         <activity
             android:name=".mvp.ui.activity.NewMainActivity"
             android:launchMode="singleTask"
+            android:alwaysRetainTaskState="true"
             android:theme="@style/MainTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

component-main/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java

@@ -132,12 +132,9 @@ public class ComponentMain implements IComponent {
     }
 
     private void openActivity(CC cc) {
-//        Intent intent = new Intent(cc.getContext(), MainActivity.class);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//        cc.getContext().startActivity(intent);
-        CCUtil.createNavigateIntent(cc, NewMainActivity.class);
-        CC.sendCCResult(cc.getCallId(), CCResult.success());
-
+        Intent intent = new Intent(cc.getContext(), NewMainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        cc.getContext().startActivity(intent);
     }
 
 }

component-main/src/main/res/layout/activity_original_print_paper.xml

@@ -18,6 +18,6 @@
         android:id="@+id/section_kitchen_prj"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="?attr/qmui_topbar_height"/>
+        android:layout_marginTop="@dimen/head_height"/>
 
 </LinearLayout>
\ No newline at end of file

component-main/src/main/res/layout/activity_report.xml

@@ -9,7 +9,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/report_topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <com.google.android.material.tabs.TabLayout

component-main/src/main/res/layout/activity_settlement.xml

@@ -8,7 +8,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height" />
+        android:layout_height="@dimen/head_height" />
 
     <TextView
         android:id="@+id/tv_settlement_time"

component-main/src/main/res/layout/activity_settlement_report.xml

@@ -8,7 +8,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height" />
+        android:layout_height="@dimen/head_height" />
 
     <include layout="@layout/layout_settlement_report" />
 
@@ -27,7 +27,7 @@
         android:id="@+id/sv_cross_days"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:layout_marginTop="@dimen/head_height"
         android:background="@color/theme_white_color"
         android:fillViewport="true"
         android:visibility="gone">

component-main/src/main/res/layout/fragment_report_list.xml

@@ -9,7 +9,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <com.google.android.material.tabs.TabLayout

component-main/src/main/res/layout/layout_settlement_report.xml

@@ -3,7 +3,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="?attr/qmui_topbar_height"
+    android:layout_marginTop="@dimen/head_height"
     android:layout_marginBottom="@dimen/dp_45"
     android:background="@color/theme_white_color"
     android:descendantFocusability="beforeDescendants"

component-main/src/main/res/layout/main_activity_language.xml

@@ -11,7 +11,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar_language"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <androidx.recyclerview.widget.RecyclerView

component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/activity/TableManageActivity.java

@@ -109,22 +109,6 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
         if (findFragment(TableListFragment.class) == null) {
             loadRootFragment(Window.ID_ANDROID_CONTENT, TableListFragment.newInstance());
         }
-//        generateSystemAlert();
-    }
-
-    private void generateSystemAlert() {
-        //Activity Context
-        WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
-        //Application Context
-        //WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
-        final WindowManager.LayoutParams params = new WindowManager.LayoutParams();
-        params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
-        params.width = WindowManager.LayoutParams.MATCH_PARENT;
-        params.height = 500;
-        params.gravity = Gravity.CENTER;
-        final View view = LayoutInflater.from(this).inflate(R.layout.window_system_alert, null);
-        wm.addView(view, params);
     }
 
     public void initGetTableTimer() {

component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddAreaFragment.java

@@ -30,6 +30,7 @@ import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.qmuiteam.qmui.util.QMUIDisplayHelper;
 import com.qmuiteam.qmui.util.QMUIResHelper;
+import com.qmuiteam.qmui.widget.QMUITopBar;
 import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView;
 import com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView;
@@ -56,7 +57,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
 public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements AddAreaContract.View {
 
     @BindView(R2.id.topbar)
-    QMUITopBarLayout mTopBar;
+    QMUITopBar mTopBar;
     @BindView(R2.id.groupListView)
     QMUIGroupListView mGroupListView;
 

component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java

@@ -34,6 +34,7 @@ import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.qmuiteam.qmui.util.QMUIDisplayHelper;
 import com.qmuiteam.qmui.util.QMUIResHelper;
+import com.qmuiteam.qmui.widget.QMUITopBar;
 import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
 import com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView;
@@ -59,7 +60,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
 public class AddTableFragment extends BaseFragment<AddTablePresenter> implements AddTableContract.View {
 
     @BindView(R2.id.topbar)
-    QMUITopBarLayout mTopBar;
+    QMUITopBar mTopBar;
     @BindView(R2.id.groupListView)
     QMUIGroupListView mGroupListView;
 

component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AreaListFragment.java

@@ -42,6 +42,7 @@ import com.jess.arms.utils.ArmsUtils;
 import com.jess.arms.utils.KeyboardChangeHelper;
 import com.qmuiteam.qmui.alpha.QMUIAlphaFrameLayout;
 import com.qmuiteam.qmui.widget.QMUIEmptyView;
+import com.qmuiteam.qmui.widget.QMUITopBar;
 import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
@@ -75,7 +76,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
 public class AreaListFragment extends BaseFragment<AreaListPresenter> implements AreaListContract.View {
 
     @BindView(R2.id.topbar)
-    QMUITopBarLayout mTopBar;
+    QMUITopBar mTopBar;
     @BindView(R2.id.recycler_area)
     RecyclerView recycler_area;
     @BindView(R2.id.refreshLayout)

component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java

@@ -50,6 +50,7 @@ import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.qmuiteam.qmui.util.QMUIDisplayHelper;
 import com.qmuiteam.qmui.widget.QMUIEmptyView;
+import com.qmuiteam.qmui.widget.QMUITopBar;
 import com.qmuiteam.qmui.widget.QMUITopBarLayout;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
@@ -92,7 +93,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
 public class TableListFragment extends BaseFragment<TableListPresenter> implements TableListContract.View {
 
     @BindView(R2.id.topbar)
-    QMUITopBarLayout mTopBar;
+    QMUITopBar mTopBar;
     @BindView(R2.id.fl_section_layout)
     FrameLayout fl_section_layout;
     @BindView(R2.id.section_table)
@@ -145,11 +146,6 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-    }
-
-    @Override
     public View initView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_table_list, container, false);
     }

component-manager/src/main/res/layout/fragment_add_area.xml

@@ -5,16 +5,16 @@
     android:layout_height="match_parent"
     android:background="@color/theme_background_color">
 
-    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+    <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView
         android:id="@+id/groupListView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/qmui_topbar_height"/>
+        android:layout_marginTop="@dimen/head_height"/>
 
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file

component-manager/src/main/res/layout/fragment_add_table.xml

@@ -5,15 +5,16 @@
     android:layout_height="match_parent"
     android:background="@color/theme_background_color">
 
-    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+    <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height" />
+        android:layout_height="@dimen/head_height"
+        app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView
         android:id="@+id/groupListView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/qmui_topbar_height"/>
+        android:layout_marginTop="@dimen/head_height"/>
 
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file

component-manager/src/main/res/layout/fragment_area_list.xml

@@ -8,7 +8,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/qmui_topbar_height">
+        android:layout_marginTop="@dimen/head_height">
 
         <com.qmuiteam.qmui.widget.QMUIEmptyView
             android:id="@+id/emptyView"
@@ -160,10 +160,10 @@
             android:src="@drawable/add_white" />
     </com.qmuiteam.qmui.alpha.QMUIAlphaFrameLayout>
 
-    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+    <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file

component-manager/src/main/res/layout/fragment_table_list.xml

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:layout_marginTop="@dimen/head_height"
         android:background="@color/theme_background_color">
 
         <FrameLayout
@@ -106,10 +106,10 @@
         </LinearLayout>
     </RelativeLayout>
 
-    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+    <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

component-pay/src/main/res/layout/activity_pay_result.xml

@@ -10,7 +10,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         android:background="@color/theme_color"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 

component-print/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java

@@ -28,9 +28,11 @@ import com.gingersoft.gsa.cloud.print.PrintExecutor;
 import com.gingersoft.gsa.cloud.print.PrintSocketHolder;
 import com.gingersoft.gsa.cloud.print.bean.PrintContent;
 import com.gingersoft.gsa.cloud.print.bean.PrjBean;
+import com.gyf.immersionbar.ImmersionBar;
 import com.jess.arms.base.BaseActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
+import com.joe.print.R;
 import com.joe.print.di.component.DaggerPrintComponent;
 import com.joe.print.mvp.contract.PrintContract;
 import com.joe.print.mvp.presenter.PrintPresenter;
@@ -115,6 +117,15 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
     }
 
     @Override
+    public void configImmersionBar(ImmersionBar immersionBar) {
+        immersionBar
+                .fitsSystemWindows(true)
+                .statusBarColor(R.color.trans)
+                .statusBarDarkFont(true)
+                .init();
+    }
+
+    @Override
     public void initData(@Nullable Bundle savedInstanceState) {
         PrinterFlowProxy.newInstance().registerPrinterFlowListener(printerFlowListener);
     }

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java

@@ -89,6 +89,7 @@ import com.gingersoft.gsa.cloud.ui.view.PagerSlidingTabStrip;
 import com.gingersoft.gsa.cloud.ui.view.SearchKeyBoardView;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
+import com.gyf.immersionbar.ImmersionBar;
 import com.jess.arms.base.BaseFragmentActivity;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.component.AppComponent;
@@ -315,6 +316,15 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
     }
 
     @Override
+    public void configImmersionBar(ImmersionBar immersionBar) {
+        immersionBar
+                .fitsSystemWindows(true)
+                .statusBarColor(R.color.theme_white_color)
+                .statusBarDarkFont(true)
+                .init();
+    }
+
+    @Override
     public int initView(@Nullable Bundle savedInstanceState) {
         return R.layout.table_activity_meal_stand; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
     }
@@ -406,7 +416,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
         if (Rows == 0) {
             Rows = 2;
         }
-        PagerGridLayoutManager  mLayoutManager = new PagerGridLayoutManager(Rows, foodGroupColumn, PagerGridLayoutManager.HORIZONTAL);
+        PagerGridLayoutManager mLayoutManager = new PagerGridLayoutManager(Rows, foodGroupColumn, PagerGridLayoutManager.HORIZONTAL);
 
         //水平分页布局管理器
         mLayoutManager.setPageListener(this);

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderContentActivity.java

@@ -48,6 +48,7 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment;
 import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.InputTableFragment;
 import com.gingersoft.gsa.cloud.table.mvp.ui.widget.ChooseNumberDialog;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
+import com.gyf.immersionbar.ImmersionBar;
 import com.jess.arms.base.BaseFragmentActivity;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.component.AppComponent;
@@ -190,6 +191,11 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
     }
 
     @Override
+    public void configImmersionBar(ImmersionBar immersionBar) {
+        immersionBar.fitsSystemWindows(true).statusBarColor("#0E655F").init();
+    }
+
+    @Override
     public int initView(@Nullable Bundle savedInstanceState) {
         return R.layout.table_activity_order_content; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
     }

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java

@@ -54,6 +54,7 @@ import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent;
 import com.gingersoft.gsa.cloud.table.mvp.presenter.OrderPayPresenter;
 import com.gingersoft.gsa.cloud.ui.view.OrderPayView;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
+import com.gyf.immersionbar.ImmersionBar;
 import com.jess.arms.base.BaseActivity;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.component.AppComponent;
@@ -149,6 +150,11 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
     }
 
     @Override
+    public void configImmersionBar(ImmersionBar immersionBar) {
+        immersionBar.fitsSystemWindows(true).statusBarColor("#0E655F").init();
+    }
+
+    @Override
     public int initView(@Nullable Bundle savedInstanceState) {
         return R.layout.table_activity_order_pay; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
     }

component-table/src/main/res/layout/activity_order_center.xml

@@ -7,14 +7,14 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <LinearLayout
         android:id="@+id/ll_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:layout_marginTop="@dimen/head_height"
         android:orientation="vertical">
 
         <com.qmuiteam.qmui.widget.tab.QMUITabSegment

component-table/src/main/res/layout/activity_order_detail.xml

@@ -7,7 +7,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height" />
+        android:layout_height="@dimen/head_height" />
 
     <LinearLayout
         android:id="@+id/ll_bottom"
@@ -96,7 +96,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/dp_40"
-        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:layout_marginTop="@dimen/head_height"
         android:background="@color/qmui_config_color_white"
         android:fillViewport="true">
 

component-table/src/main/res/layout/table_activity_table.xml

@@ -8,7 +8,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:layout_constraintTop_toTopOf="parent"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
@@ -16,7 +16,7 @@
         android:id="@+id/rl_center_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:layout_marginTop="@dimen/head_height"
         android:background="#FFE8E8E8">
 
         <TextView

component-table/src/main/res/layout/table_dialog_cancel_food.xml

@@ -10,7 +10,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <RelativeLayout

component-table/src/main/res/layout/table_dialog_discout.xml

@@ -9,7 +9,7 @@
 <!--    <com.qmuiteam.qmui.widget.QMUITopBar-->
 <!--        android:id="@+id/topbar"-->
 <!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="?attr/qmui_topbar_height"-->
+<!--        android:layout_height="@dimen/head_height"-->
 <!--        app:qmui_topbar_title_color="@color/theme_white_color" />-->
 
     <com.qmuiteam.qmui.widget.tab.QMUITabSegment

component-table/src/main/res/layout/table_dialog_split.xml

@@ -10,7 +10,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <FrameLayout

component-webview/src/main/res/layout/activity_web.xml

@@ -9,7 +9,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <include layout="@layout/include_basic_web"/>

config.gradle

@@ -7,8 +7,8 @@ ext {
             targetSdkVersion : 29,
             //正式版:    1.0.3  3
             //內部測試版:1.2.0  20
-            versionCode      : 30,
-            versionName      : "1.3.0"
+            versionCode      : 31,
+            versionName      : "1.3.1"
     ]
 
     version = [

library-base/src/main/java/com/jess/arms/base/BaseFragment.java

@@ -160,7 +160,7 @@ public abstract class BaseFragment<P extends IPresenter> extends ImmersionFragme
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         toolbar = view.findViewById(R.id.topbar);
-        fitsLayoutOverlap();
+//        fitsLayoutOverlap();
     }
 
     private void fitsLayoutOverlap() {

library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/encryption/Aes.java

@@ -167,7 +167,7 @@ public class Aes {
      * 测试
      */
     public static void main(String[] args) {
-        String content = "abc";
+        String content = "9_472_1618887480605_4e93b91320004e49ba163deab8657caa";
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
         String encrypt = aesEncrypt(content, KEY).replaceAll("\r|\n", "");;

library-common/src/main/res/layout/activity_web.xml

@@ -9,7 +9,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
+        android:layout_height="@dimen/head_height"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
     <include layout="@layout/include_basic_web"/>

library-order/src/main/java/com/gingersoft/gsa/cloud/pay/bean/PayMethod.java

@@ -91,10 +91,12 @@ public class PayMethod implements Parcelable {
      */
     private double amountValue;
     /**
-     * 支付方式(1:寶達通 8:支付寶 1001:現金 1023:支付寶HK，1031:N5掃碼 1031：N5刷卡
+     * 支付方式(1:寶達通 8:支付寶 1001:現金 1103:支付寶HK，1031:N5掃碼 1031：N5刷卡
      */
     private int payType;
 
+    public static final int PAY_TYPE_CASH = 1103;
+    public static final int PAY_TYPE_INTEGRAL = 1105;
     /**
      * N5支付支付類型
      */
@@ -170,9 +172,6 @@ public class PayMethod implements Parcelable {
     private int payModeSize = 14;
     private int payMoneySize = 14;
 
-    public static final int PAY_TYPE_CASH = 1001;
-    public static final int PAY_TYPE_INTEGRAL = 2000;
-
 
     public PayMethod() {
     }

library-order/src/main/java/com/gingersoft/gsa/cloud/pay/contract/PayTypeContract.java

@@ -24,11 +24,11 @@ public class PayTypeContract {
      * 1033：N5美國運通
      */
 
-    public static final int PAY_METHOD_ID_1 = 1;
+    public static final int PAY_METHOD_ID_1100 = 1100;
 
-    public static final int PAY_METHOD_ID_8 = 8;
+    public static final int PAY_METHOD_ID_1101 = 1101;
 
-    public static final int PAY_METHOD_ID_1001 = 1001;
+    public static final int PAY_METHOD_ID_1103 = 1103;
 
     public static final int PAY_METHOD_ID_1021 = 1021;