From 002ea7e44b45f43e5e4b145b181d0f4559ddf0a2 Mon Sep 17 00:00:00 2001 From: WinUser01 Date: Fri, 25 Feb 2022 14:51:18 +0800 Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit103=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=E4=BD=86=E6=B3=A8=E9=94=80=E5=90=8E=E8=BF=98=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=B8=85=E9=99=A4=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/components/UserInfo.dart | 22 ++++++++++++---------- lib/components/commonFun.dart | 5 ++++- lib/pages/tabs/Tabs.dart | 18 ++++++++++++++++-- lib/services/EventBus.dart | 9 +++++++++ 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/lib/components/UserInfo.dart b/lib/components/UserInfo.dart index 2b5d3b2..08b0e97 100644 --- a/lib/components/UserInfo.dart +++ b/lib/components/UserInfo.dart @@ -4,8 +4,6 @@ import 'EncryptUtil.dart'; import 'commonFun.dart'; class UserInfo { - bool trialTag = true; //是否是试用版 - UserInfo({this.mapUserInfoRet}) { setUserInfo(theMapUserInfoRet: mapUserInfoRet); } @@ -16,15 +14,9 @@ class UserInfo { mapUserInfo = theMapUserInfoRet["data"]; print('mapUserInfo = ${mapUserInfo.toString()}'); setQxInfo(mapUserInfo["qx_code"], mapUserInfo["qx_name"]); - setTrialTag(); } } - // 从服务器检查登录用户是否是试用版用户 - setTrialTag() { - // 添加事件处理进行更新 - } - //_mapGetData = {is_login: true, user_id: 135, token: 4C5B3F93FEACAEF4B6CAA7296F22CC67825D7E48B867614383D19E3F23DFE510} Future setUserInfoFaceLogin(Map _mapGetData) async { mapUserInfo['user_id'] = _mapGetData['user_id']; @@ -35,6 +27,8 @@ class UserInfo { setQxInfo(String _qx_code, String _qx_name) { qx_code = int.parse(_qx_code.trim()); qx_name = _qx_name; + //区县用户登录接口增加返回字段“sfsy”，0表示正式账号，1表示试用账号 + qx_trial_tag = mapUserInfo['sfsy']; // 511528、兴文县 // int qx_code = 511528; @@ -137,12 +131,20 @@ class UserInfo { "user_id": 152, "token": "959091E2A5E362E22F22F8DBE05737A95545A43AF28B19AB3DAD5F8557EE2E29", "qx_code": "511528", - "qx_name": "兴文县" + "qx_name": "兴文县", + "sfsy": 0, //区县用户登录接口增加返回字段“sfsy”，0表示正式账号，1表示试用账号 }, "msg": "" }; - Map mapUserInfo = {"is_login": false, "user_id": -1, "token": "", "qx_code": "", "qx_name": ""}; + Map mapUserInfo = { + "is_login": false, + "user_id": -1, + "token": "", + "qx_code": "", + "qx_name": "", + "sfsy": 0, //区县用户登录接口增加返回字段“sfsy”，0表示正式账号，1表示试用账号 + }; //若list[i]为''，解密时会报错：aes decode error:RangeError: Value not in range: -16 String thisAndroidId = ''; //每个手机唯一的设备号 diff --git a/lib/components/commonFun.dart b/lib/components/commonFun.dart index 31d00cd..71a55f4 100644 --- a/lib/components/commonFun.dart +++ b/lib/components/commonFun.dart @@ -76,6 +76,7 @@ const String setSphericalCameraUrl = 'http://125.64.218.67:9914/'; int qx_code = -1; String qx_name = ''; String qx_name_long = ''; +int qx_trial_tag = 0; String service_tel = ''; String copyright_info = ''; String copyright_info_PinYin = ''; @@ -87,6 +88,7 @@ clear_user_info() { qx_code = -1; qx_name = ''; qx_name_long = ''; + qx_trial_tag = 1; service_tel = ''; copyright_info = ''; copyright_info_PinYin = ''; @@ -231,7 +233,8 @@ UserInfo g_userInfo = UserInfo(mapUserInfoRet: { "user_id": 152, "token": "959091E2A5E362E22F22F8DBE05737A95545A43AF28B19AB3DAD5F8557EE2E29", "qx_code": "511528", - "qx_name": "兴文县" + "qx_name": "兴文县", + "sfsy": 0, //区县用户登录接口增加返回字段“sfsy”，0表示正式账号，1表示试用账号 }, "msg": "" }); diff --git a/lib/pages/tabs/Tabs.dart b/lib/pages/tabs/Tabs.dart index 393c47f..6e5b600 100644 --- a/lib/pages/tabs/Tabs.dart +++ b/lib/pages/tabs/Tabs.dart @@ -3,6 +3,7 @@ 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'; @@ -27,11 +28,18 @@ class _TabsState extends State { try { if (mounted) { setState(() {}); - if (g_userInfo.trialTag) { + //区县用户登录接口增加返回字段“sfsy”，0表示正式账号，1表示试用账号 + // print(g_userInfo.mapUserInfo); + qx_trial_tag = 1; // 测试用 + if (1 == qx_trial_tag) { + print('addWatermark'); // 添加默认样式的水印 - _watermarkPlugin.addWatermark(context, "试用版本水印", rowCount: 4, columnCount: 8); + _watermarkPlugin.addWatermark(context, "黑烟抓拍试用版", rowCount: 4, columnCount: 8); // _watermarkPlugin必须放在这里，放在Widget build(BuildContext context)函数中会报错： // Dart Unhandled Exception: setState() or markNeedsBuild() called during build. + } else { + print('removeWatermark'); + _watermarkPlugin.removeWatermark(); } } } catch (e) { @@ -62,6 +70,12 @@ class _TabsState extends State { bPreLoading = false; bLoginVerify = false; //处理延时登录，判断用户名登录是否验证通过 }); + + //监听试用版水印改变事件 + eventBus.on().listen((event) { + print(event.str); + try_setState(); + }); } double _activeIconWidth = 68; diff --git a/lib/services/EventBus.dart b/lib/services/EventBus.dart index 67192b9..1ee6ef0 100644 --- a/lib/services/EventBus.dart +++ b/lib/services/EventBus.dart @@ -4,6 +4,15 @@ import 'package:event_bus/event_bus.dart'; EventBus eventBus = EventBus(); +//监听试用版水印改变事件 +class WatermarkUpdate { + String str; + + WatermarkUpdate(String _str) { + this.str = _str; + } +} + //监听统计数据改变事件 class StatisDataUpdate { String str;