[modify]去除支付宝微信相关字段

assets/string/base/string.xml

@@ -116,7 +116,7 @@
     <string name="store_pay_loading">请求中...</string>
     <string name="store_pay_user_cancel">用户取消支付</string>
     <string name="store_pay_not_support">不支持该支付类型</string>
-    <string name="store_pay_wx_evn_error">微信未安装或微信版本不支持</string>
+    <!-- <string name="store_pay_wx_evn_error">微信未安装或微信版本不支持</string> -->
     <string name="store_pay_not_connect_store">无法连接到商店</string>
     <string name="store_pay_error">支付失败，请稍后重试</string>
     <string name="store_query_pay_state">正在查询订单状态..</string>

lib/data/api/response/order_pay_response.dart

@@ -7,40 +7,41 @@ class OrderPayResponse {
   @JsonKey(name: 'outTradeNo')
   String outTradeNo;
 
-  @JsonKey(name: 'wechatPayQrcodeUrl')
-  String? wechatPayQrcodeUrl;
+  // @JsonKey(name: 'wechatPayQrcodeUrl')
+  // String? wechatPayQrcodeUrl;
 
-  @JsonKey(name: 'wechatPayRedirectUrl')
-  String? wechatPayRedirectUrl;
+  // @JsonKey(name: 'wechatPayRedirectUrl')
+  // String? wechatPayRedirectUrl;
 
-  @JsonKey(name: 'wechatPayPrepayJson')
-  String? wechatPayPrepayJson;
+  // @JsonKey(name: 'wechatPayPrepayJson')
+  // String? wechatPayPrepayJson;
 
-  @JsonKey(name: 'alipayQrcodeHtml')
-  String? alipayQrcodeHtml;
+  // @JsonKey(name: 'alipayQrcodeHtml')
+  // String? alipayQrcodeHtml;
 
-  @JsonKey(name: 'aliPaySubmitHtml')
-  String? aliPaySubmitHtml;
+  // @JsonKey(name: 'aliPaySubmitHtml')
+  // String? aliPaySubmitHtml;
 
-  @JsonKey(name: 'alipayOrderString')
-  String? alipayOrderString;
+  // @JsonKey(name: 'alipayOrderString')
+  // String? alipayOrderString;
 
   @JsonKey(name: 'appAccountToken')
   String? appAccountToken;
 
-  @JsonKey(name: 'wechatPayH5Url')
-  String? wechatPayH5Url;
+  // @JsonKey(name: 'wechatPayH5Url')
+  // String? wechatPayH5Url;
 
   OrderPayResponse(
-      this.outTradeNo,
-      this.wechatPayQrcodeUrl,
-      this.wechatPayRedirectUrl,
-      this.wechatPayPrepayJson,
-      this.alipayQrcodeHtml,
-      this.aliPaySubmitHtml,
-      this.alipayOrderString,
-      this.appAccountToken,
-      this.wechatPayH5Url);
+    this.outTradeNo,
+    // this.wechatPayQrcodeUrl,
+    // this.wechatPayRedirectUrl,
+    // this.wechatPayPrepayJson,
+    // this.alipayQrcodeHtml,
+    // this.aliPaySubmitHtml,
+    // this.alipayOrderString,
+    this.appAccountToken,
+    // this.wechatPayH5Url
+  );
 
   factory OrderPayResponse.fromJson(Map<String, dynamic> json) =>
       _$OrderPayResponseFromJson(json);

lib/data/bean/wechat_payment_sign_bean.dart

@@ -1,47 +1,47 @@
-import 'dart:convert';
+// import 'dart:convert';
 
-import 'package:json_annotation/json_annotation.dart';
+// import 'package:json_annotation/json_annotation.dart';
 
-part 'wechat_payment_sign_bean.g.dart';
+// part 'wechat_payment_sign_bean.g.dart';
 
