merge dev into message

lib/NewMessageModel/page/AttentionListItem.dart

 import 'package:flutter/material.dart';
 import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/AttentionEntity.dart';
-import 'package:gmalpha_flutter/commonModel/ui/ALColors.dart';
 import 'package:gmalpha_flutter/NewMessageModel/page/message_date.dart';
+import 'package:gmalpha_flutter/res/value/ALColors.dart';
 
 class AttentionListItem extends StatelessWidget {
   final Data item;

lib/NewMessageModel/page/AttentionPage.dart

@@ -4,7 +4,7 @@ import 'package:gmalpha_flutter/NewMessageModel/page/AttentionModel.dart';
 import 'package:gmalpha_flutter/NewMessageModel/page/AttentionListItem.dart';
 import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/AttentionEntity.dart';
 import 'package:gmalpha_flutter/commonModel/base/BasePage.dart';
-import 'package:gmalpha_flutter/commonModel/ui/ALColors.dart';
+import 'package:gmalpha_flutter/res/value/ALColors.dart';
 
 enum LoadStatus {
   // 正在加载

lib/NewMessageModel/page/MessagePage.dart

@@ -6,7 +6,7 @@ import 'package:gmalpha_flutter/NewMessageModel/page/common.dart';
 import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/LatestMessageEntity.dart';
 import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/MyMessageEntity.dart';
 import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/UnreadMessageEntity.dart';
-import 'package:gmalpha_flutter/commonModel/ui/ALColors.dart';
+import 'package:gmalpha_flutter/res/value/ALColors.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class MessagePage extends StatefulWidget {

lib/NewMessageModel/page/common.dart

 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:gmalpha_flutter/commonModel/ui/ALColors.dart';
+import 'package:gmalpha_flutter/res/value/ALColors.dart';
 
 
 messageTitle(String text) {

lib/commonModel/base/BaseComponent.dart

@@ -39,7 +39,7 @@ Text baseText(String text, double fontSize, Color color) {
   );
 }
 
-Widget baseDivide(double height, int padding, Color color) {
+Widget baseDivide(double height, double padding, Color color) {
   return Container(
       height: height,
       margin: EdgeInsets.only(

lib/res/value/ALColors.dart

@@ -23,4 +23,5 @@ class ALColors {
   static const Color ColorF4F3F8 = Color(0xFFf4f3f8);
   static const Color Color282828 = Color(0xFF282828);
   static const Color ColorE5E5E5 = Color(0xFFe5e5e5);
+  static const Color Color666666 = Color(0xFF666666);
 }