修复 图说口碑 提示文字不消失的bug 修复口碑巡检详情标题固定的bug

redstar/Classes/Macro/Url.h

@@ -10,13 +10,13 @@
 #define Url_h
 
 // url 测试环境
-#define kRedStarURL  @"http://218.244.151.129:7580/"
+// #define kRedStarURL  @"http://218.244.151.129:7580/"
 
 // 正式环境
 // #define kRedStarURL  @"http://219.235.234.225:7580/"
 
 // 最新正式环境
-// #define kRedStarURL  @"http://219.235.234.212:7580/"
+ #define kRedStarURL  @"http://219.235.234.212:7580/"
 
 // 检查更新
 #define kCheckUpdateURL @"redstar-server/rest/ipapk?type=ipa"

redstar/Classes/Module/Function/Picture/PictureList/View/PicScreenView.m

@@ -52,7 +52,6 @@
     
     self.textView1 = [[UITextView alloc] init];
     _textView1.delegate = self;
-    _textView1.tag = 9991;
     self.placeholderLabel1 = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 100, 30)];
     self.placeholderLabel1.text = @"请输入内容...";
     self.placeholderLabel1.font = [UIFont systemFontOfSize:15.0];
@@ -62,8 +61,7 @@
     
     self.textView2 = [[UITextView alloc] init];
     _textView2.delegate = self;
-    _textView2.tag = 9992;
-    self.placeholderLabel2 = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 100, 30)];
+    self.placeholderLabel2 = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 110, 30)];
     self.placeholderLabel2.text = @"请输入关键字...";
     self.placeholderLabel2.font = [UIFont systemFontOfSize:15.0];
     self.placeholderLabel2.textColor = kOnLineCellDetailColor;
@@ -175,7 +173,7 @@
 #pragma mark - UITextView Delegate
 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
     if (![text isEqualToString:@""]) {
-        if (textView.tag == 9991) {
+        if (textView == _textView1) {
             self.placeholderLabel1.hidden = YES;
         } else {
             self.placeholderLabel2.hidden = YES;
@@ -183,7 +181,7 @@
     }
     
     if ([text isEqualToString:@""] && range.location == 0 && range.length == 1) {
-        if (textView.tag == 9991) {
+        if (textView == _textView1) {
             self.placeholderLabel1.hidden = NO;
         } else {
             self.placeholderLabel2.hidden = NO;
@@ -194,7 +192,7 @@
         [self.textView1 resignFirstResponder];
         [self.textView2 resignFirstResponder];
         
-        if (textView.tag == 9991) {
+        if (textView == _textView1) {
             if (textView.text.length != 0) {
                 self.placeholderLabel1.hidden = YES;
             } else {

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectNotUploadViewController.h

@@ -17,5 +17,6 @@
 @property (nonatomic, strong) NSString *praiseUuid;
 @property (nonatomic, strong) NSString *questionUuid;
 @property (nonatomic, copy) NSString *catesgory;
+@property (nonatomic, assign) int reportCount;
 
 @end

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectNotUploadViewController.m

@@ -50,7 +50,7 @@
     UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 30)];
     [customLab setTextColor:[UIColor whiteColor]];
     customLab.textAlignment = NSTextAlignmentCenter;
-    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%@/%d)", self.catesgory, self.taskModel.lineNo, self.questionCount]];
+    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%d/%d)", self.catesgory, self.reportCount, self.questionCount]];
     customLab.font = [UIFont boldSystemFontOfSize:19];
     self.navigationItem.titleView = customLab;
     

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectUploadedViewController.h

@@ -13,4 +13,6 @@
 @property (nonatomic, assign) int questionCount;
 @property (nonatomic, strong) TaskModel *taskModel;
 @property (nonatomic, copy) NSString *catesgory;
+@property (nonatomic, assign) int reportCount;
+
 @end

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectUploadedViewController.m

@@ -35,7 +35,7 @@
     UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 30)];
     [customLab setTextColor:[UIColor whiteColor]];
     customLab.textAlignment = NSTextAlignmentCenter;
-    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%@/%d)", self.catesgory, self.taskModel.lineNo, self.questionCount]];
+    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%d/%d)", self.catesgory, self.reportCount, self.questionCount]];
     customLab.font = [UIFont boldSystemFontOfSize:19];
     self.navigationItem.titleView = customLab;
     

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/ViewController/InspectTaskViewController.m

@@ -259,6 +259,7 @@
                     inspectVC.questionCount = taskGroup.questionCount;
                     inspectVC.taskModel = task;
                     inspectVC.catesgory = taskGroup.category;
+                    inspectVC.reportCount = taskGroup.reportCount;
                     [self.navigationController pushViewController:inspectVC animated:YES];
                 } else {
                     InspectNotUploadViewController *inspectNotVC = [[InspectNotUploadViewController alloc] init];
@@ -268,6 +269,7 @@
                     inspectNotVC.praiseUuid = _taskDetail.uuid;
                     inspectNotVC.questionUuid = task.uuid;
                     inspectNotVC.catesgory = taskGroup.category;
+                    inspectNotVC.reportCount = taskGroup.reportCount;
                     [self.navigationController pushViewController:inspectNotVC animated:YES];
                 }
             } else {
@@ -277,6 +279,7 @@
         } else {
             InspectUploadedViewController *inspectVC = [[InspectUploadedViewController alloc] init];
             inspectVC.questionCount = taskGroup.questionCount;
+            inspectVC.reportCount = taskGroup.reportCount;
             inspectVC.taskModel = task;
             inspectVC.catesgory = taskGroup.category;
             [self.navigationController pushViewController:inspectVC animated:YES];