Merge commit '213caa53fdeee5db0a48067ae8176a4c6f2dd8b0' into null-safe

# Conflicts:
#	example/.flutter-plugins-dependencies
#	example/ios/Flutter/flutter_export_environment.sh
#	example/pubspec.lock
#	pubspec.lock

android/build.gradle

@@ -6,6 +6,12 @@ buildscript {
         google()
         jcenter()
         maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        flatDir {
+            dirs 'libs'
+        }
+        flatDir {
+            dirs 'libs', '../../../../library_module/libs'
+        }
     }
 
     dependencies {
@@ -18,9 +24,6 @@ rootProject.allprojects {
         google()
         jcenter()
         maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
-        maven {
-            url "http://repo.baichuan-android.taobao.com/content/groups/BaichuanRepositories/"
-        }
     }
 }
 
@@ -68,35 +71,44 @@ dependencies{
 //    implementation 'com.alibaba.sdk.android:nb_trade:4.0.0.16@aar'
 //    implementation 'com.alibaba:fastjson:1.2.52@jar'
 
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    // 登陆
-    implementation 'com.alibaba.baichuan.sdk:alibclogin:5.0.0.13'
-    // applink
-    implementation 'com.alibaba.baichuan.sdk:alibcapplink:5.0.0.13'
-    // 广告SDK
-    implementation 'com.alibaba.baichuan.sdk:alibcad:5.0.0.13'
-    // 小程序
-    implementation 'com.alibaba.baichuan.sdk:alibctriver:5.0.0.13'
-    // c++基础库（如果工程中没有接入该so包：libc++_shared.so，需要接入该sdk）
-    implementation "llvm.stl:cpp_shared:0.0.3@aar"
-    // 直播
-    implementation 'com.alibaba.baichuan.sdk:alibctriver_live:5.0.0.13'
-    // webview容器
-    implementation 'com.alibaba.baichuan.sdk:alibcwebview:5.0.0.13'
-    // 电商基础组件
-    implementation 'com.alibaba.baichuan.sdk:alibctradecommon:5.0.0.13'
-    implementation 'com.alibaba.baichuan.sdk:alibcnbtrade:5.0.0.13'
-    implementation 'com.alibaba.baichuan.sdk:alibcprotocol:5.0.0.13'
-    // 辅助排查工具（可选）
-    implementation "com.alibaba.baichuan.sdk:alibctools:5.0.0.13"
-    // 安全保镖v5版本（根据实际情况，v5和v6版本选择其一）
-    implementation 'com.taobao.android:securityguardaar3:5.0.0.9-v5@aar'
-    implementation 'com.taobao.android:securitybodyaar3:5.0.0.9-v5@aar'
-    implementation 'com.taobao.android:avmpaar3:5.0.0.9-v5@aar'
-    implementation 'com.taobao.android:sgmiddletieraar3:5.0.0.9-v5@aar'
+//    implementation 'com.android.support:multidex:1.0.3'
+//    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+//    implementation 'androidx.cardview:cardview:1.0.0'
+//    // 登陆
+//    implementation 'com.alibaba.baichuan.sdk:alibclogin:5.0.0.13'
+//    // applink
+//    implementation 'com.alibaba.baichuan.sdk:alibcapplink:5.0.0.13'
+//    // 广告SDK
+//    implementation 'com.alibaba.baichuan.sdk:alibcad:5.0.0.13'
+//    // 小程序
+//    implementation 'com.alibaba.baichuan.sdk:alibctriver:5.0.0.13'
+//    // c++基础库（如果工程中没有接入该so包：libc++_shared.so，需要接入该sdk）
+//    implementation "llvm.stl:cpp_shared:0.0.3@aar"
+//    // 直播
+//    implementation 'com.alibaba.baichuan.sdk:alibctriver_live:5.0.0.13'
+//    // webview容器
+//    implementation 'com.alibaba.baichuan.sdk:alibcwebview:5.0.0.13'
+//    // 电商基础组件
+//    implementation 'com.alibaba.baichuan.sdk:alibctradecommon:5.0.0.13'
+//    implementation 'com.alibaba.baichuan.sdk:alibcnbtrade:5.0.0.13'
+//    implementation 'com.alibaba.baichuan.sdk:alibcprotocol:5.0.0.13'
+//    // 辅助排查工具（可选）
+//    implementation "com.alibaba.baichuan.sdk:alibctools:5.0.0.13"
+//    // 安全保镖v5版本（根据实际情况，v5和v6版本选择其一）
+//    implementation 'com.taobao.android:securityguardaar3:5.0.0.9-v5@aar'
+//    implementation 'com.taobao.android:securitybodyaar3:5.0.0.9-v5@aar'
+//    implementation 'com.taobao.android:avmpaar3:5.0.0.9-v5@aar'
+//    implementation 'com.taobao.android:sgmiddletieraar3:5.0.0.9-v5@aar'
+
+
+    compileOnly fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+//    implementation(name: 'cardview-1.0.0', ext: 'aar')
 
+//    implementation(name: 'MiddleTierSDK-external-release-5.5.24-preInstall', ext: 'aar')
+//    implementation(name: 'MiscSDK-external-release-5.5.9-preInstall', ext: 'aar')
+//    implementation(name: 'NoCaptchaSDK-external-release-5.5.8-preInstall', ext: 'aar')
+//    implementation(name: 'SecurityBodySDK-external-release-5.5.28-preInstall', ext: 'aar')
+//    implementation(name: 'SecurityGuardSDK-external-release-5.5.22-preInstall', ext: 'aar')
     implementation 'com.alibaba:fastjson:1.1.71.android'
 
 }

