Merge remote-tracking branch 'origin/master'

# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	print-module/src/main/java/com/joe/print/mvp/print/Print.java
#	user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java

download-data/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
 
     <application>
         <activity android:name=".mvp.ui.activity.DownloadActivity"/>
-
         <!-- arms配置 -->
         <meta-data
             android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"

download-data/src/main/java/com/gingersoft/gsa/cloud/download/ComponentDownload.java

@@ -11,12 +11,17 @@ import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
 import com.gingersoft.gsa.cloud.download.mvp.ui.activity.DownloadActivity;
+import com.jess.arms.integration.AppManager;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 
 public class ComponentDownload implements IComponent {
 
+    @Inject
+    AppManager mAppManager;
 
     @Override
     public String getName() {

download-data/src/main/java/com/gingersoft/gsa/cloud/download/mvp/presenter/DownloadPresenter.java

@@ -263,13 +263,11 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
     }
 
     private void endDownReturn() {
-        mRootView.showMessage("跳轉到首頁");
         CC.obtainBuilder("Component.Main")
                 .setActionName("showMainActivity")
                 .build()
                 .call();
         mRootView.killMyself();
-
     }
 
     public void initDataDownItem() {

main/src/main/AndroidManifest.xml

@@ -2,8 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.gingersoft.gsa.cloud.main">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application>
         <activity android:name=".mvp.ui.activity.NewMainActivity"/>
         <activity android:name=".mvp.ui.activity.MainActivity"/>
+        <!-- arms配置 -->
+        <meta-data
+            android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
+            android:value="ConfigModule" />
     </application>
 </manifest>

main/src/main/debug/AndroidManifest.xml

@@ -23,12 +23,12 @@
         <activity
             android:name=".mvp.ui.activity.NewMainActivity"
             android:theme="@style/MainTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.VIEW" />
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <meta-data

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

 package com.gingersoft.gsa.cloud.main;
 
+import android.content.Intent;
+
 import com.billy.cc.core.component.CC;
 import com.billy.cc.core.component.CCResult;
 import com.billy.cc.core.component.CCUtil;
@@ -72,8 +74,11 @@ public class ComponentMain implements IComponent {
     }
 
     private void openActivity(CC cc) {
-        CCUtil.navigateClearTopTo(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);
+//        CCUtil.createNavigateIntent(cc, MainActivity.class);
+//        CC.sendCCResult(cc.getCallId(), CCResult.success());
     }
 
 }

main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java

@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
 import android.app.Application;
 import android.content.Intent;
 
+import com.billy.cc.core.component.CC;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
 import com.jess.arms.integration.AppManager;

main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java

@@ -18,10 +18,13 @@ 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.view.SlidingMenu;
-import com.gingersoft.gsa.cloud.ui.view.utils.ShadowUtil;
+import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
+import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem;
+import com.gingersoft.gsa.cloud.ui.widget.dialog.ChooseRestaurantDialog;
 import com.jess.arms.base.BaseActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
+import com.sxu.shadowdrawable.ShadowDrawable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -82,6 +85,11 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
     }
 
     @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
     public int initView(@Nullable Bundle savedInstanceState) {
         return R.layout.activity_new_main; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
     }
@@ -90,9 +98,8 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
     public void initData(@Nullable Bundle savedInstanceState) {
         initShadow();
         initFuncationData();
-//        tvRestaurantName.setText(GsaCloudApplication.get);
-        tvUserName.setText(GsaCloudApplication.getMemberName(mContext));
 
+        setTopInfo();
     }
 
     private void initShadow() {
@@ -165,6 +172,43 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
         rvStaffManagement.setAdapter(staffAdapter);
     }
 
