From e96455afa80ac5d60f14b98b249f2c8aa212b73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”> Date: Tue, 16 Mar 2021 17:43:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dios=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/android/app/build.gradle | 52 +++++++++---------- .../MainActivity.java | 15 ++++-- example/ios/Runner/AppDelegate.m | 9 ++-- example/ios/Runner/Info.plist | 2 +- example/lib/main.dart | 4 +- lib/pages/launch_page/launch_page.dart | 3 +- 6 files changed, 48 insertions(+), 37 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 11eaf4e..7d845be 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -54,7 +54,7 @@ android { ndk { //选择要添加的对应cpu类型的.so库。 abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a' - // abiFilters 'armeabi-v7a','x86_64' + //abiFilters 'armeabi-v7a','x86_64' } } @@ -109,19 +109,19 @@ android { // 应用信息配置 -// productFlavors { -// // 智夜生活 -// zhiying { -// applicationId "cn.zhios.zhiying" -// versionCode 52 -// dimension "app" -// versionName '1.3.12' -// // 签名信息 -// signingConfig signingConfigs.zhiying -// } -// } -// -// // 打包脚本 + productFlavors { + // 智夜生活 + zhiying { + applicationId "cn.zhios.zhiying" + versionCode 53 + dimension "app" + versionName '1.3.13' + // 签名信息 + 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") @@ -136,18 +136,18 @@ android { // } // } // } - - configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - def requested = details.requested - if (requested.group == 'com.android.support') { - if (!requested.name.startsWith("multidex")) { - details.useVersion '28.0.3' - } - } - resolutionStrategy.force 'com.android.support:support-v4:28.0.0' - } - } +// +// configurations.all { +// resolutionStrategy.eachDependency { DependencyResolveDetails details -> +// def requested = details.requested +// if (requested.group == 'com.android.support') { +// if (!requested.name.startsWith("multidex")) { +// details.useVersion '28.0.3' +// } +// } +// resolutionStrategy.force 'com.android.support:support-v4:28.0.0' +// } +// } } 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 28c06c6..86b54c6 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 @@ -154,11 +154,18 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN @Override public Map getSetting() { Map map = new HashMap(); - map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989"); - // map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689 - //map.put("domain", "http://192.168.0.88:5000/"); - map.put("master_id", "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("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689 +// //map.put("domain", "http://192.168.0.88:5000/"); +// 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("token", "123465"); return map; } diff --git a/example/ios/Runner/AppDelegate.m b/example/ios/Runner/AppDelegate.m index 6b18197..1e66d3b 100644 --- a/example/ios/Runner/AppDelegate.m +++ b/example/ios/Runner/AppDelegate.m @@ -41,7 +41,7 @@ if (![[AlibcTradeSDK sharedInstance] application:application openURL:url sourceApplication:sourceApplication annotation:annotation]) { return YES; } - return NO; + return [super application:application openURL:url sourceApplication:sourceApplication annotation:annotation]; } @@ -51,15 +51,18 @@ if (@available(iOS 9.0, *)) { __unused BOOL isHandledByALBBSDK=[[AlibcTradeSDK sharedInstance] application:application openURL:url options:options]; - return isHandledByALBBSDK; + if (isHandledByALBBSDK) + return isHandledByALBBSDK; } else { // Fallback on earlier versions }//处理其他app跳转到自己的app，如果百川处理过会返回YES - return NO; + return [super application:application openURL:url options:options]; } + + @end diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index f0efdd4..0c5e5b5 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -105,7 +105,7 @@ alipay CFBundleURLSchemes - tobiasexample + alisdkdemo diff --git a/example/lib/main.dart b/example/lib/main.dart index 91567f9..388367a 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -47,12 +47,12 @@ class _MyAppState extends State { } return Center( child: Text( - "走神了~"+erroStr, + ""+erroStr, style: Theme .of(context) .textTheme .title - .copyWith(color: Colors.redAccent), + .copyWith(color: Colors.grey[200]), ), ); } diff --git a/lib/pages/launch_page/launch_page.dart b/lib/pages/launch_page/launch_page.dart index 0394013..3dc5fc5 100644 --- a/lib/pages/launch_page/launch_page.dart +++ b/lib/pages/launch_page/launch_page.dart @@ -76,7 +76,8 @@ class _LaunchPageState extends State with TickerProviderStateMixin { // CupertinoPageRoute(builder: (context) => HomePage())); Navigator.of(context).pushReplacementNamed('/homePage'); } - }).catchError((err) async { + }).catchError((err,s) async { + print(s); // if (err.toString().contains("BaseSettingModel")) { // await showDialog( // context: context,