From c2e4c7d4b151a00c8435f3a7ddbf20ba464fe1d2 Mon Sep 17 00:00:00 2001
From: PH2 <1293456824@qq.com>
Date: Wed, 31 Mar 2021 18:26:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E6=99=BA=E7=9B=9F?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=94=AF=E6=8C=81=202=E3=80=81=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4net=5Futil=20=E6=B5=8B=E8=AF=95=E7=9A=84head?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/util/mob_util/mob_util.dart | 66 ++++++++++++++++++++++++---------
 lib/util/net_util.dart          |  2 +-
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/lib/util/mob_util/mob_util.dart b/lib/util/mob_util/mob_util.dart
index 5c32e5d..02e473d 100644
--- a/lib/util/mob_util/mob_util.dart
+++ b/lib/util/mob_util/mob_util.dart
@@ -78,28 +78,58 @@ class MobUtil {
   static Future<bool> getTextCode(final String phone, {String zoneCode = '86', SMSCodeType smsCodeType = SMSCodeType.NORMAL}) async {
     bool result = false;
     String vCodeType = await _getSMSStrategy(phone, type: smsCodeType);
-    if (EmptyUtil.isEmpty(vCodeType)) return result;
-    Logger.debug('phone = $phone, zoneCode = $zoneCode, vCodeType = $vCodeType');
-    await Smssdk.getTextCode(phone, zoneCode, vCodeType, (ret, err) {
-      if (err != null) {
-        result = false;
-        Logger.debug('get vcode fail err = ${err?.toString()}, ret = ${ret?.toString()}' );
-        if(!EmptyUtil.isEmpty(err)){
-          Fluttertoast.showToast(msg: '获取验证码失败：${err['msg']}');
-        }else {
-          Fluttertoast.showToast(msg: '获取验证码失败～');
+    if (EmptyUtil.isEmpty(vCodeType)) {
+      result = await _getSMSDefault(phone, type: smsCodeType);
+      return Future.value(result);
+    } else {
+      Logger.debug('phone = $phone, zoneCode = $zoneCode, vCodeType = $vCodeType');
+      await Smssdk.getTextCode(phone, zoneCode, vCodeType, (ret, err) {
+        if (err != null) {
+          result = false;
+          Logger.debug('get vcode fail err = ${err?.toString()}, ret = ${ret?.toString()}');
+          if (!EmptyUtil.isEmpty(err)) {
+            Fluttertoast.showToast(msg: '获取验证码失败：${err['msg']}');
+          } else {
+            Fluttertoast.showToast(msg: '获取验证码失败～');
+          }
+        } else {
+          String rst = ret.toString();
+          if (rst == null || rst == "") {
+            rst = '获取验证码成功! ret = ${ret?.toString()}, err = ${err?.toString()} ';
+          }
+          Logger.debug(rst);
+          result = true;
         }
+      });
+    }
+    return Future.value(result);
+  }
 
+  ///
+  /// 获取智联盟的短信验证码
+  ///
+  static Future<bool> _getSMSDefault(final String phone, {SMSCodeType type = SMSCodeType.NORMAL}) async {
+    bool rlt = false;
+    try {
+      String vCodeType = enumToString(type)?.toLowerCase();
+      if (EmptyUtil.isEmpty(vCodeType)) {
+        vCodeType = enumToString(SMSCodeType.NORMAL).toLowerCase();
+      }
+      var result = await NetUtil.post('/api/v1/sign/more_sms/captcha', method: NetMethod.POST, params: {
+        'mobile': phone,
+        'type': vCodeType
+      });
+      if (NetUtil.isSuccess(result) && !EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])) {
+        // Fluttertoast.showToast(msg: result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
+        Logger.debug(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
+        rlt = true;
       } else {
-        String rst = ret.toString();
-        if (rst == null || rst == "") {
-          rst = '获取验证码成功! ret = ${ret?.toString()}, err = ${err?.toString()} ';
-        }
-        Logger.debug(rst);
-        result = true;
+        Fluttertoast.showToast(msg: result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
       }
-    });
-    return Future.value(result);
+    } catch (e, s) {
+      Logger.error(e, s);
+    }
+    return rlt;
   }
 
   /// 询问验证码是否可以下发
diff --git a/lib/util/net_util.dart b/lib/util/net_util.dart
index ad140bc..e3e3a5f 100644
--- a/lib/util/net_util.dart
+++ b/lib/util/net_util.dart
@@ -69,7 +69,7 @@ class NetUtil {
         receiveTimeout: 15000,
         contentType: Headers.jsonContentType,
         followRedirects: true,
-        headers: {'device': 'wx_applet', 'Platform': 'wx_applet'},
+        // headers: {'device': 'wx_applet', 'Platform': 'wx_applet'},
         validateStatus: (_) {
           return true;
         }));