Merge remote-tracking branch 'origin/master'

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Looper;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -201,8 +202,9 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
 
                         @Override
                         public void onNext(String data) {
+                            if(!TextUtils.isEmpty(data)){
                                 BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
-                            if (result.isSuccess()) {
+                                if (result != null && result.isSuccess()) {
                                     //上傳成功后刪除對應文件
                                     for (File dfile : file.listFiles()) {
                                         boolean delete = dfile.delete();
@@ -211,6 +213,7 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
                                 }
                                 XLog.d(TAG, "sendFileMultipart onNext: " + data);
                             }
+                        }
 
                         @Override
                         public void onError(Throwable t) {

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

@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -91,17 +92,73 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
         rbHK.setText("測試服務器");
         rbFormal.setText("正式服務器");
 
-        radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+        rbHK.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                for (int i = 0; i < rbIds.length; i++) {
-                    if (rbIds[i] == checkedId) {
-                        setChecked(i + 1);
-                        break;
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                rbHK.setChecked(true);
+                rbFormal.setChecked(false);
+                rb_youchang.setChecked(false);
+                rb_shiwei.setChecked(false);
+                rb_shishu.setChecked(false);
+                SPUtils.put(SwitchServerActivity.this, "isFormal", 2);
+            }
+        });
+        rbFormal.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                rbHK.setChecked(false);
+                rbFormal.setChecked(true);
+                rb_youchang.setChecked(false);
+                rb_shiwei.setChecked(false);
+                rb_shishu.setChecked(false);
+                SPUtils.put(SwitchServerActivity.this, "isFormal", 1);
+            }
+        });
+        rb_youchang.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                rbHK.setChecked(false);
+                rbFormal.setChecked(false);
+                rb_youchang.setChecked(true);
+                rb_shiwei.setChecked(false);
+                rb_shishu.setChecked(false);
+                SPUtils.put(SwitchServerActivity.this, "isFormal", 3);
             }
+        });
+        rb_shiwei.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                rbHK.setChecked(false);
+                rbFormal.setChecked(false);
+                rb_youchang.setChecked(false);
+                rb_shiwei.setChecked(true);
+                rb_shishu.setChecked(false);
+                SPUtils.put(SwitchServerActivity.this, "isFormal", 4);
             }
+        });
+        rb_shishu.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                rbHK.setChecked(false);
+                rbFormal.setChecked(false);
+                rb_youchang.setChecked(false);
+                rb_shiwei.setChecked(false);
+                rb_shishu.setChecked(true);
+                SPUtils.put(SwitchServerActivity.this, "isFormal", 5);
             }
         });
+//        radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+//            @Override
+//            public void onCheckedChanged(RadioGroup group, int checkedId) {
+//                for (int i = 0; i < rbIds.length; i++) {
+//                    if (rbIds[i] == checkedId) {
+//                        rbFormal.setChecked(true);
+////                        setChecked((i + 1));
+//                        return;
+//                    }
+//                }
+//            }
+//        });
         switchServer.setOnClickListener(v -> {
 //            if (rbHK.isChecked()) {
 //                SPUtils.put(this, "isFormal", false);

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

@@ -158,7 +158,7 @@ public class SettlementActivity extends BaseActivity<SettlementPresenter> implem
         this.mSettlementReportBean = datasBean;
         if(mSettlementReportBean.getRestaurantOperation() != null) {
             String lastSettlementText = LanguageUtils.get_language_system(this, "", "上次清機時間:");
-            setLastTime(lastSettlementText + TimeUtils.getStringByFormat(mSettlementReportBean.getRestaurantOperation().getCreateTime(), TimeUtils.dateFormatYMDHMS) );
+            setLastTime(lastSettlementText + TimeUtils.getStringByFormat(mSettlementReportBean.getRestaurantOperation().getOperationTime(), TimeUtils.dateFormatYMDHMS) );
         }
     }
 

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

@@ -284,7 +284,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
         SettlementReport.DataBean.RestaurantOperationBean restaurantOperationBean = datasBean.getRestaurantOperation();
         if (restaurantOperationBean != null) {
             tv_business_area_title.setText(dailyBusinessReportText);
-            tv_last_time.setText(lastSettlementText + TimeUtils.getStringByFormat(restaurantOperationBean.getCreateTime(), TimeUtils.dateFormatYMDHMS));
+            tv_last_time.setText(lastSettlementText + TimeUtils.getStringByFormat(restaurantOperationBean.getOperationTime(), TimeUtils.dateFormatYMDHMS));
         }
 
         tv_start_time.setText(byBusinessDateText + datasBean.getStartTime());
@@ -390,11 +390,11 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
                 if (amount > 0) {
                     canteenPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + "";
                 }
-                if (!GsaCloudApplication.mV2.contains(Build.MODEL ) && !GsaCloudApplication.mN5.contains(Build.MODEL)) {
+                if (!GsaCloudApplication.mV2.contains(Build.MODEL) && !GsaCloudApplication.mN5.contains(Build.MODEL)) {
                     settlementReportItem5s.add(new SectionTextItem5(canteenText, canteenNum, canteenTotamout, canteenAveragePrice, canteenPercentage));
                 }
             } else {
-                takewayText = "";
+                canteenText = "";
             }
 
             //外賣

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

@@ -17,7 +17,7 @@
         android:textColor="@color/theme_red_color"
         android:gravity="center"
         android:textSize="@dimen/sp_14"
-        android:text="上次清機時間:2020-3-4 22:00:00"
+        android:text="上次清機時間:"
         android:layout_marginTop="@dimen/dp_10"/>
 
     <com.qmuiteam.qmui.alpha.QMUIAlphaButton