update

jiaPei.xcodeproj/project.pbxproj

@@ -11664,7 +11664,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1972023062502;
+				CURRENT_PROJECT_VERSION = 1982023070501;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11700,7 +11700,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 1.9.7;
+				MARKETING_VERSION = 1.9.8;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11745,7 +11745,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1972023062502;
+				CURRENT_PROJECT_VERSION = 1982023070501;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11781,7 +11781,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 1.9.7;
+				MARKETING_VERSION = 1.9.8;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Modules/ComplaintModule/Model/ComplaintDataModel.m

@@ -14,7 +14,8 @@
 {
     CGFloat height = 100;
     //计算字size + imageview
-    CGFloat maxH = [self NY_sizeWithFont:[UIFont systemFontOfSize:15.f] width:260];
+    CGFloat width = RQ_SCREEN_WIDTH - 60;
+    CGFloat maxH = [self NY_sizeWithFont:[UIFont systemFontOfSize:15.f] width:width];
     height += maxH;
     if (self.PICURLS.length>0){
         height += 70;
@@ -22,6 +23,7 @@
     return height;
 }
 
+
 - (CGFloat)NY_sizeWithFont:(UIFont*)font width:(CGFloat)width{
     NSString *text = self.CI_CONTENT;
     CGFloat maxWidth = width;
@@ -33,14 +35,11 @@
                                  NSParagraphStyleAttributeName: paragraphStyle};
 
     CGRect boundingRect = [text boundingRectWithSize:CGSizeMake(maxWidth, CGFLOAT_MAX)
-                                             options:NSStringDrawingUsesLineFragmentOrigin
+                                             options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading
                                           attributes:attributes
                                              context:nil];
 
     CGSize textSize = boundingRect.size;
-    if(textSize.height>300){ //
-        return textSize.height - 130;
-    }
     return textSize.height;
 }