Merge branch 'zcc/flutter' into 'test'

Zcc/flutter

See merge request !20

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -153,7 +153,7 @@ class _PopView implements ICenterPicker {
               margin: EdgeInsets.only(bottom: 25),
               child: baseText(
                   _model.popViewLive.data.second.title, 18, Color(0xff464646),
-                  bold: true, align: TextAlign.center)),
+                  bold: true, textAlign: TextAlign.center)),
           Container(
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(7),

lib/ClueModel/page/ProjectDetails/ProjectDetailsItemView.dart

@@ -6,6 +6,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:gm_flutter/ClueModel/server/entity/ProjectDetailsItem.dart';
+import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 
 class ProjectDetailsItemView extends StatelessWidget {
   Groups listData;
@@ -50,49 +51,25 @@ class ProjectDetailsItemView extends StatelessWidget {
       width: double.maxFinite,
       margin: EdgeInsets.only(bottom: 25, left: 15, right: 15),
       child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Container(
-            margin: EdgeInsets.only(right: 25.0),
-            alignment: Alignment.centerLeft,
-            width: 78,
-            child: baseText(attrs.attrName, 13, Color(0xFF999999)),
-          ),
+              margin: EdgeInsets.only(right: 25.0),
+              alignment: Alignment.centerLeft,
+              width: 78,
+              child: baseText(attrs.attrName, 13, Color(0xFF999999),
+                  textAlign: TextAlign.left,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis)),
           Expanded(
             child: Container(
                 alignment: Alignment.centerLeft,
-                child: Text(
-                  attrs.attrValue,
-                  textScaleFactor: 1.0,
-                  softWrap: true,
-                  style: TextStyle(
-                      decoration: TextDecoration.none,
-                      fontSize: 14,
-                      color: Color(0xFF282828),
-                      fontStyle: FontStyle.normal,
-                      fontWeight: FontWeight.w400),
-                )
-//              baseText(attrs.attrValue, 14, Color(0xFF282828))
-                ),
+                child: baseText(attrs.attrValue, 14, Color(0xFF282828),
+                    textAlign: TextAlign.left,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis)),
           ),
         ],
       ),
     );
   }
-
-  baseText(String text, double fontSize, Color color, {bool bold = false}) {
-    return Text(
-      text,
-      textScaleFactor: 1.0,
-      style: TextStyle(
-          decoration: TextDecoration.none,
-          fontSize: fontSize,
-          color: color,
-          fontStyle: FontStyle.normal,
-          fontWeight: bold ? FontWeight.w500 : FontWeight.w400),
-      textAlign: TextAlign.left,
-      maxLines: 2,
-      overflow: TextOverflow.ellipsis,
-    );
-  }
 }

lib/commonModel/base/BaseComponent.dart

@@ -4,18 +4,11 @@
  **/
 
 import 'package:app_settings/app_settings.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_common/commonModel/eventbus/GlobalEventBus.dart';
 import 'package:flutter_common/commonModel/live/LiveData.dart';
-import 'package:flutter_common/commonModel/view/iOSLoading.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
-import 'package:gm_flutter/commonModel/view/ImagesAnimation.dart';
-import 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart';
 import 'package:gm_flutter/commonModel/view/baseTabIndicator.dart';
 import 'package:lottie/lottie.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -87,10 +80,13 @@ AppBar _baseAppBarChangeTitle(
 }
 
 Text baseText(String text, double fontSize, Color color,
-    {bool bold = false, TextAlign align}) {
+    {bool bold = false,
+    TextAlign textAlign,
+    int maxLines = 1,
+    TextOverflow overflow}) {
   return Text(
     text,
-    textAlign: align ?? TextAlign.start,
+    textAlign: textAlign ?? TextAlign.start,
     textScaleFactor: 1.0,
     style: TextStyle(
         decoration: TextDecoration.none,
@@ -98,6 +94,8 @@ Text baseText(String text, double fontSize, Color color,
         color: color,
         fontStyle: FontStyle.normal,
         fontWeight: bold ? FontWeight.w500 : FontWeight.w400),
+    maxLines: maxLines,
+    overflow: overflow == null ? TextOverflow.ellipsis : overflow,
   );
 }