瀏覽代碼

Process the log data from the background to solve the line break problem. -- 对后台传来的log数据进行处理,解决换行问题。 resolve: #65

Ray Zhang 5 年之前
父節點
當前提交
8b77c1ddaa

二進制
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 4 - 4
RA TradeFiling/RA TradeFiling/Home/RAHomeViewController+HomeTableDataSource.m

@@ -141,7 +141,7 @@
          
             cell.snLabel.text = aciModel.sn;
             cell.ccnLabel.text = aciModel.hbccn;
-            cell.logLabel.text = aciModel.log;
+            cell.logLabel.text = [aciModel.log stringByReplacingOccurrencesOfString:@"," withString:@", "];
             return cell;
         }
             break;
@@ -153,7 +153,7 @@
         
             cell.snLabel.text=emanifestModel.sn;
             cell.ccnLabel.text=emanifestModel.hbccn;
-            cell.logLabel.text = emanifestModel.log;
+            cell.logLabel.text = [emanifestModel.log stringByReplacingOccurrencesOfString:@"," withString:@", "];
             
             
 
@@ -167,7 +167,7 @@
             
             cell.bolLabel.text=isfModel.bol;
             cell.snLabel.text=isfModel.sn;
-            cell.logLabel.text=isfModel.log;
+            cell.logLabel.text=[isfModel.log stringByReplacingOccurrencesOfString:@"," withString:@", "];
             
 
             return cell;
@@ -181,7 +181,7 @@
             
             cell.hbolLabel.text=acem1Model.hbol;
             cell.snLabel.text=acem1Model.sn;
-            cell.logLabel.text=acem1Model.log;
+            cell.logLabel.text=[acem1Model.log stringByReplacingOccurrencesOfString:@"," withString:@", "];
             
 //            [[[[[[cell setHBOL:acem1Model.hbol] setMBOL:acem1Model.mbol] setIcon:acem1Model.icon] setPort:acem1Model.port] setTime:acem1Model.date] setLog:acem1Model.log];
 //

+ 1 - 1
RA TradeFiling/RA TradeFiling/Result/ResultACEM1Cell.m

@@ -113,7 +113,7 @@
 //    CGSize bestsize=[self.logLabel sizeThatFits:self.logLabel.frame.size];
 //    
 //    if(bestsize.height>self.logLabel.frame.size.height)
-        self.logLabel.text =log;
+        self.logLabel.text =[log stringByReplacingOccurrencesOfString:@"," withString:@", "];
     return self;
 }
 

+ 1 - 1
RA TradeFiling/RA TradeFiling/Result/ResultACICell.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)setPrimaryCCN:(NSString *)primary_ccn;
 - (instancetype)setTime:(NSString *)time;
 - (instancetype)setLastAction:(NSString *)desc;
-- (instancetype)setLog:(NSString *)detail;
+- (instancetype)setLog:(NSString *)log;
 - (instancetype)setIcon:(NSString *)icon;
 - (instancetype)setIconSelect:(BOOL)select;
 //- (instancetype)setConsignee:(NSString *)consignee;

+ 2 - 2
RA TradeFiling/RA TradeFiling/Result/ResultACICell.m

@@ -100,8 +100,8 @@
     return self;
 }
 
-- (instancetype)setLog:(NSString *)detail {
-    self.logLabel.text = detail;
+- (instancetype)setLog:(NSString *)log {
+    self.logLabel.text = [log stringByReplacingOccurrencesOfString:@"," withString:@", "];
     return self;
 }
 

+ 1 - 1
RA TradeFiling/RA TradeFiling/Result/ResultISFCell.m

@@ -103,7 +103,7 @@
 }
 
 - (instancetype)setLog:(NSString *)log {
-    self.logLabel.text = log;
+    self.logLabel.text = [log stringByReplacingOccurrencesOfString:@"," withString:@", "];
     return self;
 }
 

+ 1 - 1
RA TradeFiling/RA TradeFiling/Result/ResulteManifestCell.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)setPrimaryCCN:(NSString *)primary_ccn;
 - (instancetype)setTime:(NSString *)time;
 - (instancetype)setPreviousCCN:(NSString *)previous_ccn;
-- (instancetype)setLog:(NSString *)detail;
+- (instancetype)setLog:(NSString *)log;
 - (instancetype)setIcon:(NSString *)icon;
 - (instancetype)setIconSelect:(BOOL)select;
 - (instancetype)setInClose:(BOOL)inclose;

+ 2 - 2
RA TradeFiling/RA TradeFiling/Result/ResulteManifestCell.m

@@ -101,8 +101,8 @@
     return self;
 }
 
-- (instancetype)setLog:(NSString *)detail {
-    self.logLabel.text = detail;
+- (instancetype)setLog:(NSString *)log {
+    self.logLabel.text = [log stringByReplacingOccurrencesOfString:@"," withString:@", "];
     return self;
 }