Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp

lib/home/home_page.dart

@@ -246,6 +246,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
     }
   }
 
+  ///消息数量
   queryMsgStats() async {
     if (apiService == null) {
       SharedPreferences value = await SharedPreferences.getInstance();
@@ -365,12 +366,13 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
               header: MyHeader(),
               physics: BouncingScrollPhysics(),
               onRefresh: () {
-                setState(() {});
+                setState(() {_onRefresh();
+                });
               },
               child: SingleChildScrollView(
                 physics: NeverScrollableScrollPhysics(),
                 child: FutureBuilder(
-                  future: _onRefresh(),
+                  future:queryHome(),
                   builder: (context, snapshot) {
                     return Column(
                       children: [

lib/message/system_details.dart

@@ -496,13 +496,8 @@ class _SystemDetails extends State<SystemDetails> {
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              // Image.asset(
-              //   "assets/image/c_z.png",
-              //   width: 44.w,
-              //   height: 44.h,
-              // ),
               MImage(
-                messageRelational["avatar"],
+                messageRelational["avatar"] ?? "",
                 width: 44,
                 height: 44,
                 isCircle: true,
@@ -518,7 +513,7 @@ class _SystemDetails extends State<SystemDetails> {
                   Row(
                     children: [
                       Text(
-                          messageRelational["nickname"],
+                          messageRelational["nickname"] ?? "",
                           style: TextStyle(
                               fontWeight: MyFontWeight.semi_bold,
                               fontSize: 14.sp,
@@ -562,7 +557,7 @@ class _SystemDetails extends State<SystemDetails> {
                         //   ),
                         // ),
                         MImage(
-                          messageRelational["nickname"],
+                          messageRelational["nickname"] ,
                           width: 38,
                           height: 38,
                           isCircle: true,
@@ -880,12 +875,14 @@ class _SystemDetails extends State<SystemDetails> {
   }
   Widget followMessageItem(Message message) {
     var messageRelational = jsonDecode(message.relational);
+    if(message.relational.startsWith("{"))
     return Container(
       child:
       Row(
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+
           MImage(
             messageRelational["avatar"],
             width: 44,