-@JsonSerializable()
-class WechatPaymentSignBean {
-  @JsonKey(name: 'appid')
-  String appId;
+// @JsonSerializable()
+// class WechatPaymentSignBean {
+//   @JsonKey(name: 'appid')
+//   String appId;
 
-  @JsonKey(name: 'noncestr')
-  String nonceStr;
+//   @JsonKey(name: 'noncestr')
+//   String nonceStr;
 
-  @JsonKey(name: 'package')
-  String package;
+//   @JsonKey(name: 'package')
+//   String package;
 
-  @JsonKey(name: 'partnerid')
-  String partnerId;
+//   @JsonKey(name: 'partnerid')
+//   String partnerId;
 
-  @JsonKey(name: 'prepayid')
-  String prepayId;
+//   @JsonKey(name: 'prepayid')
+//   String prepayId;
 
-  @JsonKey(name: 'sign')
-  String sign;
+//   @JsonKey(name: 'sign')
+//   String sign;
 
-  @JsonKey(name: 'timestamp')
-  String timeStamp;
+//   @JsonKey(name: 'timestamp')
+//   String timeStamp;
 
-  WechatPaymentSignBean({
-    this.appId = '',
-    this.nonceStr = '',
-    this.package = '',
-    this.partnerId = '',
-    this.prepayId = '',
-    this.sign = '',
-    this.timeStamp = '',
-  });
+//   WechatPaymentSignBean({
+//     this.appId = '',
+//     this.nonceStr = '',
+//     this.package = '',
+//     this.partnerId = '',
+//     this.prepayId = '',
+//     this.sign = '',
+//     this.timeStamp = '',
+//   });
 
-  static WechatPaymentSignBean stringToBean(String jsonStr) {
-    final Map<String, dynamic> json = jsonDecode(jsonStr);
-    return WechatPaymentSignBean.fromJson(json);
-  }
+//   static WechatPaymentSignBean stringToBean(String jsonStr) {
+//     final Map<String, dynamic> json = jsonDecode(jsonStr);
+//     return WechatPaymentSignBean.fromJson(json);
+//   }
 
-  factory WechatPaymentSignBean.fromJson(Map<String, dynamic> json) =>
-      _$WechatPaymentSignBeanFromJson(json);
-}
+//   factory WechatPaymentSignBean.fromJson(Map<String, dynamic> json) =>
+//       _$WechatPaymentSignBeanFromJson(json);
+// }

lib/data/consts/constants.dart

