From d14598b00767e54e94656036afb917a1c9f685d7 Mon Sep 17 00:00:00 2001 From: Weller <1812208341@qq.com> Date: Wed, 25 Nov 2020 16:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=BA=E6=99=AF=E8=BF=98?= =?UTF-8?q?=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dart_tool/package_config.json | 8 +- example/android/app/build.gradle | 5 + example/ios/Podfile.lock | 11 ++ example/ios/Runner/Runner.entitlements | 8 ++ .../cnzhioszhiying_dev-2.mobileprovision | Bin 0 -> 9193 bytes .../证书/zhiying_appstore.mobileprovision | Bin 0 -> 7689 bytes example/lib/main.dart | 8 +- lib/pages/home_page/home_page.dart | 77 ++++++++++++- .../wechat_teacher_page.dart | 105 +++++++++++++----- lib/utils/contants.dart | 4 + 10 files changed, 184 insertions(+), 42 deletions(-) create mode 100644 example/ios/Runner/项目资源/智莺生活/config/证书/cnzhioszhiying_dev-2.mobileprovision create mode 100644 example/ios/Runner/项目资源/智莺生活/config/证书/zhiying_appstore.mobileprovision diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 0e9eb7e..045641f 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -301,6 +301,12 @@ "packageUri": "lib/", "languageVersion": "1.12" }, + { + "name": "moblink", + "rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/moblink-3.4.1", + "packageUri": "lib/", + "languageVersion": "2.1" + }, { "name": "mobsms", "rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/mobsms-1.1.0", @@ -662,7 +668,7 @@ "languageVersion": "2.8" } ], - "generated": "2020-11-25T02:26:02.961774Z", + "generated": "2020-11-25T07:42:55.235132Z", "generator": "pub", "generatorVersion": "2.8.2" } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 6f3b74b..da722a1 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -207,6 +207,11 @@ MobSDK { appKey "30dc33054b635" appSecret "396e98c293130c9976fb7428b6b434d6" + MobLink { + uriScheme "fnoos://cn.zhios.zhiying" + appLinkHost "bied.t4m.cn" + } + //手机验证登录 SecVerify {} diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index ac0ebc1..f99ba19 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -44,6 +44,8 @@ PODS: - Flutter - jdsdk (0.0.1): - Flutter + - mob_linksdk_pro (3.3.7): + - MOBFoundation - mob_secverify (3.0.1): - MOBFoundation - mob_sharesdk (4.3.11): @@ -96,6 +98,9 @@ PODS: - mob_smssdk (3.2.10): - MOBFoundation - MOBFoundation (3.2.19) + - moblink (0.0.4): + - Flutter + - mob_linksdk_pro - mobsms (0.0.1): - Flutter - mob_smssdk @@ -198,6 +203,7 @@ DEPENDENCIES: - image_picker (from `.symlinks/plugins/image_picker/ios`) - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`) - jdsdk (from `.symlinks/plugins/jdsdk/ios`) + - moblink (from `.symlinks/plugins/moblink/ios`) - mobsms (from `.symlinks/plugins/mobsms/ios`) - package_info (from `.symlinks/plugins/package_info/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`) @@ -236,6 +242,7 @@ SPEC REPOS: - WindVane https://github.com/CocoaPods/Specs.git: - FMDB + - mob_linksdk_pro - mob_secverify - mob_sharesdk - mob_smssdk @@ -272,6 +279,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/imei_plugin/ios" jdsdk: :path: ".symlinks/plugins/jdsdk/ios" + moblink: + :path: ".symlinks/plugins/moblink/ios" mobsms: :path: ".symlinks/plugins/mobsms/ios" package_info: @@ -343,10 +352,12 @@ SPEC CHECKSUMS: image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09 imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd jdsdk: 2ca38c7e3a2dfb0f3641425f8fd1e8d20357693f + mob_linksdk_pro: 9ad768d8da15c410d51056319f43a76c7cc01347 mob_secverify: 54c03b24122be033bb53adb84694fd8c19f6c2b6 mob_sharesdk: e0d8b5807e6063cac8f9d68ef059b1d3006c9088 mob_smssdk: bd7493aa6f21e12b8daed8935c32c69552907d14 MOBFoundation: 606bc4c10ff4c6ac573c09f5081a39c75316bc7b + moblink: 3480a191e86c33f4e84af0cb5d2cc5627e78bf65 mobsms: 141956ad151a39a69a47a2ddf2e186405346c4ef mtopSDK: d6fdf81730342a69be920b576541c7bb81a683d5 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 diff --git a/example/ios/Runner/Runner.entitlements b/example/ios/Runner/Runner.entitlements index 903def2..ff13b9a 100644 --- a/example/ios/Runner/Runner.entitlements +++ b/example/ios/Runner/Runner.entitlements @@ -4,5 +4,13 @@ aps-environment development + com.apple.developer.applesignin + + Default + + com.apple.developer.associated-domains + + applinks:bied.t4m.cn + diff --git a/example/ios/Runner/项目资源/智莺生活/config/证书/cnzhioszhiying_dev-2.mobileprovision b/example/ios/Runner/项目资源/智莺生活/config/证书/cnzhioszhiying_dev-2.mobileprovision new file mode 100644 index 0000000000000000000000000000000000000000..57552a6a0ba1fdba76968c1fb204f1a9fc919d29 GIT binary patch literal 9193 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 F{|okRRki>C literal 0 HcmV?d00001 diff --git a/example/lib/main.dart b/example/lib/main.dart index 7fae307..a31fa4b 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,3 @@ -import 'dart:io'; - import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_alibc/flutter_alibc.dart'; @@ -34,11 +32,7 @@ class _MyAppState extends State { child: Text( "走神了~\n${error.exceptionAsString()}", style: - Theme - .of(context) - .textTheme - .title - .copyWith(color: Colors.redAccent), + Theme.of(context).textTheme.title.copyWith(color: Colors.redAccent), ), ); } diff --git a/lib/pages/home_page/home_page.dart b/lib/pages/home_page/home_page.dart index b112dcc..4c73bfe 100644 --- a/lib/pages/home_page/home_page.dart +++ b/lib/pages/home_page/home_page.dart @@ -3,8 +3,10 @@ import 'dart:io'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:permission_handler/permission_handler.dart'; +import 'package:flutter/services.dart'; +import 'package:moblink/moblink.dart'; import 'package:provider/provider.dart'; import 'package:zhiying_base_widget/dialog/global_dialog/intellect_search_goods_dialog/intellect_create.dart'; import 'package:zhiying_base_widget/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart'; @@ -26,6 +28,8 @@ class HomePage extends StatefulWidget { class _HomePageState extends State with WidgetsBindingObserver { int _currentIndex = 0; List> _data = List(); + static const EventChannel _eventChannel = + const EventChannel('JAVA_TO_FLUTTER'); @override void initState() { @@ -45,9 +49,43 @@ class _HomePageState extends State with WidgetsBindingObserver { TaobaoAuth.initAuth(context); _showPolicy(); + + Moblink.uploadPrivacyPermissionStatus(1, (bool success) {}); + + // 是安卓系统，Android场景还原的实现 + /*if (defaultTargetPlatform == TargetPlatform.android) { + + }*/ + + //app后台杀死时候的还原 + Moblink.restoreScene(_restore); + // 监听开始(传递监听到原生端，用户监听场景还原的数据回传回来) + _eventChannel.receiveBroadcastStream().listen(_onEvent, onError: _onError); + super.initState(); } + // 场景还原，记录邀请码 + void _restore(MLSDKScene scene) { + const bool inProduction = const bool.fromEnvironment("dart.vm.product"); + if (!inProduction) { + // 非release环境，弹窗测试 + showAlert('要还原的路径为：' + scene.className + '\n' + scene.params.toString(), + context); + } + Logger.debug('要还原的路径为：' + scene.className); + try { + Map params = Map.from(scene.params); + if (params.containsKey('tgid')) { + String tgid = params['tgid'].toString(); + // 记录邀请码到本地 + SharedPreferencesUtil.setNetCacheResult(Constants.mobInvitedCode, tgid); + } + } catch (e) { + Logger.debug(e); + } + } + @override void dispose() { WidgetsBinding.instance.removeObserver(this); @@ -66,7 +104,7 @@ class _HomePageState extends State with WidgetsBindingObserver { @override Widget build(BuildContext context) { ScreenUtil.init(context, width: 750, height: 1334); - print('home_page build'); + Logger.debug('home_page build'); List> tabs = _data; if (tabs == null || tabs.length == 0) { return Scaffold(); @@ -173,13 +211,42 @@ class _HomePageState extends State with WidgetsBindingObserver { } } - String isShowNotiPermission = - await SharedPreferencesUtil.getStringValue(Constants.isShowNotiPermission); + String isShowNotiPermission = await SharedPreferencesUtil.getStringValue( + Constants.isShowNotiPermission); if (isShowNotiPermission == null || isShowNotiPermission != '1') { await NotificationSettingDialog.show(context); - await SharedPreferencesUtil.setStringValue(Constants.isShowNotiPermission, "1"); + await SharedPreferencesUtil.setStringValue( + Constants.isShowNotiPermission, "1"); } IntellectCreate.checkAndCreateFirst(context); } + + //app存在后台时候的还原 + void _onEvent(Object event) { + Logger.debug('返回的内容: $event'); + if (null != event) { + showAlert('要还原的路径为[活着]：$event', context); + } + } + + void _onError(Object error) { + Logger.debug('返回的错误'); + } + + void showAlert(String text, BuildContext context) { + showDialog( + context: context, + builder: (BuildContext context) => CupertinoAlertDialog( + title: new Text("提示"), + content: new Text(text), + actions: [ + new FlatButton( + child: new Text("OK"), + onPressed: () { + Navigator.of(context).pop(); + }, + ) + ])); + } } diff --git a/lib/pages/wechat_teacher_page/wechat_teacher_page.dart b/lib/pages/wechat_teacher_page/wechat_teacher_page.dart index 155deaa..07823ee 100644 --- a/lib/pages/wechat_teacher_page/wechat_teacher_page.dart +++ b/lib/pages/wechat_teacher_page/wechat_teacher_page.dart @@ -1,17 +1,17 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:zhiying_base_widget/pages/wechat_teacher_page/bloc/wechat_teacher_bloc.dart'; import 'package:zhiying_base_widget/pages/wechat_teacher_page/bloc/wechat_teacher_repository.dart'; import 'package:zhiying_base_widget/pages/wechat_teacher_page/model/wechat_teacher_data_model.dart'; import 'package:zhiying_base_widget/pages/wechat_teacher_page/model/wechat_teacher_style_model.dart'; import 'package:zhiying_base_widget/pages/wechat_teacher_page/widgets/wechat_teacher_item.dart'; -import 'package:zhiying_base_widget/widgets/home/home_quick_entry/cached_network_image_util.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'bloc/wechat_teacher_state.dart'; + import 'bloc/wechat_teacher_event.dart'; -import 'package:fluttertoast/fluttertoast.dart'; +import 'bloc/wechat_teacher_state.dart'; /// /// 微信导师 @@ -24,7 +24,8 @@ class WechatTeacherPage extends StatelessWidget { @override Widget build(BuildContext context) { return BlocProvider( - create: (_) => WechatTeacherBloc(WechatTeacherRepository(data))..add(WechatTeacherInitEvent()), + create: (_) => WechatTeacherBloc(WechatTeacherRepository(data)) + ..add(WechatTeacherInitEvent()), child: _WechatTeacherPageContainer(), ); } @@ -32,10 +33,12 @@ class WechatTeacherPage extends StatelessWidget { class _WechatTeacherPageContainer extends StatefulWidget { @override - _WechatTeacherPageContainerState createState() => _WechatTeacherPageContainerState(); + _WechatTeacherPageContainerState createState() => + _WechatTeacherPageContainerState(); } -class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer> { +class _WechatTeacherPageContainerState + extends State<_WechatTeacherPageContainer> { TextEditingController _editingController; /// 是否绑定中 @@ -52,7 +55,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer setState(() { _isBinding = true; }); - BlocProvider.of(context).add(WechatTeacherBindEvent(teacherWxChat: wxAccount)); + BlocProvider.of(context) + .add(WechatTeacherBindEvent(teacherWxChat: wxAccount)); } } @@ -111,7 +115,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer ); } - Widget _createMainWidget(WechatTeacherStyleModel styleModel, WechatTeacherDataModel dataModel) { + Widget _createMainWidget( + WechatTeacherStyleModel styleModel, WechatTeacherDataModel dataModel) { return Scaffold( appBar: _createNav(styleModel), backgroundColor: HexColor.fromHex(styleModel?.bgColor ?? '#FFF5F5F5'), @@ -119,7 +124,7 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer child: SingleChildScrollView( child: Column( children: [ - _createHeader(styleModel,dataModel), + _createHeader(styleModel, dataModel), Padding( padding: const EdgeInsets.only(top: 15), child: CachedNetworkImage( @@ -179,7 +184,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer child: CupertinoTextField( onSubmitted: (val) => _bindTeacher(), controller: _editingController, - placeholder: styleModel?.nobindTeacherDialog?.inputHintText ?? '请填写邀请人邀请码/手机号码', + placeholder: styleModel?.nobindTeacherDialog?.inputHintText ?? + '请填写邀请人邀请码/手机号码', placeholderStyle: TextStyle(fontSize: 14), decoration: BoxDecoration(), ), @@ -196,13 +202,19 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer width: 130, height: 30, decoration: BoxDecoration( - color: HexColor.fromHex(styleModel?.commStyle?.btnBgColor ?? '#FF5A5A'), + color: HexColor.fromHex( + styleModel?.commStyle?.btnBgColor ?? '#FF5A5A'), borderRadius: BorderRadius.circular(15), ), child: Center( child: Text( - _isBinding ? '绑定中...' : styleModel?.nobindTeacherDialog?.btnText ?? '绑定邀请人', - style: TextStyle(color: HexColor.fromHex(styleModel?.commStyle?.btnTextColor ?? '#FFFFFFF'), fontSize: 14), + _isBinding + ? '绑定中...' + : styleModel?.nobindTeacherDialog?.btnText ?? '绑定邀请人', + style: TextStyle( + color: HexColor.fromHex( + styleModel?.commStyle?.btnTextColor ?? '#FFFFFFF'), + fontSize: 14), ), ), ), @@ -213,7 +225,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer } /// 绑定的UI - Widget _createBindWidget(WechatTeacherStyleModel styleModel, WechatTeacherDataModel dataModel) { + Widget _createBindWidget( + WechatTeacherStyleModel styleModel, WechatTeacherDataModel dataModel) { return Container( width: double.infinity, height: double.infinity, @@ -224,28 +237,47 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer width: 50, height: 50, // color: Colors.red, - child: CircleAvatar(child: CachedNetworkImage(imageUrl: dataModel?.teacherAvatar ??'',)), + child: CircleAvatar( + child: CachedNetworkImage( + imageUrl: dataModel?.teacherAvatar ?? '', + )), ), const SizedBox(width: 13), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - Text(dataModel?.teacherUsername ??'', style: TextStyle(fontSize: 15, color: HexColor.fromHex(styleModel?.teacherDialogTitleColor ?? '#3C3C3C'))), - Text('微信号: ${dataModel?.teacherWechatAccount??''}', style: TextStyle(fontSize: 15, color: HexColor.fromHex(styleModel?.commStyle.wechatAccountColor ?? '#FF5050'))), + Text(dataModel?.teacherUsername ?? '', + style: TextStyle( + fontSize: 15, + color: HexColor.fromHex( + styleModel?.teacherDialogTitleColor ?? '#3C3C3C'))), + Text('微信号: ${dataModel?.teacherWechatAccount ?? ''}', + style: TextStyle( + fontSize: 15, + color: HexColor.fromHex( + styleModel?.commStyle?.wechatAccountColor ?? + '#FF5050'))), GestureDetector( onTap: () => _copyText(dataModel?.teacherWechatAccount), child: UnconstrainedBox( child: Container( decoration: BoxDecoration( // color: Color(0xffffdada), - color: HexColor.fromHex(styleModel?.bindTeacherDialog?.btnBgColor ?? '#FFDADA'), + color: HexColor.fromHex( + styleModel?.bindTeacherDialog?.btnBgColor ?? + '#FFDADA'), borderRadius: BorderRadius.circular(20), ), - padding: EdgeInsets.only(left: 9, right: 9, top: 4, bottom: 4), + padding: + EdgeInsets.only(left: 9, right: 9, top: 4, bottom: 4), child: Text( styleModel?.bindTeacherDialog?.btnText ?? '复制去微信添加', - style: TextStyle(fontSize: 13, color: HexColor.fromHex(styleModel?.bindTeacherDialog?.btnTextColor ?? '#FF0000')), + style: TextStyle( + fontSize: 13, + color: HexColor.fromHex( + styleModel?.bindTeacherDialog?.btnTextColor ?? + '#FF0000')), ), ), ), @@ -264,13 +296,19 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer height: 56, // color: Colors.red, child: CachedNetworkImage( - imageUrl: dataModel?.teacherWxQrCode ?? styleModel?.myTeacher?.defalutTeacher?.qrcode ?? '', + imageUrl: dataModel?.teacherWxQrCode ?? + styleModel?.myTeacher?.defalutTeacher?.qrcode ?? + '', ), ), const SizedBox(height: 9), Text( styleModel?.officalWxchat?.qrcodeText ?? '长按保存二维码', - style: TextStyle(fontSize: 13, color: HexColor.fromHex(styleModel?.officalWxchat?.qrcodeTextColor ?? '#999999')), + style: TextStyle( + fontSize: 13, + color: HexColor.fromHex( + styleModel?.officalWxchat?.qrcodeTextColor ?? + '#999999')), ), ], ), @@ -282,7 +320,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer ); } - Widget _createHeader(WechatTeacherStyleModel styleModel, WechatTeacherDataModel dataModel) { + Widget _createHeader( + WechatTeacherStyleModel styleModel, WechatTeacherDataModel dataModel) { return Container( width: double.infinity, height: 283, @@ -308,7 +347,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer margin: EdgeInsets.only(left: 10, right: 10), padding: EdgeInsets.all(12), decoration: BoxDecoration( - color: HexColor.fromHex(styleModel?.teacherDialogBgColor ?? '#FFFFFF'), + color: HexColor.fromHex( + styleModel?.teacherDialogBgColor ?? '#FFFFFF'), borderRadius: BorderRadius.circular(10), ), child: Column( @@ -320,7 +360,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer style: TextStyle( fontWeight: FontWeight.bold, fontSize: 15, - color: HexColor.fromHex(styleModel?.teacherDialogTitleColor ?? '#3C3C3C'), + color: HexColor.fromHex( + styleModel?.teacherDialogTitleColor ?? '#3C3C3C'), ), ), Expanded( @@ -345,7 +386,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer margin: EdgeInsets.only(left: 10, right: 10, top: 0, bottom: 22), padding: EdgeInsets.all(12), decoration: BoxDecoration( - color: HexColor.fromHex(styleModel?.officalWxchat?.bgColor ?? '#FFFFFF'), + color: + HexColor.fromHex(styleModel?.officalWxchat?.bgColor ?? '#FFFFFF'), borderRadius: BorderRadius.circular(10), ), child: Column( @@ -355,7 +397,8 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer Text( styleModel?.officalWxchat?.title ?? '官方微信', style: TextStyle( - color: HexColor.fromHex(styleModel?.officalWxchat?.titleColor ?? '#3C3C3C'), + color: HexColor.fromHex( + styleModel?.officalWxchat?.titleColor ?? '#3C3C3C'), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -372,7 +415,11 @@ class _WechatTeacherPageContainerState extends State<_WechatTeacherPageContainer if (length > 0) { styleModel.officalWxchat.list.forEach((element) { widgets.add(WechatTeachetItem(element, styleModel)); - widgets.add(Container(margin: EdgeInsets.only(top: 4, bottom: 4), width: double.infinity, height: 0.5, color: Color(0xffebebeb))); + widgets.add(Container( + margin: EdgeInsets.only(top: 4, bottom: 4), + width: double.infinity, + height: 0.5, + color: Color(0xffebebeb))); }); widgets.removeLast(); } else { diff --git a/lib/utils/contants.dart b/lib/utils/contants.dart index 77dee28..c189401 100644 --- a/lib/utils/contants.dart +++ b/lib/utils/contants.dart @@ -21,11 +21,15 @@ class Constants { //==============================弹窗===================================start ///用户协议显示 static String isShowPolicy = "is_show_policy"; + ///推送权限弹窗 static String isShowNotiPermission = "isShowNotiPermission"; + //==============================弹窗===================================end //==============================版本号，控制引导页显示=================================== static String versionNumber = "versionNumber"; + //==============================Mob场景还原邀请码=================================== + static String mobInvitedCode = "mobInvitedCode"; }