Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -29,7 +29,7 @@ public final class SystemUtil {
      */
     public static String getDeviceModel() {
 //        return DeviceUtils.getModel();
-        return "AECRC10";
+        return "X990";
     }
 
 
@@ -57,7 +57,7 @@ public final class SystemUtil {
                 e.printStackTrace();
             }
         }
-        return "test2018";
+        return "test2019";
 //        return deviceSN;
     }
 

app/src/main/res/values/strings.xml

@@ -563,7 +563,7 @@
     <string name="settle_pay_result">支付结果</string>
     <string name="settle_pay_result_title">支付完成</string>
     <string name="settle_pay_succ">支付成功</string>
-    <string name="settle_pay_fail">支付失败</string>
+    <string name="settle_pay_fail">支付超时</string>
     <string name="settle_pay_time">交易时间</string>
     <string name="settle_pay_type">收款方式</string>
     <string name="settle_pay_count">商品总数</string>