+    private void setTopInfo() {
+        String restaurantName = GsaCloudApplication.getRestaurantName(this);
+        String memberName = GsaCloudApplication.getMemberName(this);
+        if (!TextUtils.isEmpty(restaurantName)) {
+            tvRestaurantName.setText(restaurantName);
+        }
+        if (!TextUtils.isEmpty(memberName)) {
+            tvUserName.setText(memberName);
+        }
+    }
+
+    private void showChooseRestaurantDialog() {
+        String brandRestaurantInfos = GsaCloudApplication.getBrandRestaurantInfos(this);
+        if (!TextUtils.isEmpty(brandRestaurantInfos)) {
+            List<LoginBean.DataBean.UserBean.BrandsBean> brandsBeans = JsonUtils.parseArray(brandRestaurantInfos, LoginBean.DataBean.UserBean.BrandsBean.class);
+            if (brandsBeans != null && brandsBeans.size() > 0) {
+                new ChooseRestaurantDialog.BottomListSheetBuilder(this)
+                        .addBrandItems(brandsBeans)
+                        .setOnItemClickListener(new ChooseRestaurantDialog.BottomListSheetBuilder.OnItemClickListener() {
+
+                            @Override
+                            public void onItemClick(ChooseRestaurantDialog dialog, SectionTextItem item, int position) {
+                                GsaCloudApplication.setRestaurantId(NewMainActivity.this, item.getId());
+                                GsaCloudApplication.setRestaurantName(NewMainActivity.this, item.getText());
+                                setTopInfo();
+                                CC.obtainBuilder("Component.Download")
+                                        .setActionName("showDownloadActivity")
+                                        .build()
+                                        .call();
+                                dialog.dismiss();
+                            }
+                        })
+                        .build()
+                        .show();
+            }
+        }
+    }
 
     @Override
     public void initIntent() {
@@ -231,8 +275,10 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
         if (v.getId() == R.id.layout_login_out) {
             //登出
             mPresenter.loginOut();
-        } else if(v.getId() == R.id.iv_personal_center){
+        } else if (v.getId() == R.id.iv_personal_center) {
             slideMenu.toggle();
+        } else if (v.getId() == R.id.tv_restaurant_name) {
+            showChooseRestaurantDialog();
         }
     }
 

main/src/main/res/layout/activity_new_main.xml

@@ -196,9 +196,10 @@
                 <TextView
                     android:id="@+id/tv_restaurant_name"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:text="店鋪名稱"
                     android:textColor="@color/white"
+                    android:gravity="center"
                     android:textSize="@dimen/sp_18"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"

public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java

