diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index f6ea9da..0d72e23 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -265,6 +265,12 @@
"packageUri": "lib/",
"languageVersion": "2.5"
},
+ {
+ "name": "imei_plugin",
+ "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/imei_plugin-1.2.0",
+ "packageUri": "lib/",
+ "languageVersion": "2.7"
+ },
{
"name": "intl",
"rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1",
@@ -369,7 +375,7 @@
},
{
"name": "photo_view",
- "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/photo_view-0.10.2",
+ "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/photo_view-0.10.3",
"packageUri": "lib/",
"languageVersion": "2.6"
},
@@ -615,7 +621,7 @@
},
{
"name": "win32",
- "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.3",
+ "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.4",
"packageUri": "lib/",
"languageVersion": "2.7"
},
@@ -644,7 +650,7 @@
"languageVersion": "2.8"
}
],
- "generated": "2020-11-14T05:34:27.631373Z",
+ "generated": "2020-11-16T03:42:31.306535Z",
"generator": "pub",
"generatorVersion": "2.8.2"
}
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 60bd897..0e8bc6e 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
//选择要添加的对应cpu类型的.so库。
- abiFilters 'armeabi', 'armeabi-v7a', 'x86','x86_64', 'mips', 'mips64', 'arm64-v8a'
+ abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a'
}
}
@@ -89,8 +89,6 @@ android {
}
-
-
// // 签名配置
// signingConfigs {
// // 智夜生活
@@ -202,6 +200,18 @@ MobSDK {
bypassApproval false
enable true
}
+ WechatMoments {
+ enable true
+ }
+ WechatFavorite {
+ enable true
+ }
+ QZone {
+ enable true
+ }
+ SinaWeibo {
+ enable true
+ }
}
}
}
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index c71e15b..8ac7df8 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -40,6 +40,8 @@ PODS:
- TOCropViewController (~> 2.5.2)
- image_picker (0.0.1):
- Flutter
+ - imei_plugin (0.0.1):
+ - Flutter
- jdsdk (0.0.1):
- Flutter
- mob_sharesdk (4.3.11):
@@ -184,6 +186,7 @@ DEPENDENCIES:
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- image_cropper (from `.symlinks/plugins/image_cropper/ios`)
- image_picker (from `.symlinks/plugins/image_picker/ios`)
+ - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`)
- jdsdk (from `.symlinks/plugins/jdsdk/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
@@ -251,6 +254,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/image_cropper/ios"
image_picker:
:path: ".symlinks/plugins/image_picker/ios"
+ imei_plugin:
+ :path: ".symlinks/plugins/imei_plugin/ios"
jdsdk:
:path: ".symlinks/plugins/jdsdk/ios"
package_info:
@@ -318,6 +323,7 @@ SPEC CHECKSUMS:
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
image_cropper: 3c16d7651730ffe85897f5a1c4e2547e6b54989a
image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
+ imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd
jdsdk: 2ca38c7e3a2dfb0f3641425f8fd1e8d20357693f
mob_sharesdk: e0d8b5807e6063cac8f9d68ef059b1d3006c9088
MOBFoundation: 606bc4c10ff4c6ac573c09f5081a39c75316bc7b
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
index ae26fa4..486f97f 100644
--- a/example/ios/Runner/Info.plist
+++ b/example/ios/Runner/Info.plist
@@ -27,7 +27,7 @@
WBkey
CFBundleURLSchemes
- wb
+ wb706709568
@@ -47,7 +47,7 @@
WBSecret
CFBundleURLSchemes
- sina.
+ sina.e9e6a24349c91be8ab923af02415782b
@@ -168,7 +168,7 @@
fleamarket
youku
suning
- kaola
+ kaola
LSRequiresIPhoneOS
diff --git a/lib/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart b/lib/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart
new file mode 100644
index 0000000..d40d6c1
--- /dev/null
+++ b/lib/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+
+class NotificationSettingDialog extends StatefulWidget {
+ @override
+ _NotificationSettingDialogState createState() =>
+ _NotificationSettingDialogState();
+}
+
+class _NotificationSettingDialogState extends State {
+ @override
+ Widget build(BuildContext context) {
+ return _NotificationSettingDialogContainer();
+ }
+}
+
+class _NotificationSettingDialogContainer extends StatefulWidget {
+ @override
+ _NotificationSettingDialogContainerState createState() =>
+ _NotificationSettingDialogContainerState();
+}
+
+class _NotificationSettingDialogContainerState
+ extends State<_NotificationSettingDialogContainer> {
+ @override
+ Widget build(BuildContext context) {
+ return Center(
+ child: Container(
+ width: 280,
+ ),
+ );
+ }
+}
diff --git a/lib/pages/main_page/main_page.dart b/lib/pages/main_page/main_page.dart
index a35ce9d..5e4efbf 100644
--- a/lib/pages/main_page/main_page.dart
+++ b/lib/pages/main_page/main_page.dart
@@ -80,7 +80,7 @@ class _MainPageContainerState extends State<_MainPageContainer>
void didChangeAppLifecycleState(AppLifecycleState state) async {
///智能粘贴板
String indentifier = widget.data['skip_identifier'];
- if (indentifier == 'pub.flutter.index') {
+ if (indentifier.startsWith('pub.flutter.index')) {
// 只在首页弹窗
IntellectCreate.checkAndCreate(state, context);
}
diff --git a/lib/register.dart b/lib/register.dart
index 79c30b3..51f3d37 100644
--- a/lib/register.dart
+++ b/lib/register.dart
@@ -1,11 +1,10 @@
import 'dart:io';
-import 'package:flutter/cupertino.dart';
+
+import 'package:jdsdk/jdsdk.dart';
import 'package:sharesdk_plugin/sharesdk_interface.dart';
import 'package:sharesdk_plugin/sharesdk_register.dart';
-import 'package:zhiying_base_widget/pages/bil_detail_page/bil_detail_page.dart';
import 'package:zhiying_base_widget/pages/about_us_page/about_us_page.dart';
-import 'package:zhiying_base_widget/pages/custom_page/custom_page.dart';
-
+import 'package:zhiying_base_widget/pages/bil_detail_page/bil_detail_page.dart';
import 'package:zhiying_base_widget/pages/feedback_page/feedback_page.dart';
import 'package:zhiying_base_widget/pages/goods_details_page/goods_details_page.dart';
import 'package:zhiying_base_widget/pages/home_page/home_page.dart';
@@ -78,8 +77,6 @@ import 'widgets/search/tabbar/search_tab_creater.dart';
import 'widgets/search_result/goods_list/search_result_goods_list_creater.dart';
import 'widgets/search_result/search_input/search_result_input.dart';
-import 'package:jdsdk/jdsdk.dart';
-
class BaseWidgetRegister {
/// 初始化方法
static void init() {
@@ -97,10 +94,9 @@ class BaseWidgetRegister {
Application.addMethod(() async {
ShareSDKRegister register = ShareSDKRegister();
- register.setupWechat(
- "wx617c77c82218ea2c", "c7253e5289986cf4c4c74d1ccc185fb1",
- "https://www.sandslee.com/");
- register.setupSinaWeibo("568898243", "38a4f8204cc784f81f9f0daaf31e02e3",
+ register.setupWechat("wx617c77c82218ea2c",
+ "c7253e5289986cf4c4c74d1ccc185fb1", "https://www.sandslee.com/");
+ register.setupSinaWeibo("706709568", "e9e6a24349c91be8ab923af02415782b",
"http://www.sharesdk.cn");
register.setupQQ("1111030588", "XoHKlrBybXy7ORBt");
SharesdkPlugin.regist(register);
@@ -157,14 +153,14 @@ class BaseWidgetRegister {
PageFactory.regist('pub.flutter.my_order', (model) => OrdersPage(model));
PageFactory.regist(
'pub.flutter.account_security', (model) => SecurityPage(model));
- PageFactory.regist('pub.flutter.account_security_alipay', (model) =>
- SecurityBindAlipayPage(model));
+ PageFactory.regist('pub.flutter.account_security_alipay',
+ (model) => SecurityBindAlipayPage(model));
// 登录密码
- PageFactory.regist('pub.flutter.account_security_password', (model) =>
- SecurityPassword(model));
+ PageFactory.regist('pub.flutter.account_security_password',
+ (model) => SecurityPassword(model));
// 修改手机号
- PageFactory.regist('pub.flutter.account_security_mobile', (model) =>
- SecurityMobile(model));
+ PageFactory.regist('pub.flutter.account_security_mobile',
+ (model) => SecurityMobile(model));
// 邀请好友
PageFactory.regist(
'pub.flutter.invite_friends', (model) => InvitedFriendsPage(model));
@@ -372,8 +368,7 @@ class BaseWidgetRegister {
//======================= 账单明细
WidgetFactory.regist(
'my_wallet_detail',
- DefaultWidgetCreater((model) =>
- WalletBilDetail(
+ DefaultWidgetCreater((model) => WalletBilDetail(
data: model,
)));