@@ -77,8 +77,8 @@ class PayPlatform {
 }
 
 class PayMethod {
-  static const int alipay = 1;
-  static const int wechat = 2;
+  // static const int alipay = 1;
+  // static const int wechat = 2;
   static const int apple = 3;
   static const int google = 4;
   static const int douYin = 5;

lib/handler/event_handler.dart

@@ -23,11 +23,14 @@ class EventHandler {
     if (isShowToast) {
       String? payWayStr;
       switch (payWay) {
-        case PayMethod.alipay:
-          payWayStr = '支付宝';
-          break;
-        case PayMethod.wechat:
-          payWayStr = '微信';
+        // case PayMethod.alipay:
+        //   payWayStr = '支付宝';
+        //   break;
+        // case PayMethod.wechat:
+        //   payWayStr = '微信';
+        //   break;
+        case PayMethod.apple:
+          payWayStr = '苹果';
           break;
       }
       ToastUtil.showToast(

lib/module/store/controller.dart

@@ -8,7 +8,7 @@ import 'package:electronic_assistant/module/store/payment_status_manager.dart';
 import 'package:electronic_assistant/module/store/view.dart';
 import 'package:electronic_assistant/resource/string.gen.dart';
 import 'package:electronic_assistant/sdk/pay/agile_pay.dart';
-import 'package:electronic_assistant/sdk/pay/alipay/ali_pay_info.dart';
+// import 'package:electronic_assistant/sdk/pay/alipay/ali_pay_info.dart';
 import 'package:electronic_assistant/sdk/pay/applepay/apple_pay_info.dart';
 import 'package:electronic_assistant/sdk/pay/code/agile_pay_code.dart';
 import 'package:electronic_assistant/utils/http_handler.dart';
@@ -18,13 +18,13 @@ import 'package:get/get.dart';
 import '../../data/api/response/order_pay_response.dart';
 import '../../data/api/response/user_info_response.dart';
 import '../../data/bean/store_item.dart';
-import '../../data/bean/wechat_payment_sign_bean.dart';
+// import '../../data/bean/wechat_payment_sign_bean.dart';
 import '../../data/consts/constants.dart';
 import '../../data/consts/error_code.dart';
 import '../../data/repositories/account_repository.dart';
 import '../../dialog/loading_dialog.dart';
 import '../../sdk/pay/assist/product_type.dart';
-import '../../sdk/pay/wxpay/wechat_pay_info.dart';
+// import '../../sdk/pay/wxpay/wechat_pay_info.dart';
 
 class StoreController extends BaseController implements PaymentStatusCallback {
   final isExpanded = false.obs;
@@ -110,22 +110,23 @@ class StoreController extends BaseController implements PaymentStatusCallback {
 
       dynamic payInfo;
       String outTradeNo = response.outTradeNo;
-      if (payPlatform == PayPlatform.android) {
-        if (payMethod == PayMethod.alipay) {
-          payInfo = AliPayInfo(response.alipayOrderString!);
-        } else if (payMethod == PayMethod.wechat) {
-          WechatPaymentSignBean bean =
-              WechatPaymentSignBean.stringToBean(response.wechatPayPrepayJson!);
-          payInfo = WechatPayInfo(
-              appId: bean.appId,
-              partnerId: bean.partnerId,
-              prepayId: bean.prepayId,
-              package: bean.package,
-              noncestr: bean.nonceStr,
-              timestamp: bean.timeStamp,
-              sign: bean.sign);
-        }
-      } else if (payPlatform == PayPlatform.apple) {
+      // if (payPlatform == PayPlatform.android) {
+      //   if (payMethod == PayMethod.alipay) {
+      //     payInfo = AliPayInfo(response.alipayOrderString!);
+      //   } else if (payMethod == PayMethod.wechat) {
+      //     WechatPaymentSignBean bean =
+      //         WechatPaymentSignBean.stringToBean(response.wechatPayPrepayJson!);
+      //     payInfo = WechatPayInfo(
+      //         appId: bean.appId,
+      //         partnerId: bean.partnerId,
+      //         prepayId: bean.prepayId,
+      //         package: bean.package,
+      //         noncestr: bean.nonceStr,
+      //         timestamp: bean.timeStamp,
+      //         sign: bean.sign);
+      //   }
+      // } else
+      if (payPlatform == PayPlatform.apple) {
         payInfo = ApplePayInfo(
             storeItem.appleGoodsId,
             storeItem.subscribable == 1
@@ -167,11 +168,12 @@ class StoreController extends BaseController implements PaymentStatusCallback {
   }
 
   void errorEventReport(int payMethod) {
-    if (payMethod == PayMethod.wechat) {
-      EventHandler.report(EventId.event_104003, params: {'id': '001'});
-    } else if (payMethod == PayMethod.alipay) {
-      EventHandler.report(EventId.event_104003, params: {'id': '002'});
-    } else if (payMethod == PayMethod.apple) {
+    // if (payMethod == PayMethod.wechat) {
+    //   EventHandler.report(EventId.event_104003, params: {'id': '001'});
+    // } else if (payMethod == PayMethod.alipay) {
+    //   EventHandler.report(EventId.event_104003, params: {'id': '002'});
+    // } else
+    if (payMethod == PayMethod.apple) {
       EventHandler.report(EventId.event_104003, params: {'id': '003'});
     }
   }
@@ -182,7 +184,7 @@ class StoreController extends BaseController implements PaymentStatusCallback {
     } else if (errno == AgilePayCode.payCodeCancelError) {
       ToastUtil.showToast(StringName.storePayUserCancel.tr);
     } else if (errno == AgilePayCode.payCodeWxEnvError) {
-      ToastUtil.showToast(StringName.storePayWxEvnError.tr);
+      // ToastUtil.showToast(StringName.storePayWxEvnError.tr);
     } else if (errno == AgilePayCode.payCodeNotConnectStore) {
       ToastUtil.showToast(StringName.storePayNotConnectstore.tr);
     } else {
@@ -210,11 +212,12 @@ class StoreController extends BaseController implements PaymentStatusCallback {
     LoadingDialog.hide();
     ToastUtil.showToast(StringName.storePaySuccess.tr);
     Map<String, dynamic> params = {};
-    if (paymentWay.payMethod == PayMethod.wechat) {
-      params['id'] = '001';
-    } else if (paymentWay.payMethod == PayMethod.alipay) {
-      params['id'] = '002';
-    } else if (paymentWay.payMethod == PayMethod.apple) {
+    // if (paymentWay.payMethod == PayMethod.wechat) {
+    //   params['id'] = '001';
+    // } else if (paymentWay.payMethod == PayMethod.alipay) {
+    //   params['id'] = '002';
+    // } else
+    if (paymentWay.payMethod == PayMethod.apple) {
       params['id'] = '003';
     }
     if (fromType == StoreFromType.home) {

lib/sdk/gravity/gravity_helper.dart

@@ -104,11 +104,12 @@ class GravityHelper {
   static void reportPay(
       int payAmount, String orderNo, String productName, int payWay) {
     PayType payType;
-    if (payWay == PayMethod.alipay) {
-      payType = PayType.alipay;
-    } else if (payWay == PayMethod.wechat) {
-      payType = PayType.wechat;
-    } else if (payWay == PayMethod.apple) {
+    // if (payWay == PayMethod.alipay) {
+    //   payType = PayType.alipay;
+    // } else if (payWay == PayMethod.wechat) {
+    //   payType = PayType.wechat;
+    // } else
+    if (payWay == PayMethod.apple) {
       payType = PayType.apple;
     } else {
       payType = PayType.unknown;

lib/sdk/pay/agile_pay.dart

@@ -1,9 +1,9 @@
-import 'package:electronic_assistant/sdk/pay/alipay/alipay.dart';
+// import 'package:electronic_assistant/sdk/pay/alipay/alipay.dart';
 import 'package:electronic_assistant/sdk/pay/googlepay/google_pay_info.dart';
 import 'package:electronic_assistant/sdk/pay/listener/i_agile_pay.dart';
-import 'package:electronic_assistant/sdk/pay/wxpay/wechat_pay.dart';
-import 'package:electronic_assistant/sdk/pay/wxpay/wechat_pay_info.dart';
-import 'alipay/ali_pay_info.dart';
+// import 'package:electronic_assistant/sdk/pay/wxpay/wechat_pay.dart';
+// import 'package:electronic_assistant/sdk/pay/wxpay/wechat_pay_info.dart';
+// import 'alipay/ali_pay_info.dart';
 import 'applepay/apple_pay.dart';
 import 'applepay/apple_pay_info.dart';
 import 'code/agile_pay_code.dart';

lib/sdk/pay/alipay/ali_pay_info.dart

@@ -1,7 +1,7 @@
-class AliPayInfo {
-  final String _payInfo;
+// class AliPayInfo {
+//   final String _payInfo;
 
-  AliPayInfo(this._payInfo);
+//   AliPayInfo(this._payInfo);
 
-  String get payInfo => _payInfo;
-}
+//   String get payInfo => _payInfo;
+// }

lib/sdk/pay/code/agile_pay_code.dart

@@ -2,7 +2,7 @@ class AgilePayCode {
   AgilePayCode._();
 
   static const int payCodeQqwalletNotSupport = 50000;
-  static const int payCodeAlipaySuccess = 9000;
+  // static const int payCodeAlipaySuccess = 9000;
   static const int payCodeOtherError = 99999;
   static const int payCodeTokenError = 80000;
   static const int payCodeTokenFormatError = 80001;
@@ -32,10 +32,10 @@ class AgilePayCode {
     payCodeNetError: "网络连接异常",
     payCodeTokenError: "Token获取失败",
     payCodeTokenFormatError: "Token格式错误",
-    payCodeWxEnvError: "微信未安装或微信版本不支持",
-    payCodeWxNoResultError: "微信支付无返回值",
-    payCodeWxNoTokenError: "微信支付获取access_token错误",
-    payCodeWxNoPayperidError: "微信支付获取payperid错误",
+    // payCodeWxEnvError: "微信未安装或微信版本不支持",
+    // payCodeWxNoResultError: "微信支付无返回值",
+    // payCodeWxNoTokenError: "微信支付获取access_token错误",
+    // payCodeWxNoPayperidError: "微信支付获取payperid错误",
     payCodeParamsError: "参数错误",
     payCodePayError: "支付失败",
     payCodeShengKeyNotMatch: "证书不匹配",

lib/sdk/pay/wxpay/wechat_pay_info.dart

@@ -1,41 +1,41 @@
-class WechatPayInfo {
-  String _appId; // 应用ID
-  String _partnerId; // 商户号
-  String _prepayId; // 预支付交易会话ID
-  String _package; // 扩展字段
-  String _noncestr; // 随机字符串
-  String _timestamp; // 时间戳
-  String _sign; // 签名
-  String? universalLink;
-
-  WechatPayInfo({
-    required String appId,
-    required String partnerId,
-    required String prepayId,
-    required String package,
-    required String noncestr,
-    required String timestamp,
-    required String sign,
-    this.universalLink,
-  })  : _appId = appId,
-        _partnerId = partnerId,
-        _prepayId = prepayId,
-        _package = package,
-        _noncestr = noncestr,
-        _timestamp = timestamp,
-        _sign = sign;
-
-  String get appId => _appId;
-
-  String get partnerId => _partnerId;
-
-  String get prepayId => _prepayId;
-
-  String get package => _package;
-
-  String get noncestr => _noncestr;
-
-  String get timestamp => _timestamp;
-
-  String get sign => _sign;
-}
+// class WechatPayInfo {
+//   String _appId; // 应用ID
+//   String _partnerId; // 商户号
+//   String _prepayId; // 预支付交易会话ID
+//   String _package; // 扩展字段
+//   String _noncestr; // 随机字符串
+//   String _timestamp; // 时间戳
+//   String _sign; // 签名
+//   String? universalLink;
+
+//   WechatPayInfo({
+//     required String appId,
+//     required String partnerId,
+//     required String prepayId,
+//     required String package,
+//     required String noncestr,
+//     required String timestamp,
+//     required String sign,
+//     this.universalLink,
+//   })  : _appId = appId,
+//         _partnerId = partnerId,
+//         _prepayId = prepayId,
+//         _package = package,
+//         _noncestr = noncestr,
+//         _timestamp = timestamp,
+//         _sign = sign;
+
+//   String get appId => _appId;
+
+//   String get partnerId => _partnerId;
+
+//   String get prepayId => _prepayId;
+
+//   String get package => _package;
+
+//   String get noncestr => _noncestr;
+
+//   String get timestamp => _timestamp;
+
+//   String get sign => _sign;
+// }

plugin/gravity_engine/lib/gravity_engine_method_channel.dart

@@ -79,8 +79,8 @@ class MethodChannelGravityEngine extends GravityEnginePlatform {
 }
 
 enum PayType {
-  alipay,
-  wechat,
+  // alipay,
+  // wechat,
   apple,
   unknown,
 }
@@ -88,10 +88,10 @@ enum PayType {
 extension PayTypeExtension on PayType {
   String get name {
     switch (this) {
-      case PayType.alipay:
-        return "支付宝";
-      case PayType.wechat:
-        return "微信";
+      // case PayType.alipay:
+      //   return "支付宝";
+      // case PayType.wechat:
+      //   return "微信";
       case PayType.apple:
         return "苹果支付";
       default: