Merge pull request #14 from Rock-Connotation/develop

发布动态页编辑文本重新设置

CyxbsMobile2019_iOS.xcodeproj/project.pbxproj

@@ -384,6 +384,8 @@
 		B892095425BEC30B00386451 /* SearchTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = B892095325BEC30B00386451 /* SearchTopView.m */; };
 		B892095A25BEDA1A00386451 /* SearchBeiginView.m in Sources */ = {isa = PBXBuildFile; fileRef = B892095925BEDA1A00386451 /* SearchBeiginView.m */; };
 		B892096C25BEDEA600386451 /* SearchBeginVC.m in Sources */ = {isa = PBXBuildFile; fileRef = B892096B25BEDEA600386451 /* SearchBeginVC.m */; };
+		B8C705BF25D7ABC8009B73F7 /* SZHPhotoImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = B8C705BE25D7ABC8009B73F7 /* SZHPhotoImageView.m */; };
+		B8C705C525D8018D009B73F7 /* originPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = B8C705C425D8018D009B73F7 /* originPhotoView.m */; };
 		B8EFF3CE259C61F1003753DD /* NewQA_Search.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B8EFF3CD259C61F1003753DD /* NewQA_Search.xcassets */; };
 		D0011A6E23F082FD009A242C /* QAExitView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0011A6D23F082FD009A242C /* QAExitView.m */; };
 		D0011A7023F0830B009A242C /* QAExitView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0011A6F23F0830B009A242C /* QAExitView.xib */; };
@@ -1281,6 +1283,10 @@
 		B892095925BEDA1A00386451 /* SearchBeiginView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SearchBeiginView.m; sourceTree = "<group>"; };
 		B892096A25BEDEA600386451 /* SearchBeginVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SearchBeginVC.h; sourceTree = "<group>"; };
 		B892096B25BEDEA600386451 /* SearchBeginVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SearchBeginVC.m; sourceTree = "<group>"; };
+		B8C705BD25D7ABC8009B73F7 /* SZHPhotoImageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SZHPhotoImageView.h; path = CyxbsMobile2019_iOS/NewQA/Search/ReleaseDynamic/Controller/SZHPhotoImageView.h; sourceTree = SOURCE_ROOT; };
+		B8C705BE25D7ABC8009B73F7 /* SZHPhotoImageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SZHPhotoImageView.m; path = CyxbsMobile2019_iOS/NewQA/Search/ReleaseDynamic/Controller/SZHPhotoImageView.m; sourceTree = SOURCE_ROOT; };
+		B8C705C325D8018D009B73F7 /* originPhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = originPhotoView.h; path = CyxbsMobile2019_iOS/NewQA/Search/ReleaseDynamic/Controller/originPhotoView.h; sourceTree = SOURCE_ROOT; };
+		B8C705C425D8018D009B73F7 /* originPhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = originPhotoView.m; path = CyxbsMobile2019_iOS/NewQA/Search/ReleaseDynamic/Controller/originPhotoView.m; sourceTree = SOURCE_ROOT; };
 		B8EFF3CD259C61F1003753DD /* NewQA_Search.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = NewQA_Search.xcassets; sourceTree = "<group>"; };
 		D0011A6C23F082FD009A242C /* QAExitView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QAExitView.h; sourceTree = "<group>"; };
 		D0011A6D23F082FD009A242C /* QAExitView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QAExitView.m; sourceTree = "<group>"; };
@@ -3568,6 +3574,10 @@
 			children = (
 				B85C435925C1A38900C51318 /* SZHReleasView.h */,
 				B85C435A25C1A38900C51318 /* SZHReleasView.m */,
+				B8C705BD25D7ABC8009B73F7 /* SZHPhotoImageView.h */,
+				B8C705BE25D7ABC8009B73F7 /* SZHPhotoImageView.m */,
+				B8C705C325D8018D009B73F7 /* originPhotoView.h */,
+				B8C705C425D8018D009B73F7 /* originPhotoView.m */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -4673,6 +4683,7 @@
 				1A799562252B43E400603253 /* SwiftyClient.swift in Sources */,
 				18CDF671257F91BD006E8E5C /* ExamArrangeModel.m in Sources */,
 				1AC2550823C9B14F00DF0475 /* DidNotCheckInDot.m in Sources */,
+				B8C705C525D8018D009B73F7 /* originPhotoView.m in Sources */,
 				EE131C212471362E00B6ED97 /* URLController.m in Sources */,
 				D06AAEE024AC00BB00EE0892 /* QAReviewAnswerListView.m in Sources */,
 				18CDF689257F91BD006E8E5C /* WeDateViewController.m in Sources */,
@@ -4905,6 +4916,7 @@
 				18E54DE325D0D00300531007 /* MGDImageCollectionViewCell.m in Sources */,
 				18CDF67C257F91BD006E8E5C /* ClassmatesList.m in Sources */,
 				18CDF6A9257F91BD006E8E5C /* DownFileDetailCellTableViewCell.m in Sources */,
+				B8C705BF25D7ABC8009B73F7 /* SZHPhotoImageView.m in Sources */,
 				1817F04A2594D5C500FE1304 /* FuncView.m in Sources */,
 				1817F05D259865EA00FE1304 /* ShieldModel.m in Sources */,
 				18CDF4C9257F8DBD006E8E5C /* safePopView.m in Sources */,

CyxbsMobile2019_iOS/NewQA/Controller/NewQAMainPageViewController.m

@@ -22,7 +22,7 @@
 #import "PostArchiveTool.h"
 #import "FollowGroupModel.h"
 #import "ShieldModel.h"
-
+#import "SearchBeginVC.h"   //搜索初始界面
 @interface NewQAMainPageViewController ()<ReportViewDelegate,FuncViewProtocol,ShareViewDelegate,UITableViewDelegate,UITableViewDataSource,PostTableViewCellDelegate,TopFollowViewDelegate>
 //帖子列表数据源数组
 @property (nonatomic, strong) NSMutableArray *tableArray;
@@ -720,6 +720,8 @@ - (void)clickedPublishBtn {
 
 ///点击了搜索按钮，跳转到搜索页面
 - (void)searchPost {
+    SearchBeginVC *vc = [[SearchBeginVC alloc] init];
+    [self.navigationController pushViewController:vc animated:YES];
     NSLog(@"跳转到搜索页面");
 }
 

CyxbsMobile2019_iOS/NewQA/Search/NewQA_Search.xcassets/SZH发布动态按钮正常背景颜色.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "238",
+          "green" : "99",
+          "red" : "91"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CyxbsMobile2019_iOS/NewQA/Search/NewQA_Search.xcassets/禁用状态按钮背景图.imageset/Contents.json → CyxbsMobile2019_iOS/NewQA/Search/NewQA_Search.xcassets/原图圈圈.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "圆角矩形 18 拷贝 2.png",
+      "filename" : "椭圆 917.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "圆角矩形 18 拷贝 2@2x.png",
+      "filename" : "椭圆 917@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "圆角矩形 18 拷贝 2@3x.png",
+      "filename" : "椭圆 917@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

CyxbsMobile2019_iOS/NewQA/Search/NewQA_Search.xcassets/原图圈圈点击后.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "组 23.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "组 [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CyxbsMobile2019_iOS/NewQA/Search/NewQA_Search.xcassets/添加图片背景.imageset/Contents.json

@@ -5,15 +5,48 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "圆角矩形 3-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "filename" : "圆角矩形 [email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "圆角矩形 [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
     {
       "filename" : "圆角矩形 [email protected]",
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "圆角矩形 [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

CyxbsMobile2019_iOS/NewQA/Search/NewQA_Search.xcassets/相机.imageset/Contents.json

@@ -5,15 +5,48 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "组 10-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "filename" : "组 [email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "组 [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
     {
       "filename" : "组 [email protected]",
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "组 [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

CyxbsMobile2019_iOS/NewQA/Search/ReleaseDynamic/Controller/SZHPhotoImageView.h

@@ -0,0 +1,24 @@
+//
+//  SZHPhotoImageView.h
+//  CyxbsMobile2019_iOS
+//
+//  Created by 石子涵 on 2021/2/13.
+//  Copyright © 2021 Redrock. All rights reserved.
+//
+/**添加图片的UIImageView*/
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@protocol SZHPhotoImageViewDelegate <NSObject>
+
+/// 删除图片框
+/// @param imageView 需要删除的图片框
+- (void)clearPhotoImageView:(UIImageView *)imageView;
+
+@end
+@interface SZHPhotoImageView : UIImageView
+@property (nonatomic, strong) UIButton *clearBtn;
+@property (nonatomic, weak) id<SZHPhotoImageViewDelegate> delegate;
+@end
+
+NS_ASSUME_NONNULL_END

CyxbsMobile2019_iOS/NewQA/Search/ReleaseDynamic/Controller/SZHPhotoImageView.m

@@ -0,0 +1,38 @@
+//
+//  SZHPhotoImageView.m
+//  CyxbsMobile2019_iOS
+//
+//  Created by 石子涵 on 2021/2/13.
+//  Copyright © 2021 Redrock. All rights reserved.
+//
+
+#import "SZHPhotoImageView.h"
+
+@implementation SZHPhotoImageView
+- (instancetype)init{
+    self = [super init];
+    if (self) {
+        //设置图片框可与用户进行交互，如果不设置，那么button无法被点击
+        self.userInteractionEnabled = YES;
+        self.clearBtn = [[UIButton alloc] init];
+        [self.clearBtn addTarget:self action:@selector(clear) forControlEvents:UIControlEventTouchUpInside];
+        [self.clearBtn setBackgroundImage:[UIImage imageNamed:@"删除"] forState:UIControlStateNormal];
+        [self addSubview:self.clearBtn];
+        [self.clearBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.right.top.equalTo(self);
+            make.size.mas_equalTo(CGSizeMake(20, 20));
+        }];
+
+        //设置圆角
+        self.layer.cornerRadius = 10;
+        self.layer.masksToBounds = YES;
+
+    }
+    return self;
+}
+
+- (void)clear{
+    [self.delegate clearPhotoImageView:self];
+}
+
+@end

CyxbsMobile2019_iOS/NewQA/Search/ReleaseDynamic/Controller/SZHReleasView.h

@@ -20,6 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// 发布动态
 - (void)releaseDynamic;
 
+/// 添加图片
+- (void)addPhotos;
 @end
 @interface SZHReleasView : UIView
 /// 代理
@@ -36,6 +38,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// 发布动态的按钮
 @property (nonatomic, strong) UIButton *releaseBtn;
+
+/// 添加图片按钮
+@property (nonatomic, strong) UIButton *addPhotosBtn;
 @end
 
 NS_ASSUME_NONNULL_END