6.04 排除簡體字

base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionStyleUtils.java

@@ -192,7 +192,7 @@ public class FunctionStyleUtils {
     private int PrintOrderInfo_TextSize = 24;
     //食品
     private int PrintOrderFood_TextSize = 26;
-    //金额（总金额、服务费）
+    //金额（总金额、服務費）
     private int PrintOrderMoney_TextSize = 26;
     //会员信息
     private int PrintMemberInfo_TextSize = 24;

base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/OrderDetails.kt

@@ -69,7 +69,7 @@ class OrderDetails {
         var order_type: Int = 0
         var orderPayType: Int = 0
         var isDelete: Int = 1 //默認為1，為0是第三方物流,其他則是本店配送
-        var payType: Int = 0//1:积分支付;2:支付宝;3:财付通;4:微信支付;5:货到付款;6:其他支付
+        var payType: Int = 0//1:積分支付;2:支付寶;3:财付通;4:微信支付;5:貨到付款;6:其他支付
 
         var PRODUCT_NAME: List<PRODUCTNAMEBean>? = null
         var couponList: List<CouponBean>? = null

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/bean/view/SectionTextItem3.java

@@ -148,7 +148,7 @@ public class SectionTextItem3 {
 
     public static SectionTextItem3 serviceAmountTransSectionTextItem3(double amuout) {
         SectionTextItem3 sectionTextItem3 = new SectionTextItem3();
-        sectionTextItem3.setLeftText("服务费");
+        sectionTextItem3.setLeftText("服務費");
         sectionTextItem3.setCenterText(String.valueOf(0));
         sectionTextItem3.setRightText(String.valueOf(amuout));
         sectionTextItem3.setLeftTextStyle(R.style.order_paymethod_text_style);

base-module/src/main/res/values/strings.xml

@@ -73,9 +73,9 @@
     <string name="sky_order">sky order</string>
     <string name="btndone">done</string>
     <string name="customernumber">人數</string>
-    <string name="opentabeexists">此台已被开台，是否进入点单？</string>
+    <string name="opentabeexists">此台已被開台，是否進入點單？</string>
     <string name="standmode">一般模式</string>
-    <string name="detailmode">细微模式</string>
+    <string name="detailmode">細微模式</string>
     <string name="malnumber">請選擇按鍵錄入數量</string>
     <string name="waring">警告</string>
     <string name="presssound">按鍵音量</string>
@@ -88,7 +88,7 @@
     <string name="remove">刪除</string>
     <string name="end">完成</string>
     <string name="Vertical">豎向</string>
-    <string name="Horizontal">横向</string>
+    <string name="Horizontal">橫向</string>
     <string name="shottableDirection">檯桌顯示方向</string>
     <string name="deleteExistsOrderdetail">取消</string>
     <string name="deleteExistsOrderdetail_ok">確認删除</string>

login-module/build.gradle

@@ -63,7 +63,7 @@ android {
             if (variant.buildType.name == 'release') {
                 fileName = "${formattedDate}_GSA-Cloud_${variant.mergedFlavor.versionName}_正式版_.apk"
             } else if (variant.buildType.name == 'Test') {
-                fileName = "${formattedDate}_GSA-Cloud_${variant.mergedFlavor.versionName}_测试版_.apk"
+                fileName = "${formattedDate}_GSA-Cloud_${variant.mergedFlavor.versionName}_測試版_.apk"
             } else if (variant.buildType.name == 'debug') {
                 fileName = "${formattedDate}_GSA-Cloud_${variant.mergedFlavor.versionName}_debug_.apk"
             }

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

@@ -112,7 +112,6 @@ public class LoginActivity extends LoginInterfaceImpl<LoginPresenter> implements
 //            slide.setDuration(1000);
 //            getWindow().setExitTransition(slide);
 //        }
-
         mPresenter.requestExternalStoragePermission();
         //顯示記住的登錄名
         if (!Objects.equals(SPUtils.get(mContext, UserConstans.LOGIN_USERNAME, ""), "")) {

login-module/src/main/res/layout/activity_switch_server.xml

@@ -42,7 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/dp_10"
-            android:text="世维"
+            android:text="世維"
             android:textColor="@color/theme_333_color"
             android:textSize="@dimen/sp_16" />
 
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/dp_10"
-            android:text="石书"
+            android:text="石書"
             android:textColor="@color/theme_333_color"
             android:textSize="@dimen/sp_16" />
     </RadioGroup>

login-module/src/main/res/layout/activity_welcome.xml

@@ -106,7 +106,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_18"
-            android:text="多终端云同步，轻松管理所有"
+            android:text="多終端雲同步，輕松管理所有"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_19"
             app:layout_constraintBottom_toTopOf="@id/tv_guide_details"

login-module/src/main/res/layout/item_guide.xml

@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_18"
-        android:text="多终端云同步，轻松管理所有"
+        android:text="多終端雲同步，輕松管理所有"
         android:textColor="@color/white"
         android:textSize="@dimen/dp_19"
         android:visibility="gone"

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

@@ -200,7 +200,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="较昨日："
+                        android:text="較昨日："
                         android:textColor="#3c3c3c"
                         android:textSize="@dimen/sp_12" />
 
@@ -221,7 +221,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="较昨日："
+                    android:text="較昨日："
                     android:textColor="#3c3c3c"
                     android:textSize="@dimen/sp_12"
                     android:visibility="gone" />
@@ -282,7 +282,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="较昨日："
+                        android:text="較昨日："
                         android:textColor="#3c3c3c"
                         android:textSize="@dimen/sp_12" />
 
@@ -355,7 +355,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="较昨日："
+                        android:text="較昨日："
                         android:textColor="#3c3c3c"
                         android:textSize="@dimen/sp_12" />
 

main-module/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
     <string name="main_app_name">GSA-Cloud</string>
 
     <string name="main">首頁</string>
-    <string name="report">报表</string>
+    <string name="report">報表</string>
     <string name="my">我的</string>
     <string name="turnover_today">今日營業額（$）</string>
     <string name="cutoff">截止</string>
@@ -20,7 +20,7 @@
 
     <string name="function_table_service">餐檯服務</string>
     <string name="function_report">報表</string>
-    <string name="function_manage">管理选项</string>
+    <string name="function_manage">管理選項</string>
     <string name="function_soldout_ctrl">沽清控制</string>
     <string name="quit_system">退出系統</string>
 

manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/bean/request/TableRequest.java

@@ -18,7 +18,7 @@ public class TableRequest {
         private String tableName;
         /**座位数*/
         private int seatCount;
-        /**服务费*/
+        /**服務費*/
         private Double serviceCharge;
         /**排序*/
         private int sort;
@@ -84,7 +84,7 @@ public class TableRequest {
         private String tableName;
         /**座位数*/
         private int seatCount;
-        /**服务费*/
+        /**服務費*/
         private Double serviceCharge;
         /**排序*/
         private int sort;

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

@@ -176,7 +176,7 @@ public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements A
         textView.setLineSpacing(QMUIDisplayHelper.dp2px(mContext, 4), 1.0f);
         int padding = QMUIDisplayHelper.dp2px(mContext, 20);
         textView.setPadding(padding, padding, padding, padding);
-        textView.setText("默认值為100，數字越小排序\n" + "越靠前！");
+        textView.setText("默認值為100，數字越小排序\n" + "越靠前！");
         int color = QMUIResHelper.getAttrColor(mContext, R.attr.app_skin_common_title_text_color);
         textView.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_black));
 //        QMUISkinValueBuilder builder = QMUISkinValueBuilder.acquire();

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

@@ -265,7 +265,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
         textView.setLineSpacing(QMUIDisplayHelper.dp2px(mContext, 4), 1.0f);
         int padding = QMUIDisplayHelper.dp2px(mContext, 20);
         textView.setPadding(padding, padding, padding, padding);
-        textView.setText("默认值為100，數字越小排序\n" + "越靠前！");
+        textView.setText("默認值為100，數字越小排序\n" + "越靠前！");
         int color = QMUIResHelper.getAttrColor(mContext, R.attr.app_skin_common_title_text_color);
         textView.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_black));
 //        QMUISkinValueBuilder builder = QMUISkinValueBuilder.acquire();

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/WeatherRepository.kt

@@ -54,7 +54,7 @@ class WeatherRepository private constructor(private val network: CoolWeatherNetw
         val requestBody = FormBody.Builder()
                 .add("orderId", orderId)
                 .add("restaurantId", restaurantId)
-                .add("type", type.toString())//1、预计整张订单完成时间2、預計配送員接單時間3、預計配送員到店時間4、配送員預計送達時間
+                .add("type", type.toString())//1、預計整張訂單完成時間2、預計配送員接單時間3、預計配送員到店時間4、配送員預計送達時間
                 .build()
         network.getShipanyOrderTime(requestBody)
     }
@@ -80,7 +80,7 @@ class WeatherRepository private constructor(private val network: CoolWeatherNetw
                                     confirmationType: Int, orderFrom: Int) = withContext(Dispatchers.IO) {
         val requestBody = FormBody.Builder()
                 .add("orderId", orderId)//訂單id
-                .add("status", status.toString())//订单状态#0:未支付;1:待確認(已支付, 待餐廳確認);2:制作中（餐厅确认）;3:派送中;4:确认收货（完成）;5:是否评论;6:取消;
+                .add("status", status.toString())//订单状态#0:未支付;1:待確認(已支付, 待餐廳確認);2:制作中（餐廳确認）;3:派送中;4:确認收貨（完成）;5:是否評論;6:取消;
                 .add("orderType", orderType.toString())//訂單類型#1:餐廳訂單;2:線上外賣訂單3:扫码点餐;4固定二维码订单;5:预点餐;6:積分訂單;7:自取订单'
                 .add("type", type.toString())//通知類型：1.未定，2:外賣
                 .add("sendDate", sendDate)//餐厅送达描述

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/OrderList.kt

@@ -30,7 +30,7 @@ class OrderList {
         class DataBean {
             /**
              * STATUS : 0
-             * MEMBER_NAME : 觉得很多很多
+             * MEMBER_NAME :
              * ADDRESS_DETAIL : 香港荔枝角青山道479號麗昌工廠大廈2樓201L室Innovation Design Consultant Ltd.1111
              * PAY_AMOUNT : 89.0
              * PHONE : 15899876018

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt

@@ -71,10 +71,10 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
      * status
      * 0:未支付;
      * 1:待確認(已支付, 待餐廳確認);
-     * 2:制作中（餐厅确认）;
+     * 2:制作中（餐廳确認）;
      * 3:外賣是派送中，自取是待取餐
-     * 4:确认收货（完成）;
-     * 5:是否评论;6:取消;
+     * 4:确認收貨（完成）;
+     * 5:是否評論;6:取消;
      * 已確認，外賣是指派送單，自取是製作完成
      */
     fun getOrderGroupNum(restaurantId: String) {
@@ -272,7 +272,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                             }
                             else -> {
                                 type = 1
-                                estimatedTime = "预计整张订单完成时间："
+                                estimatedTime = "預計整張訂單完成時間："
                             }
                         }
                         val estimatedBean = withContext(Dispatchers.Default) { repository.getShipanyOrderTime(restaurantId, orderId, type) }//1、预计整张订单完成时间2、預計配送員接單時間3、預計配送員到店時間4、配送員預計送達時間

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/OtherOrderUtils.kt

@@ -77,11 +77,11 @@ object OtherOrderUtils {
                         }
                     }
                     layoutOrderInfoDialogBinding.patMethod = when (orderData.payType) {
-                        1 -> "积分支付"
-                        2 -> "支付宝"
+                        1 -> "積分支付"
+                        2 -> "支付寶"
                         3 -> "财付通"
                         4 -> "微信支付"
-                        5 -> "货到付款"
+                        5 -> "貨到付款"
                         6 -> "其他支付"
                         else -> ""
                     }

print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java

@@ -202,23 +202,18 @@ public class PrintOtherOrder extends PrinterRoot {
 
         RecyclerView rvBill = view.findViewById(R.id.rv_bill);
         List<PrintBillBean> billData = new ArrayList<>();
-//        billData.add(getBillBean("合計：", amountUnit + MoneyUtil.sub(MoneyUtil.sub(Double.parseDouble(Objects.requireNonNull(data.getTOTAL_AMOUNT())), data.getLunchbox()), data.getDELIVERY_CHARGE())));
         if (data.getLunchbox() != 0) {
             billData.add(getBillBean("餐盒費：", amountUnit + data.getLunchbox()));
         }
         if (data.getDELIVERY_CHARGE() != 0) {
             billData.add(getBillBean("送貨費：", amountUnit + data.getDELIVERY_CHARGE()));
         }
-//        if (data.getDiscount_amount() != 0) {
-//            billData.add(getBillBean("折扣：", "-" + amountUnit + data.getDiscount_amount()));
-//        }
         if (data.getCouponList() != null && data.getCouponList().size() > 0) {
             for (OrderDetails.DataBean.CouponBean coupon : data.getCouponList()) {
                 billData.add(getBillBean(coupon.getCouponName() + "：", "-$" + coupon.getDiscount_amount()));
             }
         }
         billData.add(getBillBean("總金額：", amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount())));
-//        billData.add(getBillBean("支付金額：", amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount())));
 
         BillItemAdapter adapter = new BillItemAdapter(billData, context);
         rvBill.setLayoutManager(new LinearLayoutManager(context));
@@ -226,28 +221,20 @@ public class PrintOtherOrder extends PrinterRoot {
 
         //合計
         setText(view, R.id.tv_total, amountUnit + MoneyUtil.sub(MoneyUtil.sub(Double.parseDouble(Objects.requireNonNull(data.getTOTAL_AMOUNT())), data.getLunchbox()), data.getDELIVERY_CHARGE()));
-        //餐盒費
-//        setAmount(data.getLunchbox(), view.findViewById(R.id.tv_lunchbox_cost_text), view.findViewById(R.id.tv_lunchbox_cost), amountUnit);
-        //配送費
-//        setAmount(data.getDELIVERY_CHARGE(), view.findViewById(R.id.tv_delivery_fee_text), view.findViewById(R.id.tv_delivery_fee), amountUnit);
-        //折扣
-//        setAmount(data.getDiscount_amount(), view.findViewById(R.id.tv_discount_text), view.findViewById(R.id.tv_discount), "-" + amountUnit);
-        //總金額
-//        setText(view, R.id.tv_total_amount, amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
         //支付金額
         setText(view, R.id.tv_pay_amount_text, "支付金額：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
         //支付類型：貨到付款，在線支付
         String payType = "";
         if (data.getPayType() == 1) {
-            payType = "：积分支付";
+            payType = "：積分支付";
         } else if (data.getPayType() == 2) {
-            payType = "：支付宝";
+            payType = "：支付寶";
         } else if (data.getPayType() == 3) {
             payType = "：财付通";
         } else if (data.getPayType() == 4) {
             payType = "：微信支付";
         } else if (data.getPayType() == 5) {
-            payType = "：货到付款";
+            payType = "：貨到付款";
         } else if (data.getPayType() == 6) {
             payType = "：其他支付";
         }

print-module/src/main/java/com/joe/print/mvp/print/TestPrintDataMaker.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * 打印測試
- * 测试数据生成
+ * 測試數據生成
  */
 public class TestPrintDataMaker implements PrintDataMaker {
 

print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java

@@ -61,7 +61,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
  * ----本機打印
  * ----調用本機打印方法
  * ----網絡打印
- * ----获取網絡打印機列表
+ * ----獲取網絡打印機列表
  */
 public class PrintActivity extends BaseActivity<PrintPresenter> implements PrintContract.View, DialogInterface.OnDismissListener, PrintListener {
 
@@ -125,7 +125,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
             if (deviceBean != null) {
                 printerInIt.ipDevicePrint(deviceBean, printerInIt.getPrintBitmap(mContext).get(""));
             } else {
-                ToastUtils.show(mContext, "测试失败");
+                ToastUtils.show(mContext, "測試失敗");
                 finish();
             }
         } else {

print-module/src/main/java/com/joe/print/mvp/ui/activity/PrinterListActivity.java

@@ -80,7 +80,7 @@ public class PrinterListActivity extends BaseFragmentActivity<PrintListPresenter
     private IpPrintListActivityFragment ipPrintListActivityFragment;
 
     /**
-     * 设置Viewpager的适配器
+     * 設置Viewpager的适配器
      */
     private void initViewPager() {
         List<String> titles = new ArrayList<>();

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderDetailItem.java

@@ -56,7 +56,7 @@ public class OrderDetailItem implements Serializable {
     private double amount;
     /**賬單小數*/
     private Double rounding;
-    /**服务费*/
+    /**服務費*/
     private Double serviceAmount;
     private String payName;
     private String orderPayType;

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java

@@ -305,7 +305,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
     }
 
     /**
-     * 获取服务费
+     * 获取服務費
      * @param orderDetailItem
      * @return
      */

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java

@@ -232,10 +232,10 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
             /**
              * 可使用   0
              * 操作中   1
-             * 已开台   2
-             * 已印单   3
-             * 已结账   4
-             * 连台     6
+             * 已開台   2
+             * 已印單   3
+             * 已結賬   4
+             * 連台     6
              */
 //            StateListDrawable bgShape = (StateListDrawable) btn_table.getBackground();
 //            GradientDrawable d = (GradientDrawable) bgShape.getCurrent();

table-module/src/main/res/values/strings.xml

@@ -47,7 +47,7 @@
     <string name="meal_select_all">全選</string>
     <string name="meal_select_reverse">反選</string>
 
-    <!-- TabSegmentFragment 选项卡展示界面 -->
+    <!-- TabSegmentFragment 選項卡展示界面 -->
     <string name="tabSegment_order_all_title">全部</string>
     <string name="tabSegment_order_cancel_title">已取消</string>
 
@@ -81,7 +81,7 @@
     <string name="sky_order">sky order</string>
     <string name="btndone">done</string>
     <string name="customernumber">人數</string>
-    <string name="opentabeexists">此台已被开台，是否进入点单？</string>
+    <string name="opentabeexists">此台已被開台，是否進入點單？</string>
     <string name="standmode">一般模式</string>
     <string name="detailmode">细微模式</string>
     <string name="malnumber">請選擇按鍵錄入數量</string>