diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch
deleted file mode 100644
index 18bc975..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: pubspec.yaml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>name: zhiying_base_widget\ndescription: A new Flutter plugin.\nversion: 0.0.1\nauthor:\nhomepage:\n\nenvironment:\n sdk: \">=2.8.0 <3.0.0\"\n\ndependencies:\n flutter:\n sdk: flutter\n\n flutter_swiper: ^1.1.6\n bloc: ^4.0.0\n event_bus: ^1.1.1\n pull_to_refresh: ^1.6.1\n flutter_cupertino_date_picker: ^1.0.26+2\n image_picker: ^0.6.7+3\n tab_indicator_styler: 1.0.0\n connectivity: ^0.4.9+3\n save_image: ^1.0.1\n image_cropper:\n git:\n url: 'http://192.168.0.138:3000/FnuoOS_Flutter_Components/Image_Cropper.git'\n ref: '1.2.3+1'\n # 系统分享\n share_extend: ^1.1.9\n flutter_native_image: ^0.0.5\n #字符检测\n string_validator: 0.1.4\n # 列表滑动删除\n flutter_slidable: 0.5.7\n # image_gallery_saver: ^1.6.0\n\n permission_handler:\n git:\n ref: 0.0.1\n url: http://192.168.0.138:3000/FnuoOS_Flutter_Components/permission_handler.git\n\n\n intl: 0.16.1\n\n loading_indicator: ^1.2.0\n\ndev_dependencies:\n flutter_test:\n sdk: flutter\n\n zhiying_comm:\n path: ../zhiying_comm\n\n# For information on the generic Dart part of this file, see the\n# following page: https://dart.dev/tools/pub/pubspec\n\n# The following section is specific to Flutter.\nflutter:\n # This section identifies this Flutter project as a plugin project.\n # The androidPackage and pluginClass identifiers should not ordinarily\n # be modified. They are used by the tooling to maintain consistency when\n # adding or updating assets for this project.\n plugin:\n androidPackage: cn.zhios.zhiying_base_widget\n pluginClass: ZhiyingBaseWidgetPlugin\n\n # To add assets to your plugin package, add an assets section, like this:\n assets:\n - assets/images/launch_image/launch_image.png\n - assets/images/empty/empty.png\n - assets/images/qrcode/default_qrcode.png\n #\n # For details regarding assets in packages, see\n # https://flutter.dev/assets-and-images/#from-packages\n #\n # An image asset can refer to one or more resolution-specific \"variants\", see\n # https://flutter.dev/assets-and-images/#resolution-aware.\n\n # To add custom fonts to your plugin package, add a fonts section here,\n # in this \"flutter\" section. Each entry in this list should have a\n # \"family\" key with the font family name, and a \"fonts\" key with a\n # list giving the asset and other descriptors for the font. For\n # example:\n fonts:\n - family: Din-Bold\n fonts:\n - asset: assets/fonts/DIN-Bold.otf\n - family: Din-Medium\n fonts:\n - asset: assets/fonts/DIN-Medium.otf\n - family: Din\n fonts:\n - asset: assets/fonts/DIN-Regular.otf\n\n #\n # For details regarding fonts in packages, see\n # https://flutter.dev/custom-fonts/#from-packages\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- pubspec.yaml (revision cdaa6fadd2854f59327db04674e2b070713b6b5e)
-+++ pubspec.yaml (date 1608880072000)
-@@ -9,7 +9,7 @@
-
- dependencies:
- flutter:
-- sdk: flutter
-+ sdk: flutt
-
- flutter_swiper: ^1.1.6
- bloc: ^4.0.0
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml
deleted file mode 100644
index c1d1747..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/lib/pages/home_page/home_page.dart b/lib/pages/home_page/home_page.dart
index aa467c1..28bdbf4 100644
--- a/lib/pages/home_page/home_page.dart
+++ b/lib/pages/home_page/home_page.dart
@@ -74,11 +74,13 @@ class _HomePageState extends State with WidgetsBindingObserver {
_eventChannel.receiveBroadcastStream().listen(_onEvent, onError: _onError);
MobPushUtil.addPushReceiver();
- EventUtil.instance.on().listen((event) {
+ EventUtil.instance.on().listen((event) async {
UserInfoModel userInfo = UserInfoNotifier?.staitcUserInfo;
- Logger.log("我的TOKEN5: " + userInfo?.userId);
- if (!EmptyUtil.isEmpty(userInfo.userId)) {
- MobPushUtil.setAlias(userInfo.userId);
+ var setting = await NativeUtil.getSetting();
+ String masterId = setting['master_id'];
+ Logger.log("我的Alias: " + masterId + "_" + userInfo?.userId);
+ if (!EmptyUtil.isEmpty(userInfo.userId) && !EmptyUtil.isEmpty(masterId)) {
+ MobPushUtil.setAlias(masterId + "_" + userInfo.userId);
}
});
@@ -88,7 +90,6 @@ class _HomePageState extends State with WidgetsBindingObserver {
super.initState();
}
-
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);