上次清机时间修改

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.Build;
 import android.os.Environment;
 import android.os.Environment;
 import android.os.Looper;
 import android.os.Looper;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Log;
 import android.widget.Toast;
 import android.widget.Toast;
 
 
@@ -201,15 +202,17 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
 
 
                         @Override
                         @Override
                         public void onNext(String data) {
                         public void onNext(String data) {
-                            BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
-                            if (result.isSuccess()) {
-                                //上傳成功后刪除對應文件
-                                for (File dfile : file.listFiles()) {
-                                    boolean delete = dfile.delete();
-                                    LogUtil.d(TAG, "delete result : " + delete);
+                            if(!TextUtils.isEmpty(data)){
+                                BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
+                                if (result != null && result.isSuccess()) {
+                                    //上傳成功后刪除對應文件
+                                    for (File dfile : file.listFiles()) {
+                                        boolean delete = dfile.delete();
+                                        LogUtil.d(TAG, "delete result : " + delete);
+                                    }
                                 }
                                 }
+                                XLog.d(TAG, "sendFileMultipart onNext: " + data);
                             }
                             }
-                            XLog.d(TAG, "sendFileMultipart onNext: " + data);
                         }
                         }
 
 
                         @Override
                         @Override

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;
         this.mSettlementReportBean = datasBean;
         if(mSettlementReportBean.getRestaurantOperation() != null) {
         if(mSettlementReportBean.getRestaurantOperation() != null) {
             String lastSettlementText = LanguageUtils.get_language_system(this, "", "上次清機時間:");
             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();
         SettlementReport.DataBean.RestaurantOperationBean restaurantOperationBean = datasBean.getRestaurantOperation();
         if (restaurantOperationBean != null) {
         if (restaurantOperationBean != null) {
             tv_business_area_title.setText(dailyBusinessReportText);
             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());
         tv_start_time.setText(byBusinessDateText + datasBean.getStartTime());
@@ -390,11 +390,11 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
                 if (amount > 0) {
                 if (amount > 0) {
                     canteenPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + "";
                     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));
                     settlementReportItem5s.add(new SectionTextItem5(canteenText, canteenNum, canteenTotamout, canteenAveragePrice, canteenPercentage));
                 }
                 }
             } else {
             } else {
-                takewayText = "";
+                canteenText = "";
             }
             }
 
 
             //外賣
             //外賣

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

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