优化

ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -20,38 +20,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B6A2F772-51F5-4DE1-9AD8-AA93FAFC2397"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x667a;&#x80fd;&#x5199;&#x4f5c;/&#x601d;&#x8def;/view/StartZNXZSiLuView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "254"
-            endingLineNumber = "254"
-            landmarkName = "-bottomAction:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2BAAB504-16C7-4B39-8BB3-E61FD18FAAAE"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x4f5c;&#x6587;&#x6279;&#x6539;/&#x6279;&#x6539;&#x4fe1;&#x606f;/view/StartZWPIDetailView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "239"
-            endingLineNumber = "239"
-            landmarkName = "-tiyanAction"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent

ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_logzc.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "查看图片@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "查看图片@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/view/StartZWPIDetailView.m

@@ -519,16 +519,46 @@
     self.viewzh.modelPF = modelPF;
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        self.lbfen.text = [Tools isStringnilkong:modelPF.total_score];
+        self.lbfen.text = [self getScore:self.modelPF.complex_review.score];
         [self.scvback bringSubviewToFront:self.lbfen];
         [self.scvback bringSubviewToFront:self.imgvnumber];
-        if(self.lbfen.text.intValue<1)
-        {
-            [self.imgvnumber setHidden:YES];
-        }
+        [self.imgvnumber setHidden:NO];
     });
 }
 
+-(NSString *)getScore:(NSArray *)arr
+{
+    NSString *strback = @"";
+    int all = 0;
+    int defen = 0;
+    for(TextbookInfoModelDataResultComplexScore *model in arr)
+    {
+        all+=model.max.intValue;
+        defen+=model.get.intValue;
+    }
+    ///100 优
+    ///其它具体分数
+    ///没得分数 显示'还不错'
+    if(all==0)
+    {
+        strback = @"还不错";
+    }
+    else
+    {
+        int ttt = (100.0/all)*defen;
+        if(ttt==100)
+        {
+            strback = @"优";
+        }
+        else
+        {
+            strback = [NSString stringWithFormat:@"%d",ttt];
+        }
+    }
+    return strback;
+}
+
+
 ///分享
 -(void)shareAction
 {

ProductApp/ProductApp/ProductMain/引导/支付页/view/StartPayTQView.m

@@ -80,7 +80,7 @@
         self.arrtq = @[@"智能创作",@"智能续写",@"改写润色",@"创作思路",@"作文批改",@"写作助手",@"分段创作",@"海量素材",@"课堂写作",@"拍照写作",@"创作工具",@"高分范文"];
         if([UserInfoModel shareModel].identityType.intValue == 3)
         {
-            self.arrtq = @[@"PPT创作",@"方案策划",@"大纲助手",@"短视频脚本",@"海量工具",@"私人助手",@"无限次数",@"无线token"];
+            self.arrtq = @[@"PPT创作",@"方案策划",@"大纲助手",@"短视频脚本",@"海量工具",@"私人助手",@"无限次数",@"不限流量"];
         }
     }
     return self;
@@ -94,7 +94,7 @@
     _source = source;
     if([source isEqualToString:@"guide_workplace_create_ppt"] || [UserInfoModel shareModel].identityType.intValue == 3)
     {///职场
-        self.arrtq = @[@"PPT创作",@"方案策划",@"大纲助手",@"短视频脚本",@"海量工具",@"私人助手",@"无限次数",@"无线token"];
+        self.arrtq = @[@"PPT创作",@"方案策划",@"大纲助手",@"短视频脚本",@"海量工具",@"私人助手",@"无限次数",@"不限流量"];
         [self.collect mas_updateConstraints:^(MASConstraintMaker *make) {
             make.height.offset(189);
         }];

ProductApp/ProductApp/ProductMain/引导/支付页/view/StartPayView.m

@@ -20,6 +20,10 @@
 
 @interface StartPayView ()<PayManagerDelegate>
 ///
+@property (nonatomic , strong) UILabel *lbname;
+///
+@property (nonatomic , strong) UIImageView *imgvlog;
+///
 @property (nonatomic , strong) StartPayTQView *viewtq;
 @property (nonatomic , strong) UIButton *btdel;
 ///
@@ -84,6 +88,7 @@
             make.left.offset(35);
             make.top.equalTo(btdel.mas_bottom);
         }];
