Merge remote-tracking branch 'origin/master'

base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/lifecyclesOptioins/MyAppLifecycles.java

@@ -20,7 +20,7 @@ public class MyAppLifecycles implements AppLifecycles {
     @Override
     public void onCreate(Application application) {
 //        initTimber();
-        initLeakCanary(application);
+//        initLeakCanary(application);
         initFragmentation();
 //        initARouter(application);
     }

config.gradle

@@ -5,8 +5,10 @@ ext {
             buildToolsVersion: '28.0.3',
             minSdkVersion    : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
             targetSdkVersion : 28,
-            versionCode      : 8,
-            versionName      : "1.0.8"
+            //正式版:    1.0.1  1
+            //內部測試版:1.1.1  11
+            versionCode      : 11,
+            versionName      : "1.1.1"
     ]
 
     version = [

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java

@@ -254,6 +254,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
     private void showSettlementErrorDialog(String msg) {
         new QMUIDialog.MessageDialogBuilder(IActivity)
                 .setTitle("溫馨提示")
+                .setTitleIcon(com.gingersoft.gsa.cloud.base.R.drawable.qmui_icon_dialog_doubt)
                 .setMessage(msg)
                 .addAction("確認", new QMUIDialogAction.ActionListener() {
                     @Override

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

@@ -249,7 +249,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
         functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
 
         functions.add(new Function((long) 151, 0, 5, "管理", 0, 0));
-        functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
+//        functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
 //        functions.add(new Function((long) 142, 151, 5, "外賣接單", R.drawable.ic_takeaway_orders, 0));
         functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0));
         functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0));

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java

@@ -220,6 +220,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
     @OnClick({R2.id.btn_cancel_cross_days})
     public void onClickCancel(View v) {
         if (v.getId() == R.id.btn_cancel_cross_days) {
+            type = 0;
             AnimateUtils.animateDown(sv_cross_days, 500);
             sv_cross_days.setVisibility(View.GONE);
         }
@@ -608,6 +609,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
     @Override
     public void setOrderConditionList(List<SendSettlement.DataBean.DateNumBean> dateNum, String type1, String type2, String type3) {
 
+        rb_condition.removeAllViews();
+
         int rbIndex = 0;
         if (!TextUtils.isEmpty(type1)) {
             type1Button = new RadioButton(this);

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

@@ -39,13 +39,24 @@
         android:orientation="vertical"
         android:padding="@dimen/dp_10">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            android:src="@drawable/qmui_icon_dialog_surprised"/>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/qmui_icon_dialog_surprised"
+            android:layout_marginLeft="@dimen/dp_5"
             android:textColor="@color/theme_black"
             android:textSize="@dimen/sp_16"
             android:text="檢測到您有跨天訂單未清機,請選擇清機類型"/>
+        </LinearLayout>
 
         <TextView
             android:layout_width="wrap_content"
@@ -55,10 +66,10 @@
             android:text="包含:"
             android:layout_marginTop="@dimen/dp_5"/>
 
-        <com.gingersoft.gsa.cloud.base.widget.NoScrollListview
+        <ListView
             android:id="@+id/lv_order_condition"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_150"
             android:divider="@null"
             android:layout_marginTop="@dimen/dp_10"
             android:padding="@dimen/dp_10"

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

@@ -245,6 +245,8 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
         if (mTableItem.getLayoutType() == 0) {
             defalutPeopleNumberEditText.setText(mTableItem.getSeatCount() + "");
         }
+        InputFilter[] filters2 = {new InputFilter.LengthFilter(3)};
+        defalutPeopleNumberEditText.setFilters(filters2);
         defalutPeopleNumberEditText.setTextSize(16);
         defalutPeopleNumberEditText.setBackgroundColor(ContextCompat.getColor(mContext, R.color.trans));
         defalutPeopleNumberEditText.setInputType(EditorInfo.TYPE_CLASS_NUMBER);
@@ -313,8 +315,8 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
         if (mTableItem.getLayoutType() == 0 && mTableItem.getServiceCharge() != 0) {
             serverchargeEditText.setText(mTableItem.getServiceCharge() + "");
         }
-        InputFilter[] filters2 = {new InputFilter.LengthFilter(2)};
-        serverchargeEditText.setFilters(filters2);
+        InputFilter[] filters3 = {new InputFilter.LengthFilter(2)};
+        serverchargeEditText.setFilters(filters3);
         serverchargeEditText.setTextSize(16);
         serverchargeEditText.setBackgroundColor(ContextCompat.getColor(mContext, R.color.trans));
         serverchargeEditText.setInputType(EditorInfo.TYPE_CLASS_NUMBER);