1

lib/home/DiscoverPage.dart

@@ -351,7 +351,7 @@ class _DisCoverPageState extends State<DisCoverPage>
       child: Row(
         children: <Widget>[
           CircleAvatar(
-              backgroundColor: Constants.GreyBackgroundColor,
+              backgroundColor: Colors.grey[100],
               radius: 13.75,
               child: Padding(
                   padding: EdgeInsets.only(bottom: 1.5),
@@ -376,47 +376,16 @@ class _DisCoverPageState extends State<DisCoverPage>
                       });
                     },
                   ))),
-          Container(
-            padding: EdgeInsets.only(left: 10),
-            child: IconButton(
-              icon: CircleAvatar(
-                  backgroundColor: Constants.GreyBackgroundColor,
-                  radius: 13.75,
-                  child: Padding(
-                      padding: EdgeInsets.only(bottom: 1),
-                      child: Icon(
-                        IconData(0xe619, fontFamily: Constants.IconFontFamily),
-                        color: Constants.BlackTextColor,
-                        size: 22,
-                      ))),
-              onPressed: () {
-                Navigator.of(context).push(
-                  new MaterialPageRoute(
-                    builder: (context) {
-                      return SearchPage();
-                    },
+          SizedBox(width: 10),
+          CustomUI.buildCircleIconButton(0xe619,
+              onPressed: () => Navigator.of(context).push(
+                    new MaterialPageRoute(
+                      builder: (context) {
+                        return SearchPage();
+                      },
+                    ),
                   ),
-                );
-              },
-            ),
-          ),
-          // Container(
-          //   child: IconButton(
-          //     icon: CircleAvatar(
-          //         backgroundColor: Constants.GreyBackgroundColor,
-          //         radius: 13.75,
-          //         child: Padding(
-          //             padding: EdgeInsets.only(bottom: 1.5),
-          //             child: Icon(
-          //               IconData(0xe659, fontFamily: Constants.IconFontFamily),
-          //               color: Constants.BlackTextColor,
-          //               size: 21,
-          //             ))),
-          //     onPressed: () {
-          //       goScanPage();
-          //     },
-          //   ),
-          // )
+              padding: EdgeInsets.only(bottom: 1)),
         ],
       ),
     );

lib/home/EditData.dart

@@ -16,6 +16,7 @@ import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
 import 'package:image_cropper/image_cropper.dart';
 
 import 'package:oktoast/oktoast.dart';
+import 'package:url_launcher/url_launcher.dart';
 import '../utils/ShadowButton.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:io';