+        _lbname = lbname;
         
         UIImageView *imgvico = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 160, 27)];
         [imgvico setImage:[UIImage imageNamed:@"yd_pay_hd"]];
@@ -108,13 +113,14 @@
         
         
         UIImageView *imgvlog = [[UIImageView alloc] init];
-        [imgvlog setImage:[UIImage imageNamed:@"yd_pay_log"]];
+        [imgvlog setImage:[UIImage imageNamed:@"yd_pay_log"]];///yd_pay_logzc
         [scvback addSubview:imgvlog];
         [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.height.offset(80);
             make.top.equalTo(lbname);
             make.right.equalTo(btdel).offset(-35);
         }];
+        _imgvlog = imgvlog;
         
         StartPayTQView *viewtq = [StartPayTQView new];
         [scvback addSubview:viewtq];
@@ -400,6 +406,19 @@
     _source = source;
     self.viewgoods.source = source;
     self.viewtq.source = source;
+    
+    if([source isEqualToString:@"guide_workplace_create_ppt"] || [UserInfoModel shareModel].identityType.intValue == 3)
+    {///职场
+        self.lbname.text = @"职场权益";
+        [self.imgvlog setImage:[UIImage imageNamed:@"yd_pay_logzc"]];///yd_pay_logzc
+        [self.imgvlog setContentMode:UIViewContentModeScaleAspectFit];
+        [self.imgvlog mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.right.equalTo(self.btdel);
+            make.size.sizeOffset(CGSizeMake(138, 142));
+            make.top.equalTo(self.btdel).offset(10);
+        }];
+    }
+    
 }
 
 -(void)removeTimer

ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/StartKTXZPGDetailView.m

@@ -399,13 +399,12 @@
             make.bottom.equalTo(viewlast).offset(20);
         }];
     }
-    self.lbfen.text = [Tools isStringnilkong:modelDetailYDY.result.total_score];
+    self.lbfen.text = [self getScore:modelDetailYDY.result.complex_review.score];
     [self.scvback bringSubviewToFront:self.lbfen];
     [self.scvback bringSubviewToFront:self.imgvnumber];
-    if(self.lbfen.text.intValue<1)
-    {
-        [self.imgvnumber setHidden:YES];
-    }
+    [self.imgvnumber setHidden:NO];
+    
+    
     //// 综合评价 分句点评 写作思路
     self.viewzh.modelResult = modelDetailYDY.result;
     
@@ -459,15 +458,43 @@
     self.viewzh.modelPF = modelPF;
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        self.lbfen.text = [Tools isStringnilkong:modelPF.total_score];
+        self.lbfen.text = [self getScore:modelPF.complex_review.score];
         [self.scvback bringSubviewToFront:self.lbfen];
         [self.scvback bringSubviewToFront:self.imgvnumber];
-        if(self.lbfen.text.intValue<1)
-        {
-            [self.imgvnumber setHidden:YES];
-        }
+        [self.imgvnumber setHidden:NO];
     });
 }
+-(NSString *)getScore:(NSArray *)arr
+{
+    NSString *strback = @"";
+    int all = 0;
+    int defen = 0;
+    for(TextbookInfoModelDataResultComplexScore *model in arr)
+    {
+        all+=model.max.intValue;
+        defen+=model.get.intValue;
+    }
+    ///100 优
+    ///其它具体分数
+    ///没得分数 显示'还不错'
+    if(all==0)
+    {
+        strback = @"还不错";
+    }
+    else
+    {
+        int ttt = (100.0/all)*defen;
+        if(ttt==100)
+        {
+            strback = @"优";
+        }
+        else
+        {
+            strback = [NSString stringWithFormat:@"%d",ttt];
+        }
+    }
+    return strback;
+}
 -(void)haibaoAction:(NSNotification *)notifi
 {
     self.viewtop.selecttag = [notifi.object intValue];