android/src/main/res/layout/activity_web_bc.xml

@@ -14,7 +14,6 @@
             android:focusable="true"
             android:layout_centerVertical="true"
             android:layout_alignParentLeft="true"
-            android:src="@drawable/com_taobao_nb_sdk_web_view_title_bar_back"
             android:layout_marginStart="16dp"
             android:contentDescription="dfsa" />
     </RelativeLayout>

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_alibc","path":"/Users/fnuouser/Documents/code/zhiying/zhiying_flutter_alibc/","dependencies":[]}],"android":[{"name":"flutter_alibc","path":"/Users/fnuouser/Documents/code/zhiying/zhiying_flutter_alibc/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_alibc","dependencies":[]}],"date_created":"2022-03-30 14:17:04.674376","version":"2.10.3"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_alibc","path":"/Users/fnuouser/Documents/code/zhiying/zhiying_flutter_alibc/","dependencies":[]}],"android":[{"name":"flutter_alibc","path":"/Users/fnuouser/Documents/code/zhiying/zhiying_flutter_alibc/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_alibc","dependencies":[]}],"date_created":"2022-03-30 14:23:23.445986","version":"2.10.3"}

example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,8 +34,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "wxwx.com.flutter_alibc_example"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion 29
         multiDexEnabled true
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -75,5 +75,22 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+
+    implementation(name: 'alibcad-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibcapplink-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibclogin-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibcnbtrade-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibcprotocol-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibctradecommon-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibctriver-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibctriver_live-5.0.0.13', ext: 'aar')
+    implementation(name: 'alibcwebview-5.0.0.13', ext: 'aar')
+
+    implementation(name: 'avmpaar3-5.0.0.9-v5', ext: 'aar')
+    implementation(name: 'securitybodyaar3-5.0.0.9-v5', ext: 'aar')
+    implementation(name: 'securityguardaar3-5.0.0.9-v5', ext: 'aar')
+    implementation(name: 'sgmiddletieraar3-5.0.0.9-v5', ext: 'aar')
 }

example/android/build.gradle

@@ -1,10 +1,6 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-        maven {
-            url "http://repo.baichuan-android.taobao.com/content/groups/BaichuanRepositories/"
-        }
     }
 
     dependencies {
@@ -15,7 +11,9 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        flatDir {
+            dirs 'libs'
+        }
     }
 }
 

example/android/settings_aar.gradle

@@ -0,0 +1 @@
+include ':app'

example/ios/Flutter/flutter_export_environment.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-# This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/fnuouser/Documents/code/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/fnuouser/Documents/code/zhiying/zhiying_flutter_alibc/example"
-export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=/Users/fnuouser/Documents/code/zhiying/zhiying_flutter_alibc/example/lib/main.dart"
-export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=1.0.0"
-export "FLUTTER_BUILD_NUMBER=1"
-export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ=="
-export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
-export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=/Users/fnuouser/Documents/code/zhiying/zhiying_flutter_alibc/example/.dart_tool/package_config.json"

example/pubspec.lock

@@ -49,7 +49,7 @@ packages:
       name: cupertino_icons
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
   fake_async:
     dependency: transitive
     description: