From fca2571eb5440e54b405ba9303ef421d95360f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”>
Date: Wed, 7 Apr 2021 16:15:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BC=80=E6=94=BE=E5=BE=AE=E5=8D=9A=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/android/app/build.gradle              | 58 +++++++++----------
 .../MainActivity.java                         | 12 ++--
 lib/register.dart                             |  4 +-
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index ba8c05a..717c98b 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -53,8 +53,8 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             //选择要添加的对应cpu类型的.so库。
-            abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a'
-           // abiFilters  'armeabi-v7a','x86_64'
+           // abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a'
+            abiFilters  'armeabi-v7a','x86_64'
         }
     }
 
@@ -109,33 +109,33 @@ android {
 
 
     // 应用信息配置
-//    productFlavors {
-//        // 智夜生活
-//        zhiying {
-//            applicationId "cn.zhios.zhiying"
-//            versionCode 59
-//            dimension "app"
-//            versionName '1.3.19'
-//            // 签名信息
-//            signingConfig signingConfigs.zhiying
-//        }
-//    }
-//
-//    // 打包脚本
-//    android.applicationVariants.all { variant ->
-//        if (variant.buildType.name != "debug") {
-//            variant.getPackageApplicationProvider().get().outputDirectory = new File(project.rootDir.absolutePath + "/app/build/outputs/apk")
-//        }
-//
-//        variant.outputs.all { output ->
-//            def outputFile = output.outputFile
-//            if (outputFile != null && outputFile.name.endsWith('.apk')) {
-//                //这里修改apk文件名
-//                def fileName = "${variant.productFlavors[0].name}_${releaseTime()}01_&V${variant.productFlavors[0].versionCode}.apk"
-//                outputFileName = fileName
-//            }
-//        }
-//    }
+    productFlavors {
+        // 智夜生活
+        zhiying {
+            applicationId "cn.zhios.zhiying"
+            versionCode 60
+            dimension "app"
+            versionName '1.3.20'
+            // 签名信息
+            signingConfig signingConfigs.zhiying
+        }
+    }
+
+    // 打包脚本
+    android.applicationVariants.all { variant ->
+        if (variant.buildType.name != "debug") {
+            variant.getPackageApplicationProvider().get().outputDirectory = new File(project.rootDir.absolutePath + "/app/build/outputs/apk")
+        }
+
+        variant.outputs.all { output ->
+            def outputFile = output.outputFile
+            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                //这里修改apk文件名
+                def fileName = "${variant.productFlavors[0].name}_${releaseTime()}01_&V${variant.productFlavors[0].versionCode}.apk"
+                outputFileName = fileName
+            }
+        }
+    }
 
     configurations.all {
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
diff --git a/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java b/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java
index b8f36e8..32365c6 100644
--- a/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java
+++ b/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java
@@ -155,14 +155,14 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN
     public Map getSetting() {
         Map map = new HashMap();
 //        ///测试
-        map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
-        map.put("master_id", "123456");
-        map.put("secret_key", "123456");
+//        map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
+//        map.put("master_id", "123456");
+//        map.put("secret_key", "123456");
 
         ///正式
-//        map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689
-//        map.put("master_id", "99813608");
-//        map.put("secret_key", "123456");
+        map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689
+        map.put("master_id", "99813608");
+        map.put("secret_key", "123456");
 
         //客户测试
 //        map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689
diff --git a/lib/register.dart b/lib/register.dart
index a426865..70d6eff 100644
--- a/lib/register.dart
+++ b/lib/register.dart
@@ -121,8 +121,8 @@ class BaseWidgetRegister {
       // ================ Weixin
       register.setupWechat(config.keys?.weixin?.appId ?? '', config.keys?.weixin?.secret ?? '', config.keys?.weixin?.universalLink ?? '');
 
-      // ================ Weibo
-      // register.setupSinaWeibo(config.keys?.weibo?.appkey ?? '', config.keys?.weibo?.secret ?? '', config.keys?.weibo?.redirectUrl ?? '');
+      //================ Weibo
+      register.setupSinaWeibo(config.keys?.weibo?.appkey ?? '', config.keys?.weibo?.secret ?? '', config.keys?.weibo?.redirectUrl ?? '',config.keys?.weibo?.universalLink??'');
 
       // ================ QQ
       register.setupQQ(config.keys?.qq?.appId ?? '', config.keys?.qq?.appkey ?? '');