Merge branch 'master' of https://git.oa00.com/austin_dai/project_telephony

# Conflicts:
#	lib/ui/widget/appdialog.dart

lib/ui/user/user_page.dart

@@ -119,7 +119,7 @@ class _UserPageState extends State<UserPage> {
               // await UserTool.userProvider.updateUserInfo();
                     if (UserTool.userProvider.isLogin) {
                     // var res=await apiClient.request(API.app.trialVip);
-                      if(UserTool.userProvider.userInfo.isTrial==0){
+                      if(UserTool.userProvider.userInfo.isTrial!=0){
                         showDialog(context: context, builder: (context){
                           return const AppDialog();
                         });