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

ios/Podfile.lock

@@ -4,6 +4,8 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
+  - device_info_plus (0.0.1):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_app_update (0.0.1):
     - Flutter
@@ -57,6 +59,7 @@ PODS:
 DEPENDENCIES:
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
   - flutter_inapp_purchase (from `.symlinks/plugins/flutter_inapp_purchase/ios`)
@@ -85,6 +88,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/audio_session/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
   flutter_app_update:
@@ -119,6 +124,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   audio_session: 4f3e461722055d21515cf3261b64c973c062f345
   connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_app_update: 65f61da626cb111d1b24674abc4b01728d7723bc
   flutter_inapp_purchase: 5c6a1ac3f11b11d0c8c0321c0c41c1f05805e4c8

lib/pages/user_discuss_des/widgets/discuss.dart

@@ -268,6 +268,35 @@ class _BuildDiscussState extends State<BuildDiscuss> {
     }
     return text;
   }
+
+  String _showImageStatus(DiscussModel discussModel, MediaModel? mediaModel){
+    String text = '';
+    // 是我的
+    if(discussModel.isMy == 1){
+      if(discussModel.commentsCheck == 1){
+        // 审核中
+        if(mediaModel?.privacyStatus ==0 ||mediaModel?.privacyStatus ==2 ||discussModel.status == 0){
+          text = '(审核中)';
+        }
+        // 审核未通过
+        else if(mediaModel?.privacyStatus ==-1 ||discussModel.status == 2){
+          text = '(审核未通过)';
+        }
+      }else{
+        // 审核中
+        if(mediaModel?.privacyStatus ==0 ||mediaModel?.privacyStatus ==2){
+          text = '(审核中)';
+        }
+        // 审核未通过
+        else if(mediaModel?.privacyStatus ==-1){
+          text = '(审核未通过)';
+        }
+
+      }
+    }
+    return text;
+  }
+
   Widget _buildListView(DiscussModel model){
     List<DiscussModel> data = model.commentAll != null ?model.commentAll!:[];
     return ListView.builder(
@@ -309,7 +338,7 @@ class _BuildDiscussState extends State<BuildDiscuss> {
                   child: CustomImage.network(url: mediaModel?.content??'',fit: BoxFit.cover,)
               ),
               Visibility(
-                visible: mediaModel?.privacyStatus == 0?true:false,
+                visible: true,
                 child: Positioned(
                     left: 0,
                     right:0,
@@ -317,8 +346,8 @@ class _BuildDiscussState extends State<BuildDiscuss> {
                     bottom: 0,
                     child: Container(
                       alignment: Alignment.center,
-                      color: widget.model.isMy==1?Colours.c9.withOpacity(0.5):Colours.c9.withOpacity(1),
-                      child: Text('(审核中)',style: TextStyle(fontSize: 11.w,height: 1.5,color: AppTheme.primary),),
+                      // color: widget.model.isMy==1?Colours.c9.withOpacity(0.5):Colours.c9.withOpacity(1),
+                      child: Text(_showImageStatus(widget.model,mediaModel),style: TextStyle(fontSize: 11.w,height: 1.5,color: AppTheme.primary),),
                     )
                 ),
               ),

lib/pages/user_notes_des/widgets/note.dart

@@ -128,6 +128,26 @@ class BuildNote extends StatelessWidget {
     }
     return text;
   }
+
+  String _showImageStatus(NoteModel discussModel,MediaModel? mediaModel){
+    String text = '';
+    // 是我的
+    if(discussModel.isMy == 1){
+      // 审核中
+      if(mediaModel?.privacyStatus ==0 ||mediaModel?.privacyStatus ==2){
+        text = '(审核中)';
+      }
+      // 审核未通过
+      else if(mediaModel?.privacyStatus ==-1){
+        text = '(审核未通过)';
+      }
+      // 审核通过
+      else {
+        text = '';
+      }
+    }
+    return text;
+  }
   // 图片
   Widget _buildImageGridView(){
     return GridView.builder(
@@ -157,7 +177,7 @@ class BuildNote extends StatelessWidget {
                 child: CustomImage.network(url: mediaModel?.content??'',fit: BoxFit.cover,)
               ),
               Visibility(
-                visible: mediaModel?.privacyStatus == 0?true:false,
+                visible: true,
                 child: Positioned(
                     left: 0,
                     right:0,
@@ -165,8 +185,8 @@ class BuildNote extends StatelessWidget {
                     bottom: 0,
                     child: Container(
                       alignment: Alignment.center,
-                      color: model.isMy==1?Colours.c9.withOpacity(0.5):Colours.c9.withOpacity(1),
-                      child: Text('(审核中)',style: TextStyle(fontSize: 11.w,height: 1.5,color: AppTheme.primary),),
+                      // color: model.isMy==1?Colours.c9.withOpacity(0.5):Colours.c9.withOpacity(1),
+                      child: Text(_showImageStatus(model,mediaModel),style: TextStyle(fontSize: 11.w,height: 1.5,color: AppTheme.primary),),
                     )
                 ),
               ),