From f9065b4284cb27fa8e484365d6ea4aff05c71cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”> Date: Mon, 1 Mar 2021 10:03:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=A2=AB=E6=8C=A4=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E5=90=8E=E7=9A=84=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 | 58 +++++++++++++++--------------- example/pubspec.yaml | 2 ++ lib/pages/home_page/home_page.dart | 6 +++- lib/register.dart | 1 + 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 00d289d..bc44f9c 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 46 -// dimension "app" -// versionName '1.3.4' -// // 签名信息 -// 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 47 + dimension "app" + versionName '1.3.5' + // 签名信息 + 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/pubspec.yaml b/example/pubspec.yaml index 491d1b5..e5ae860 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -46,6 +46,8 @@ dev_dependencies: git: ref: 0.0.2 url: http://192.168.0.138:3000/FnuoOS_ZhiYing/Zhiying_Member_Upgrade.git + plugin_platform_interface: "1.0.2" + permission_handler_platform_interface: "2.0.1" # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/lib/pages/home_page/home_page.dart b/lib/pages/home_page/home_page.dart index dbba4fc..859cfac 100644 --- a/lib/pages/home_page/home_page.dart +++ b/lib/pages/home_page/home_page.dart @@ -58,7 +58,11 @@ class _HomePageState extends State with WidgetsBindingObserver, Ticker initAsync(); //如果登出则重新打开首页 - streamSubscription = EventUtil.instance.on().listen((event) { + streamSubscription = EventUtil.instance.on().listen((event) async{ + UserInfoModel user = + await Provider.of(context, listen: false) + .getUserInfoModel(); + user.token=''; Navigator.maybePop(context); Navigator.pushReplacementNamed(context, "/homePage"); }); diff --git a/lib/register.dart b/lib/register.dart index 9c1c88a..80e9ae8 100644 --- a/lib/register.dart +++ b/lib/register.dart @@ -154,6 +154,7 @@ class BaseWidgetRegister { // NetUtil.post('/api/v1/rec/suning?page=1', method: NetMethod.GET, cache: true, showToast: false); // // 考拉 // NetUtil.post('/api/v1/rec/kaola?page=1', method: NetMethod.GET, cache: true, showToast: false); + LoginStyleUtil.fetchNetPageData(); return null; });