浏览代码

未检测到饮酒

liuzhenxing1118 1 月之前
父节点
当前提交
592c356980

+ 1 - 1
ChineseMedicine/ChineseMedicineSDK/Controller/HealthDatasDrankViewController.m

@@ -48,7 +48,7 @@
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return normalCount;
+    return self.mReportDrankModel.drunkJudgment.score > 0 ?  normalCount : normalCount-1;
 }
 
 //返回每个子视图的大小

+ 1 - 1
ChineseMedicine/ChineseMedicineSDK/Controller/ReportPageViewController.m

@@ -85,7 +85,7 @@
         if ([data[@"stress"][@"hasStress"] intValue] == 1) {
             ReportStressModel* model = [ReportStressModel mj_objectWithKeyValues:data];
             [self initReportExceptionView:model drank:nil];
-        } else if (data[@"drunkJudgment"] && [data[@"drunkJudgment"][@"content"] length] > 0) {
+        } else if ([data.allKeys containsObject:@"drunkJudgment"]) {
             ReportDrankModel* model = [ReportDrankModel mj_objectWithKeyValues:data];
             [self initReportExceptionView:nil drank:model];
         } else {

+ 6 - 2
ChineseMedicine/ChineseMedicineSDK/View/HealthDatasDrankCellView.m

@@ -22,9 +22,13 @@
 - (void)setDrank:(ReportDrankModel*)model {
     if (!model || !(model.drunkJudgment))
         return;
-    [self.drankLevelLabel setText:[NSString stringWithFormat:@"%ld%@", model.drunkJudgment.score, @"级"]];
-    [self.drankLevelDetailLabel setText:model.drunkJudgment.content];
     [self.drankLevelHintLabel setText:model.drunkJudgment.healthTipsContent];
+    [self.drankLevelLabel setText:[NSString stringWithFormat:@"%ld%@", model.drunkJudgment.score, SK_NSLOCALIZED_STRING(@"drank_level", nil)]];
+    if (model.drunkJudgment.score > 0) {
+        [self.drankLevelDetailLabel setText:model.drunkJudgment.content];
+    } else {
+        [self.drankLevelDetailLabel setText:SK_NSLOCALIZED_STRING(@"drank_level_null", nil)];
+    }
 }
 
 @end

+ 3 - 0
ChineseMedicine/Localizable.strings

@@ -91,3 +91,6 @@
 "tag_height_low" = "低";
 "tag_height_mid" = "中";
 "tag_height_high" = "高";
+
+"drank_level" = "级";
+"drank_level_null" = "未检测到饮酒";