hyzp_ybqx-Commit103：登录时已经能够根据qx_trial_tag的值，确定是否添加水印，但注销后还无法清除水印

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 = ''; //每个手机唯一的设备号

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": ""
 });