From 49e5b485e96395b783fb5ede6351ef866af567d6 Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Fri, 25 Feb 2022 15:05:20 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit104=EF=BC=9A=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E5=B7=B2=E7=BB=8F=E8=83=BD=E5=A4=9F=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEqx=5Ftrial=5Ftag=E7=9A=84=E5=80=BC=EF=BC=8C=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E6=98=AF=E5=90=A6=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=A8=E9=94=80=E5=90=8E=E5=B7=B2=E7=BB=8F=E8=83=BD?=
 =?UTF-8?q?=E5=A4=9F=E6=B8=85=E9=99=A4=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/components/commonFun.dart         | 2 +-
 lib/pages/Login/LoginTabsWidget.dart  | 7 +++++++
 lib/pages/tabs/Tabs.dart              | 7 -------
 lib/pages/tabs/page4_myMsics_new.dart | 1 +
 lib/services/EventBus.dart            | 9 ---------
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/lib/components/commonFun.dart b/lib/components/commonFun.dart
index 71a55f4..a190525 100644
--- a/lib/components/commonFun.dart
+++ b/lib/components/commonFun.dart
@@ -88,7 +88,7 @@ clear_user_info() {
   qx_code = -1;
   qx_name = '';
   qx_name_long = '';
-  qx_trial_tag = 1;
+  qx_trial_tag = 0;
   service_tel = '';
   copyright_info = '';
   copyright_info_PinYin = '';
diff --git a/lib/pages/Login/LoginTabsWidget.dart b/lib/pages/Login/LoginTabsWidget.dart
index 5be21e1..742bed5 100644
--- a/lib/pages/Login/LoginTabsWidget.dart
+++ b/lib/pages/Login/LoginTabsWidget.dart
@@ -1,3 +1,4 @@
+import 'package:disable_screenshots/disable_screenshots.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart'; //import 'package:flustars/flustars.dart' as flustars; //该组件中有ScreenUtil，// 获取网络图片尺寸flustars.WidgetUtil
 import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
@@ -40,6 +41,9 @@ class LoginTabsWidget extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<LoginTabsWidget> with SingleTickerProviderStateMixin {
+  // 初始化插件
+  DisableScreenshots _watermarkPlugin = DisableScreenshots();
+
   int loginTabs_index = 0;
 
   //用TabController实现顶部tab切换
@@ -89,6 +93,9 @@ class _MyHomePageState extends State<LoginTabsWidget> with SingleTickerProviderS
       print(event.str);
       updateMayLogin();
     });
+
+    // 去除可能存在的试用版水印
+    _watermarkPlugin.removeWatermark();
   }
 
   //处理延迟登录
diff --git a/lib/pages/tabs/Tabs.dart b/lib/pages/tabs/Tabs.dart
index 6e5b600..cc351fc 100644
--- a/lib/pages/tabs/Tabs.dart
+++ b/lib/pages/tabs/Tabs.dart
@@ -3,7 +3,6 @@ import 'package:disable_screenshots/disable_screenshots.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:hyzp_ybqx/pages/tabs/page4_myMsics_new.dart';
-import 'package:hyzp_ybqx/services/EventBus.dart';
 
 //import '../../widget/player_pro.dart';
 import '../../components/commonFun.dart';
@@ -70,12 +69,6 @@ class _TabsState extends State<Tabs> {
       bPreLoading = false;
       bLoginVerify = false; //处理延时登录，判断用户名登录是否验证通过
     });
-
-    //监听试用版水印改变事件
-    eventBus.on<WatermarkUpdate>().listen((event) {
-      print(event.str);
-      try_setState();
-    });
   }
 
   double _activeIconWidth = 68;
diff --git a/lib/pages/tabs/page4_myMsics_new.dart b/lib/pages/tabs/page4_myMsics_new.dart
index 9151013..95b2414 100644
--- a/lib/pages/tabs/page4_myMsics_new.dart
+++ b/lib/pages/tabs/page4_myMsics_new.dart
@@ -390,6 +390,7 @@ class _Page4_MyMsicsNewState extends State<Page4_MyMsicsNew>
                 mapStatisInfo.forEach((key, value) {
                   mapStatisInfo[key] = -1;
                 });
+                // eventBus.fire(WatermarkUpdate('试用版水印改变事件'));
                 Navigator.pushNamed(context, '/', arguments: 0);
               },
             ),
diff --git a/lib/services/EventBus.dart b/lib/services/EventBus.dart
index 1ee6ef0..67192b9 100644
--- a/lib/services/EventBus.dart
+++ b/lib/services/EventBus.dart
@@ -4,15 +4,6 @@ import 'package:event_bus/event_bus.dart';
 
 EventBus eventBus = EventBus();
 
-//监听试用版水印改变事件
-class WatermarkUpdate {
-  String str;
-
-  WatermarkUpdate(String _str) {
-    this.str = _str;
-  }
-}
-
 //监听统计数据改变事件
 class StatisDataUpdate {
   String str;