@@ -58,7 +58,7 @@ public class GsaCloudApplication extends BaseApplication {
         LogConfiguration config = new LogConfiguration.Builder()
                 .logLevel(BuildConfig.DEBUG ? LogLevel.ALL             // 指定日志级别，低于该级别的日志将不会被打印，默认为 LogLevel.ALL
                         : LogLevel.NONE)
-                .tag("GSA_TAG")                                         // 指定 TAG，默认为 "X-LOG"
+                .tag("GSA_Cloud_TAG")                                         // 指定 TAG，默认为 "X-LOG"
                 .addInterceptor(new BlacklistTagsFilterInterceptor(    // 添加黑名单 TAG 过滤器
                         "blacklist1", "blacklist2", "blacklist3"))
                 .build();
@@ -111,6 +111,18 @@ public class GsaCloudApplication extends BaseApplication {
         return (int) SPUtils.get(context, UserConstans.restaurantId, 0);
     }
 
+    public static String getRestaurantName(Context context) {
+        return (String) SPUtils.get(context, UserConstans.restaurantName, "");
+    }
+
+    public static String getMemberName(Context context) {
+        return (String) SPUtils.get(context, UserConstans.memberName, "");
+    }
+
+    public static String getBrandRestaurantInfos(Context context) {
+        return (String) SPUtils.get(context, UserConstans.brandRestaurantInfos, "");
+    }
+
     public static void setLoginToken(Context context, String token) {
         SPUtils.put(context, UserConstans.token, token);
     }
@@ -119,10 +131,6 @@ public class GsaCloudApplication extends BaseApplication {
         SPUtils.put(context, UserConstans.memberId, memberId);
     }
 
-    public static String getMemberName(Context context) {
-        return (String) SPUtils.get(context, UserConstans.memberName, "");
-    }
-
     public static void setMemberName(Context context, String memberName) {
         SPUtils.put(context, UserConstans.memberName, memberName);
     }
@@ -130,4 +138,12 @@ public class GsaCloudApplication extends BaseApplication {
     public static void setRestaurantId(Context context, int restaurantId) {
         SPUtils.put(context, UserConstans.restaurantId, restaurantId);
     }
+    public static void setRestaurantName(Context context, String restaurantName) {
+        SPUtils.put(context, UserConstans.restaurantName, restaurantName);
+    }
+    public static void setBrandRestaurantInfos(Context context, String brandRestaurantIds) {
+        SPUtils.put(context, UserConstans.brandRestaurantInfos, brandRestaurantIds);
+    }
+
+
 }

public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/constans/UserConstans.java

@@ -9,7 +9,11 @@ public class UserConstans {
     public static String memberName = "member_name";
 
     public static String token = "user_token";
+    /**當前餐檯ID,名稱*/
     public static String restaurantId = "restaurant_id";
+    public static String restaurantName = "restaurant_name";
+    /**當前賬號下所有餐檯品牌Json*/
+    public static String brandRestaurantInfos = "brand_restaurant_infos";
 
     //平板登录状态
     public static String FLATBED_LOGIN_STATUS = "flatbed_login_status";

public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/file/FileUtils.java

@@ -29,7 +29,7 @@ import java.io.InputStreamReader;
  */
 public class FileUtils {
 
-    public static String FirstFolder = "GsAndroid";//一级目录
+    public static String FirstFolder = "GsaCloud";//一级目录
     public static String file = "file";//文件文件夹
     public static String Image = "image";//图片文件夹
     public static String Log = "xLog";//日志存储

public-base/src/main/java/com/gingersoft/gsa/cloud/ui/bean/mode/LoginBean.java

@@ -170,6 +170,23 @@ public class LoginBean {
                     public void setRestaurantName(String restaurantName) {
                         this.restaurantName = restaurantName;
                     }
+
+                    @Override
+                    public String toString() {
+                        return "RestaurantsBean{" +
+                                "restaurantId=" + restaurantId +
+                                ", restaurantName='" + restaurantName + '\'' +
+                                '}';
+                    }
+                }
+
+                @Override
+                public String toString() {
+                    return "BrandsBean{" +
+                            "brandId=" + brandId +
+                            ", brandName='" + brandName + '\'' +
+                            ", restaurants=" + restaurants +
+                            '}';
                 }
             }
         }

public-base/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/ChooseRestaurantDialog.java

@@ -281,9 +281,8 @@ public class ChooseRestaurantDialog extends Dialog {
                         if (viewHolder.getTvName().getText() != null) {
                             SectionTextItem item = viewHolder.getSectionTextItem(position);
                             if (mOnItemClickListener != null) {
-                                mOnItemClickListener.onItemClick(item, position);
+                                mOnItemClickListener.onItemClick(mDialog,item, position);
                             }
-                            mDialog.dismiss();
                         }
                     } else {
                         //點擊的頭部，折疊
@@ -343,7 +342,7 @@ public class ChooseRestaurantDialog extends Dialog {
 
         public interface OnItemClickListener {
 
-            void onItemClick(SectionTextItem item, int position);
+            void onItemClick(ChooseRestaurantDialog dialog,SectionTextItem item, int position);
 
         }
     }

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

@@ -4,12 +4,30 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.qmuiteam.qmui.widget.QMUITopBar
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/qmui_topbar_height"
+        app:qmui_topbar_title_color="@color/theme_white_color" />
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/rv_bottom_function"
         android:layout_marginTop="?attr/qmui_topbar_height">
 
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/vp_table_type"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="?attr/qmui_topbar_height" />
+
+        <com.gingersoft.gsa.cloud.ui.view.PagerSlidingTabStrip
+            android:id="@+id/pts_table_type"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/qmui_topbar_height"
+            android:background="@color/theme_white_color" />
+
         <LinearLayout
             android:id="@+id/ll_table_operat_content"
             android:layout_width="match_parent"
@@ -39,44 +57,26 @@
                 android:textColor="@color/theme_white_color"
                 android:textSize="@dimen/font_normal3" />
         </LinearLayout>
-
-        <androidx.viewpager.widget.ViewPager
-            android:id="@+id/vp_table_type"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="?attr/qmui_topbar_height" />
-
-        <com.gingersoft.gsa.cloud.ui.view.PagerSlidingTabStrip
-            android:id="@+id/pts_table_type"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/qmui_topbar_height"
-            android:background="@color/theme_white_color" />
     </RelativeLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_bottom_function"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_gravity="bottom"
+        android:layout_alignParentBottom="true"
         android:background="@color/theme_white_color"
         android:orientation="horizontal"
         android:padding="1dp" />
 
-    <com.qmuiteam.qmui.layout.QMUIButton
-        android:id="@+id/btn_cancel_operat"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_48"
-        android:layout_alignParentBottom="true"
-        android:background="@color/theme_grey_color"
-        android:text="取消"
-        android:textColor="@color/theme_white_color"
-        android:visibility="invisible" />
-
-    <com.qmuiteam.qmui.widget.QMUITopBar
-        android:id="@+id/topbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"
-        app:qmui_topbar_title_color="@color/theme_white_color" />
+        <com.qmuiteam.qmui.layout.QMUIButton
+            android:id="@+id/btn_cancel_operat"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            android:textColor="@color/theme_white_color"
+            android:background="@color/theme_grey_color"
+            android:layout_alignParentBottom="true"
+            android:visibility="invisible"
+            android:text="取消" />
 
 </RelativeLayout>
\ No newline at end of file

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

@@ -8,18 +8,19 @@ import android.view.View;
 import com.billy.cc.core.component.CC;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
-import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
-import com.gingersoft.gsa.cloud.ui.view.MyEditText;
+import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.ChooseRestaurantDialog;
 import com.gingersoft.gsa.cloud.user.login.R;
 import com.gingersoft.gsa.cloud.user.login.R2;
 import com.gingersoft.gsa.cloud.user.login.di.component.DaggerLoginComponent;
-import com.gingersoft.gsa.cloud.user.login.mvp.contract.LoginContract;
-import com.gingersoft.gsa.cloud.user.login.mvp.presenter.LoginPresenter;
+import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
 import com.jess.arms.base.BaseActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
+import com.gingersoft.gsa.cloud.user.login.mvp.contract.LoginContract;
+import com.gingersoft.gsa.cloud.user.login.mvp.presenter.LoginPresenter;
+import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
+import com.gingersoft.gsa.cloud.ui.view.MyEditText;
 
 import java.io.IOException;
 import java.util.List;
@@ -142,18 +143,24 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
 
             if(loginBean.getData().getUser() != null) {
 
-                GsaCloudApplication.setMemberId(mContext, loginBean.getData().getUser().getUserId());
-                GsaCloudApplication.setMemberName(mContext, loginBean.getData().getUser().getUserName());
+                GsaCloudApplication.setMemberId(LoginActivity.this, loginBean.getData().getUser().getUserId());
+                GsaCloudApplication.setMemberName(LoginActivity.this, loginBean.getData().getUser().getUserName());
 
                 if (loginBean.getData().getUser().getBrands() != null) {
                     int restaurantSize = getRestaurantSize(loginBean.getData().getUser().getBrands());
 //                if (restaurantSize > 1) {
                     new ChooseRestaurantDialog.BottomListSheetBuilder(this)
                             .addBrandItems(loginBean.getData().getUser().getBrands())
-                            .setOnItemClickListener((item, position) -> {
-                                GsaCloudApplication.setRestaurantId(mContext, item.getId());
-                                jumpActivity();
-                                killMyself();
+                            .setOnItemClickListener(new ChooseRestaurantDialog.BottomListSheetBuilder.OnItemClickListener() {
+
+                                @Override
+                                public void onItemClick(ChooseRestaurantDialog dialog,SectionTextItem item, int position) {
+                                    GsaCloudApplication.setRestaurantId(LoginActivity.this, item.getId());
+                                    GsaCloudApplication.setRestaurantName(LoginActivity.this, item.getText());
+                                    jumpActivity();
+//                                    killMyself();
+//                                    dialog.dismiss();
+                                }
                             })
                             .build()
                             .show();