@@ -312,13 +313,15 @@ class _EditPageState extends State<EditPage> {
   Widget _buildAgreement() {
     return InkWell(
         onTap: () async {
-          Navigator.of(context).push(
-            new MaterialPageRoute(
-              builder: (context) {
-                return UserAgreement();
-              },
-            ),
-          );
+          // Navigator.of(context).push(
+          //   new MaterialPageRoute(
+          //     builder: (context) {
+          //       return UserAgreement();
+          //     },
+          //   ),
+          // );
+          launch(
+              'http://datechatagent.chengyouhd.com/zh-CN/Home/UserAgreement?language=${UserData().language}');
         },
         child: Container(
             margin: EdgeInsets.only(top: 10, bottom: 20, left: 10, right: 10),

lib/home/ProfilePage.dart

@@ -1673,23 +1673,11 @@ class _ProfilePageState extends State<ProfilePage>
       elevation: 1,
       actions: <Widget>[
         isMyself
-            ? Container(
-                padding: EdgeInsets.only(right: 15),
-                alignment: Alignment.center,
-                child: new InkWell(
-                  child: CircleAvatar(
-                      backgroundColor: Constants.GreyBackgroundColor,
-                      radius: 15.75,
-                      child: Icon(
-                        IconData(0xe685, fontFamily: 'iconfont'),
-                        color: Constants.BlackTextColor,
-                        size: 20,
-                      )),
-                  onTap: () {
-                    Share.share('https://henho.jphgames.com/');
-                  },
-                ),
-              )
+            ? Padding(
+                padding: EdgeInsets.only(right: 0),
+                child: CustomUI.buildCircleIconButton(0xe685,
+                    onPressed: () =>
+                        Share.share('https://henho.jphgames.com/')))
             : Container(),
         isMyself
             ? Container()

lib/home/friend_page.dart

@@ -147,7 +147,10 @@ class _FriendPageState extends State<FriendPage> {
               SizedBox(
                 height: 5,
               ),
-              Text(I18n.of(context).apply_fro_friends,
+              Text(
+                  list[0]['Content'] == null || list[0]['Content'] == ''
+                      ? I18n.of(context).apply_fro_friends
+                      : list[0]['Content'],
                   textScaleFactor: 1.0,
                   style:
                       TextStyle(fontSize: 10, color: const Color(0xFF6A6A6A))),
@@ -473,30 +476,14 @@ class _FriendPageState extends State<FriendPage> {
             centerTitle: false,
             elevation: 1,
             actions: <Widget>[
-              Container(
-                child: IconButton(
-                  icon: CircleAvatar(
-                      backgroundColor: Constants.GreyBackgroundColor,
-                      radius: 13.75,
-                      child: Padding(
-                          padding: EdgeInsets.only(bottom: 1.5),
-                          child: Icon(
-                            IconData(0xe662,
-                                fontFamily: Constants.IconFontFamily),
-                            color: Constants.BlackTextColor,
-                            size: 21,
-                          ))),
-                  onPressed: () {
-                    Navigator.of(context).push(
-                      new MaterialPageRoute(
-                        builder: (context) {
-                          return NewAddFriendsPage();
-                        },
-                      ),
-                    );
-                  },
-                ),
-              ),
+              CustomUI.buildCircleIconButton(0xe662,
+                  onPressed: () => Navigator.of(context).push(
+                        new MaterialPageRoute(
+                          builder: (context) {
+                            return NewAddFriendsPage();
+                          },
+                        ),
+                      )),
             ],
             bottom: CustomUI.buildSearchButton(context, () {
               Navigator.of(context).push(

lib/home/new_friends.dart

@@ -447,30 +447,14 @@ class _NewFriendsPageState extends State<NewFriendsPage> {
           leading: CustomUI.buildCustomLeading(context),
           elevation: 1,
           actions: <Widget>[
-            Container(
-              child: IconButton(
-                icon: CircleAvatar(
-                    backgroundColor: Constants.GreyBackgroundColor,
-                    radius: 13.75,
-                    child: Padding(
-                        padding: EdgeInsets.only(bottom: 1.5),
-                        child: Icon(
-                          IconData(0xe662,
-                              fontFamily: Constants.IconFontFamily),
-                          color: Constants.BlackTextColor,
-                          size: 21,
-                        ))),
-                onPressed: () {
-                  Navigator.of(context).push(
-                    new MaterialPageRoute(
-                      builder: (context) {
-                        return NewAddFriendsPage();
-                      },
-                    ),
-                  );
-                },
-              ),
-            ),
+            CustomUI.buildCircleIconButton(0xe662,
+                onPressed: () => Navigator.of(context).push(
+                      new MaterialPageRoute(
+                        builder: (context) {
+                          return NewAddFriendsPage();
+                        },
+                      ),
+                    ))
           ],
           bottom: PreferredSize(
               preferredSize: Size.fromHeight(49),

lib/utils/CustomUI.dart

@@ -380,9 +380,18 @@ class CustomUI {
         ));
   }
 
-  static Widget buildImgCover(int imgId, List<PicSwiperItem> pics, String imgUrl, double width,
-      double raduis, bool isWatch, BuildContext context, int type,
-      {bool isMyself = false, int payStatus = 0, int state = 1}) {
+  static Widget buildImgCover(
+      int imgId,
+      List<PicSwiperItem> pics,
+      String imgUrl,
+      double width,
+      double raduis,
+      bool isWatch,
+      BuildContext context,
+      int type,
+      {bool isMyself = false,
+      int payStatus = 0,
+      int state = 1}) {
     Color color = isWatch
         ? const Color(0xFF999999)
         : const Color(0xFFFB5656); //const Color(0xfffb5656);
@@ -1314,4 +1323,26 @@ class CustomUI {
               children: <Widget>[cancelCountDown, confirm],
             )));
   }
+
+  static Widget buildCircleIconButton(int iconCode,
+      {double radius = 13.75,
+      onPressed,
+      double iconSize = 21,
+      EdgeInsetsGeometry padding}) {
+    return Container(
+      child: IconButton(
+        icon: CircleAvatar(
+            backgroundColor: Colors.grey[100],
+            radius: radius,
+            child: Padding(
+                padding: padding ?? EdgeInsets.only(bottom: 1.5),
+                child: Icon(
+                  IconData(iconCode, fontFamily: Constants.IconFontFamily),
+                  color: Constants.BlackTextColor,
+                  size: iconSize,
+                ))),
+        onPressed: onPressed,
+      ),
+    );
+  }
 }

lib/utils/HttpUtil.dart

@@ -44,9 +44,9 @@ class HttpUtil {
 
   //static const String BaseUrl = 'http://192.168.0.223:7001/';
   //static const String BaseUrl = 'http://192.168.0.207:9080/';
-  //static const String BaseUrl = 'http://120.79.107.63:9080/';
+  static const String BaseUrl = 'http://120.79.107.63:9080/';
   //static const String BaseUrl = 'http://192.168.0.177:9016/';
-  static const String BaseUrl = 'https://datasm.chengyouhd.com/';
+  //static const String BaseUrl = 'https://datasm.chengyouhd.com/';
 
   static HttpUtil _getInstance() {
     if (_instance == null) {
@@ -928,7 +928,7 @@ class HttpUtil {
       if (resData['code'] == 0) {
         UserData().privatyMsgPushSwitch = resData['data']['PrivacyChat'] == 1;
         UserData().newDateSwitch = resData['data']['NewBroadcast'] == 1;
-
+        UserData().shockNoticSwitch = resData['data']['VibrationReminder'] ==1;
         if (isMan) {
           UserData().acceptCheckSwitch = resData['data']['AcceptCheck'] == 1;
           UserData().codeSucessSwitch = resData['data']['ApplySuccess'] == 1;

pubspec.yaml

@@ -1,7 +1,7 @@
 name: chat
 description: A new Flutter project.
 #修改版本号后get-clean
-version: 1.1.3+17
+version: 1.1.4+18
 
 environment:
   sdk: ">=2.1.0 <3.0.0"