Skip to content

S
supplier
Commit 221a97de by Wyh
Options

Merge remote-tracking branch 'origin/master'

parents 98c2ce0a 25fcbe09
Showing with 80 additions and 20 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
...@@ -5,6 +5,7 @@ import android.content.Context; ...@@ -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 { ...@@ -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(!TextUtils.isEmpty(data)){
if (result.isSuccess()) { BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
//上傳成功后刪除對應文件 if (result != null && result.isSuccess()) {
for (File dfile : file.listFiles()) { //上傳成功后刪除對應文件
boolean delete = dfile.delete(); for (File dfile : file.listFiles()) {
LogUtil.d(TAG, "delete result : " + delete); boolean delete = dfile.delete();
LogUtil.d(TAG, "delete result : " + delete);
}
} }
XLog.d(TAG, "sendFileMultipart onNext: " + data);
} }
XLog.d(TAG, "sendFileMultipart onNext: " + data);
} }
@Override @Override
......
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; ...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Button; import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
...@@ -91,17 +92,73 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im ...@@ -91,17 +92,73 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
rbHK.setText("測試服務器"); rbHK.setText("測試服務器");
rbFormal.setText("正式服務器"); rbFormal.setText("正式服務器");
radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { rbHK.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(RadioGroup group, int checkedId) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
for (int i = 0; i < rbIds.length; i++) { rbHK.setChecked(true);
if (rbIds[i] == checkedId) { rbFormal.setChecked(false);
setChecked(i + 1); rb_youchang.setChecked(false);
break; 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 -> { switchServer.setOnClickListener(v -> {
// if (rbHK.isChecked()) { // if (rbHK.isChecked()) {
// SPUtils.put(this, "isFormal", false); // 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 ...@@ -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 ...@@ -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 ...@@ -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 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment