diff --git a/android/build.gradle b/android/build.gradle index 030397f..8143843 100644 --- a/android/build.gradle +++ b/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' } diff --git a/android/gradlew b/android/gradlew old mode 100644 new mode 100755 diff --git a/android/libs/alibcad-5.0.0.13.aar b/android/libs/alibcad-5.0.0.13.aar new file mode 100644 index 0000000..6c5f640 Binary files /dev/null and b/android/libs/alibcad-5.0.0.13.aar differ diff --git a/android/libs/alibcapplink-5.0.0.13.aar b/android/libs/alibcapplink-5.0.0.13.aar new file mode 100644 index 0000000..0d903dd Binary files /dev/null and b/android/libs/alibcapplink-5.0.0.13.aar differ diff --git a/android/libs/alibclogin-5.0.0.13.aar b/android/libs/alibclogin-5.0.0.13.aar new file mode 100644 index 0000000..875d59a Binary files /dev/null and b/android/libs/alibclogin-5.0.0.13.aar differ diff --git a/android/libs/alibcnbtrade-5.0.0.13.aar b/android/libs/alibcnbtrade-5.0.0.13.aar new file mode 100644 index 0000000..0375210 Binary files /dev/null and b/android/libs/alibcnbtrade-5.0.0.13.aar differ diff --git a/android/libs/alibcprotocol-5.0.0.13.aar b/android/libs/alibcprotocol-5.0.0.13.aar new file mode 100644 index 0000000..49ba771 Binary files /dev/null and b/android/libs/alibcprotocol-5.0.0.13.aar differ diff --git a/android/libs/alibctools-5.0.0.13.aar b/android/libs/alibctools-5.0.0.13.aar new file mode 100644 index 0000000..96d102f Binary files /dev/null and b/android/libs/alibctools-5.0.0.13.aar differ diff --git a/android/libs/alibctradecommon-5.0.0.13.aar b/android/libs/alibctradecommon-5.0.0.13.aar new file mode 100644 index 0000000..2653247 Binary files /dev/null and b/android/libs/alibctradecommon-5.0.0.13.aar differ diff --git a/android/libs/alibctriver-5.0.0.13.aar b/android/libs/alibctriver-5.0.0.13.aar new file mode 100644 index 0000000..c24c78a Binary files /dev/null and b/android/libs/alibctriver-5.0.0.13.aar differ diff --git a/android/libs/alibctriver_live-5.0.0.13.aar b/android/libs/alibctriver_live-5.0.0.13.aar new file mode 100644 index 0000000..80f153a Binary files /dev/null and b/android/libs/alibctriver_live-5.0.0.13.aar differ diff --git a/android/libs/alibcwebview-5.0.0.13.aar b/android/libs/alibcwebview-5.0.0.13.aar new file mode 100644 index 0000000..0a2dd28 Binary files /dev/null and b/android/libs/alibcwebview-5.0.0.13.aar differ diff --git a/android/libs/avmpaar3-5.0.0.9-v5.aar b/android/libs/avmpaar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..f914f4d Binary files /dev/null and b/android/libs/avmpaar3-5.0.0.9-v5.aar differ diff --git a/android/libs/securitybodyaar3-5.0.0.9-v5.aar b/android/libs/securitybodyaar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..20f28ab Binary files /dev/null and b/android/libs/securitybodyaar3-5.0.0.9-v5.aar differ diff --git a/android/libs/securityguardaar3-5.0.0.9-v5.aar b/android/libs/securityguardaar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..d6c5300 Binary files /dev/null and b/android/libs/securityguardaar3-5.0.0.9-v5.aar differ diff --git a/android/libs/sgmiddletieraar3-5.0.0.9-v5.aar b/android/libs/sgmiddletieraar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..c5eaf92 Binary files /dev/null and b/android/libs/sgmiddletieraar3-5.0.0.9-v5.aar differ diff --git a/android/src/main/res/layout/activity_web_bc.xml b/android/src/main/res/layout/activity_web_bc.xml index db1c55b..ef783f0 100644 --- a/android/src/main/res/layout/activity_web_bc.xml +++ b/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" /> diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 30666d3..892db97 100644 --- a/example/.flutter-plugins-dependencies +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 36127cc..adb54c6 100644 --- a/example/android/app/build.gradle +++ b/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') } diff --git a/example/android/app/libs/alibcad-5.0.0.13.aar b/example/android/app/libs/alibcad-5.0.0.13.aar new file mode 100644 index 0000000..6c5f640 Binary files /dev/null and b/example/android/app/libs/alibcad-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibcapplink-5.0.0.13.aar b/example/android/app/libs/alibcapplink-5.0.0.13.aar new file mode 100644 index 0000000..0d903dd Binary files /dev/null and b/example/android/app/libs/alibcapplink-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibclogin-5.0.0.13.aar b/example/android/app/libs/alibclogin-5.0.0.13.aar new file mode 100644 index 0000000..875d59a Binary files /dev/null and b/example/android/app/libs/alibclogin-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibcnbtrade-5.0.0.13.aar b/example/android/app/libs/alibcnbtrade-5.0.0.13.aar new file mode 100644 index 0000000..0375210 Binary files /dev/null and b/example/android/app/libs/alibcnbtrade-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibcprotocol-5.0.0.13.aar b/example/android/app/libs/alibcprotocol-5.0.0.13.aar new file mode 100644 index 0000000..49ba771 Binary files /dev/null and b/example/android/app/libs/alibcprotocol-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibctools-5.0.0.13.aar b/example/android/app/libs/alibctools-5.0.0.13.aar new file mode 100644 index 0000000..96d102f Binary files /dev/null and b/example/android/app/libs/alibctools-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibctradecommon-5.0.0.13.aar b/example/android/app/libs/alibctradecommon-5.0.0.13.aar new file mode 100644 index 0000000..2653247 Binary files /dev/null and b/example/android/app/libs/alibctradecommon-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibctriver-5.0.0.13.aar b/example/android/app/libs/alibctriver-5.0.0.13.aar new file mode 100644 index 0000000..c24c78a Binary files /dev/null and b/example/android/app/libs/alibctriver-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibctriver_live-5.0.0.13.aar b/example/android/app/libs/alibctriver_live-5.0.0.13.aar new file mode 100644 index 0000000..80f153a Binary files /dev/null and b/example/android/app/libs/alibctriver_live-5.0.0.13.aar differ diff --git a/example/android/app/libs/alibcwebview-5.0.0.13.aar b/example/android/app/libs/alibcwebview-5.0.0.13.aar new file mode 100644 index 0000000..0a2dd28 Binary files /dev/null and b/example/android/app/libs/alibcwebview-5.0.0.13.aar differ diff --git a/example/android/app/libs/avmpaar3-5.0.0.9-v5.aar b/example/android/app/libs/avmpaar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..f914f4d Binary files /dev/null and b/example/android/app/libs/avmpaar3-5.0.0.9-v5.aar differ diff --git a/example/android/app/libs/securitybodyaar3-5.0.0.9-v5.aar b/example/android/app/libs/securitybodyaar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..20f28ab Binary files /dev/null and b/example/android/app/libs/securitybodyaar3-5.0.0.9-v5.aar differ diff --git a/example/android/app/libs/securityguardaar3-5.0.0.9-v5.aar b/example/android/app/libs/securityguardaar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..d6c5300 Binary files /dev/null and b/example/android/app/libs/securityguardaar3-5.0.0.9-v5.aar differ diff --git a/example/android/app/libs/sgmiddletieraar3-5.0.0.9-v5.aar b/example/android/app/libs/sgmiddletieraar3-5.0.0.9-v5.aar new file mode 100644 index 0000000..c5eaf92 Binary files /dev/null and b/example/android/app/libs/sgmiddletieraar3-5.0.0.9-v5.aar differ diff --git a/example/android/app/libs/sweet-alert-dialog_v1.3.aar b/example/android/app/libs/sweet-alert-dialog_v1.3.aar new file mode 100644 index 0000000..183c3dd Binary files /dev/null and b/example/android/app/libs/sweet-alert-dialog_v1.3.aar differ diff --git a/example/android/build.gradle b/example/android/build.gradle index cab5fec..28967cb 100644 --- a/example/android/build.gradle +++ b/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' + } } } diff --git a/example/android/settings_aar.gradle b/example/android/settings_aar.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/example/android/settings_aar.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh deleted file mode 100755 index 223afaf..0000000 --- a/example/ios/Flutter/flutter_export_environment.sh +++ /dev/null @@ -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" diff --git a/example/pubspec.lock b/example/pubspec.lock index e955120..ba8787d 100644 --- a/example/pubspec.lock +++ b/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: