BUG修复

ProductApp/ProductApp.xcodeproj/project.pbxproj

@@ -243,6 +243,7 @@
 		CA6D547A2CCB9F00001B530A /* CorrectWriteCorrectModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA6D54792CCB9F00001B530A /* CorrectWriteCorrectModel.m */; };
 		CA6D547D2CCB9FA8001B530A /* CorrectWriteErrorModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA6D547C2CCB9FA8001B530A /* CorrectWriteErrorModel.m */; };
 		CA6D54802CCBA3C2001B530A /* WriteCorrectScoreModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA6D547F2CCBA3C2001B530A /* WriteCorrectScoreModel.m */; };
+		CA815EBD2CDB0AAA00677C00 /* ppt加载.pag in Resources */ = {isa = PBXBuildFile; fileRef = CA815EBC2CDB0AAA00677C00 /* ppt加载.pag */; };
 		CA8181882C9E58B100EE7E6E /* StartKTXZWenZhangViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA8181872C9E58B100EE7E6E /* StartKTXZWenZhangViewController.m */; };
 		CA81818B2C9E598300EE7E6E /* StartKTXZWenZhangView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA81818A2C9E598300EE7E6E /* StartKTXZWenZhangView.m */; };
 		CA81818E2C9E60B100EE7E6E /* ViewLable.m in Sources */ = {isa = PBXBuildFile; fileRef = CA81818D2C9E60B100EE7E6E /* ViewLable.m */; };
@@ -978,6 +979,7 @@
 		CA6D547C2CCB9FA8001B530A /* CorrectWriteErrorModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CorrectWriteErrorModel.m; sourceTree = "<group>"; };
 		CA6D547E2CCBA3C2001B530A /* WriteCorrectScoreModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WriteCorrectScoreModel.h; sourceTree = "<group>"; };
 		CA6D547F2CCBA3C2001B530A /* WriteCorrectScoreModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WriteCorrectScoreModel.m; sourceTree = "<group>"; };
+		CA815EBC2CDB0AAA00677C00 /* ppt加载.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ppt加载.pag"; sourceTree = "<group>"; };
 		CA8181862C9E58B100EE7E6E /* StartKTXZWenZhangViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartKTXZWenZhangViewController.h; sourceTree = "<group>"; };
 		CA8181872C9E58B100EE7E6E /* StartKTXZWenZhangViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StartKTXZWenZhangViewController.m; sourceTree = "<group>"; };
 		CA8181892C9E598300EE7E6E /* StartKTXZWenZhangView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartKTXZWenZhangView.h; sourceTree = "<group>"; };
@@ -3731,6 +3733,7 @@
 				CAE010B42CD9CF5B003E327F /* 逐字动效.pag */,
 				CAE010B62CD9D0E9003E327F /* 分数.pag */,
 				CAE010B82CD9D2BF003E327F /* PPT切换效果.pag */,
+				CA815EBC2CDB0AAA00677C00 /* ppt加载.pag */,
 			);
 			path = ProductApp;
 			sourceTree = "<group>";
@@ -4607,6 +4610,7 @@
 				CB489FDC2744A30000DA044A /* vedio_puse.png in Resources */,
 				CAE010B92CD9D2BF003E327F /* PPT切换效果.pag in Resources */,
 				CB489DD527449D5D00DA044A /* Assets.xcassets in Resources */,
+				CA815EBD2CDB0AAA00677C00 /* ppt加载.pag in Resources */,
 				CA5D03202CC0DDF0007B3BA5 /* Pay_Public_SelectNOT@3x.png in Resources */,
 				CB489FBF2744A0BD00DA044A /* loading7@3x.png in Resources */,
 				CA5D03242CC0DDF0007B3BA5 /* Pay_Public_yhNOT.png in Resources */,

ProductApp/ProductApp/AppDelegate.m

@@ -47,7 +47,12 @@
     [self.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[StartViewController new]]];
     [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:HomeToosRef];
     [UserInfoModel setAiChatIsDrawing:0];
-//    [self.window setRootViewController:[TabBarController new]];
+
+//    if(DEBUG)
+//    {
+//        [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:YingDaoYe];
+//    }
+    
     
     [self.window makeKeyAndVisible];
     

ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,91 +1,109 @@
 {
   "images" : [
     {
+      "filename" : "512直角 17.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角 12.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角 13.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角 8.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角 9.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角 7.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角 6.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
+      "filename" : "512直角 3.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
+      "filename" : "512直角 19.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角 16.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "512直角 18.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角 14.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "512直角 15.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角 10.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "512直角 11.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "512直角 5.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "512直角 4.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "512直角 2.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

ProductApp/ProductApp/Info.plist

@@ -14,6 +14,24 @@
 				<string>wx31efd88bd33ae068</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>ailipayAIWrite</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>ailipayAIWrite</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>aiwrite</string>
+			</array>
+		</dict>
 	</array>
 	<key>GT_MinimumOSVersion</key>
 	<integer>11</integer>
@@ -65,6 +83,8 @@
 		<string>SmileySans-Oblique.ttf</string>
 	</array>
 	<key>UIBackgroundModes</key>
-	<array/>
+	<array>
+		<string>remote-notification</string>
+	</array>
 </dict>
 </plist>

ProductApp/ProductApp/ProductMain/AIChart/AIChatViewController.m

@@ -150,12 +150,9 @@
 
 -(void)scrollToBottom
 {
-//    dispatch_async(dispatch_get_main_queue(), ^{
-//        NSIndexPath *index = [NSIndexPath indexPathForRow:self.arrdata.count-1 inSection:0];
-//        [self.tableView scrollToRowAtIndexPath:index atScrollPosition:UITableViewScrollPositionBottom animated:NO];
-//    });
     [self.tableView reloadData];
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if(self.arrdata.count==0)return;
         NSIndexPath *index = [NSIndexPath indexPathForRow:self.arrdata.count-1 inSection:0];
         [self.tableView scrollToRowAtIndexPath:index atScrollPosition:UITableViewScrollPositionBottom animated:NO];
     });

ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m

@@ -155,7 +155,7 @@
     [viewsearh.searchview setBackgroundColor:[UIColor whiteColor]];
     [viewsearh.searchview.layer  setCornerRadius:17];
     viewsearh.fangdajing.image = [UIImage imageNamed:@"gj_search"];
-    viewsearh.searchField.placeholder = @"请输入关键词";
+    viewsearh.searchField.placeholder = @"请输入工具名称";
     [viewsearh.searchbtn setHidden:YES];
     [viewsearh.searchview mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(viewsearh);

ProductApp/ProductApp/ProductMain/工具/搜索/GongJuSearchViewController.m

@@ -61,7 +61,7 @@
     [viewsearh.searchview setBackgroundColor:[UIColor whiteColor]];
     [viewsearh.searchview.layer  setCornerRadius:17];
     viewsearh.fangdajing.image = [UIImage imageNamed:@"gj_search"];
-    viewsearh.searchField.placeholder = @"请输入关键词";
+    viewsearh.searchField.placeholder = @"请输入工具名称";
     [viewsearh.searchview.layer setBorderWidth:1];
     [viewsearh.searchview.layer setBorderColor:RGBCOLOR(108, 119, 246).CGColor];
     [viewsearh.searchview mas_remakeConstraints:^(MASConstraintMaker *make) {

ProductApp/ProductApp/ProductMain/工具/搜索/搜索列表/GongJuSearchListViewController.m

@@ -77,7 +77,7 @@
     [viewsearh.searchview setBackgroundColor:[UIColor whiteColor]];
     [viewsearh.searchview.layer  setCornerRadius:17];
     viewsearh.fangdajing.image = [UIImage imageNamed:@"gj_search"];
-    viewsearh.searchField.placeholder = @"请输入关键词";
+    viewsearh.searchField.placeholder = @"请输入工具名称";
     [viewsearh.searchview.layer setBorderWidth:1];
     [viewsearh.searchview.layer setBorderColor:RGBCOLOR(108, 119, 246).CGColor];
     [viewsearh.searchview mas_remakeConstraints:^(MASConstraintMaker *make) {

ProductApp/ProductApp/ProductMain/引导/view/StartGNView.m

@@ -23,6 +23,11 @@
 ///
 @property (nonatomic , strong) PageControlView *pagec;
 
+///
+@property (nonatomic , strong) UIButton *bttiyan;
+///
+@property (nonatomic , strong) UIButton *btlast;
+
 @end
 
 @implementation StartGNView
@@ -55,6 +60,7 @@
             make.height.offset(44);
         }];
         [btlast addTarget:self action:@selector(lastAction) forControlEvents:UIControlEventTouchUpInside];
+        _btlast = btlast;
         
         UIButton *bttiyan = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-24, 44)];
         [bttiyan setTitle:@"立即体验" forState:UIControlStateNormal];
@@ -71,6 +77,7 @@
         }];
         [bttiyan addTarget:self action:@selector(tiyanAction) forControlEvents:UIControlEventTouchUpInside];
         [Tools changedView:bttiyan colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+        _bttiyan = bttiyan;
         
         PageControlView *pagec = [[PageControlView alloc] init];
         [pagec setNumber:4];
@@ -95,34 +102,12 @@
         make.edges.equalTo(view);
     }];
     
-    UIImageView *imgvlog = [[UIImageView alloc] init];
-    [imgvlog setImage:[UIImage imageNamed:@"yd_ailog"]];
-    [view addSubview:imgvlog];
-    [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.height.offset(80);
-        make.left.offset(16);
-        make.top.offset(KMagrinTop+3);
-    }];
-    
-    UILabel *lbname = [[UILabel alloc] init];
-    [lbname setText:@"欢迎使用本产品，我是您的智能助手，请选择您想要体验的功能"];
-    [lbname setTextColor:RGBCOLOR(26, 26, 26)];
-    [lbname setTextAlignment:NSTextAlignmentLeft];
-    [lbname setFont:[UIFont systemFontOfSize:16]];
-    [lbname setNumberOfLines:2];
-    [view addSubview:lbname];
-    [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(imgvlog.mas_right).offset(12);
-        make.right.equalTo(view).offset(-9);
-        make.centerY.equalTo(imgvlog);
-    }];
-    
     UIImage *image = [UIImage imageNamed:strimage];
     float fheight = image.size.height*UISCREEN_WIDTH/image.size.width;
     float fwidth = UISCREEN_WIDTH;
-    if(fheight>UISCREEN_HEIGHT-KMagrinTop-83-TabHeight-70)
+    if(fheight>UISCREEN_HEIGHT-KMagrinTop-TabHeight-70)
     {
-        fheight = UISCREEN_HEIGHT-KMagrinTop-83-TabHeight-70;
+        fheight = UISCREEN_HEIGHT-KMagrinTop-TabHeight-70;
         fwidth = image.size.width*fheight/image.size.height;
     }
     
@@ -133,7 +118,7 @@
     [imgvitem mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(view);
         make.width.offset(fwidth);
-        make.top.equalTo(imgvlog.mas_bottom);
+        make.top.offset(KMagrinTop+3);
         make.height.offset(fheight);
     }];
     if(isbook)
@@ -157,23 +142,43 @@
     _type = type;
     int tagbook = 0;
     NSArray *arr = @[@"yd_xs_3",@"yd_xs_1",@"yd_xs_0",@"yd_xs_2"];
+    [UserInfoModel setIdentityType:@"0"];
     switch (type) {
         case 1:
             {
                 arr = @[@"yd_xs_1",@"yd_xs_3",@"yd_xs_0",@"yd_xs_2"];
                 tagbook = 1;
+                [UserInfoModel setIdentityType:@"1"];
             }
             break;
         case 2:
             {
                 arr = @[@"yd_xs_1",@"yd_xs_2",@"yd_xs_3",@"yd_xs_0"];
                 tagbook = 2;
+                [UserInfoModel setIdentityType:@"2"];
             }
             break;
         case 3:
             {
                 arr = @[@"yd_zy_0",@"yd_zy_1",@"yd_zy_2",@"yd_zy_3"];
                 tagbook = -1;
+                
+                [self.bttiyan mas_remakeConstraints:^(MASConstraintMaker *make) {
+                    make.centerX.equalTo(self.btlast);
+                    make.width.offset(144);
+                    make.bottom.equalTo(self.btlast.mas_top);
+                    make.height.offset(44);
+                }];
+                [self.bttiyan.layer setMasksToBounds:YES];
+                [self.bttiyan.layer setCornerRadius:22];
+                
+                [UserInfoModel setIdentityType:@"3"];
+                
+                CALayer *layertemp = [[self.bttiyan.layer sublayers] firstObject];
+                [layertemp removeFromSuperlayer];
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [Tools changedView:self.bttiyan colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+                });
             }
             break;
         default:

ProductApp/ProductApp/ProductMain/引导/作文批改/cell/StartZWPIViewCell.m

@@ -32,12 +32,12 @@
         _lbname = lbname;
         
         UIImageView *imgvback = [[UIImageView alloc] init];
-        [imgvback setContentMode:UIViewContentModeRedraw];
+        [imgvback setContentMode:UIViewContentModeScaleAspectFill];
         [self addSubview:imgvback];
         [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.right.equalTo(self);
-            make.bottom.equalTo(self).offset(-20);
             make.top.equalTo(lbname.mas_bottom).offset(15);
+            make.height.offset(400);
         }];
         [imgvback.layer setMasksToBounds:YES];
         [imgvback.layer setCornerRadius:20];
@@ -53,6 +53,14 @@
     if(model.input_image.count>0)
     {
         [self.imgvback sd_setImageWithURL:[NSURL URLWithString:model.input_image.firstObject] placeholderImage:nil];
+        [self.imgvback sd_setImageWithURL:[NSURL URLWithString:model.input_image.firstObject] placeholderImage:nil completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+           if(image)
+           {
+               [self.imgvback mas_updateConstraints:^(MASConstraintMaker *make) {
+                   make.height.offset(UISCREEN_WIDTH*0.7*image.size.height/image.size.width);
+               }];
+           }
+        }];
     }
 }
 

ProductApp/ProductApp/ProductMain/引导/作文批改/view/StartZWPIView.m

@@ -122,12 +122,6 @@
 
 -(void)nextAction
 {
-//    StartKTXZPGViewController *vc = [StartKTXZPGViewController new];
-//    vc.type = 1;
-//    vc.isshiyong = YES;
-//    vc.modelDetailZWPG = self.arrdata[self.bannerView.currentIndex];
-//    [self.viewController.navigationController pushViewController:vc animated:YES];
-    
     StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
     view.type = 1;
     view.isshiyong = YES;
@@ -152,7 +146,7 @@
 {
     StartZWPIViewCell *cardView = (StartZWPIViewCell *)[bannerView dequeueReusableView];
     if (!cardView) {
-        cardView = [[StartZWPIViewCell alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH*0.8, StartZWPICellHeight)];
+        cardView = [[StartZWPIViewCell alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH*0.7, StartZWPICellHeight)];
         cardView.tag = index;
     }
     cardView.model = self.arrdata[index];
@@ -163,7 +157,7 @@
 /** 当前显示cardView Size */
 - (CGSize)sizeForCurrentCardViewInBannerView:(JhtBannerScrollView *)bannerView
 {
-    return CGSizeMake(UISCREEN_WIDTH*0.8, StartZWPICellHeight);
+    return CGSizeMake(UISCREEN_WIDTH*0.7, StartZWPICellHeight);
 }
 
 /** 滚动到了某一个cardView */

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

@@ -35,6 +35,11 @@
     {
         [self.navigationView setTitle:@"作文批改记录" titleColor:RGBCOLOR(60, 60, 60)];
     }
+    if(self.isshiyong)
+    {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+        [self.navigationView.backButton setHidden:YES];
+    }
     
     [self getQuanXian];
 }
@@ -113,7 +118,7 @@
 
 -(void)getQuanXian
 {
-    if(self.isquanxian==YES)return;
+    if(self.isquanxian==YES || self.isshiyong==YES)return;
     [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO  back:^(BOOL value) {
        if(value==NO)
        {

ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m

@@ -52,6 +52,7 @@
             make.centerX.equalTo(self);
             make.top.offset(NavHeight+20);
         }];
+        [imgvback setHidden:YES];
         
         UIImageView *imgvtopleft = [[UIImageView alloc] init];
         [imgvtopleft setImage:[UIImage imageNamed:@"yd_scor_top_left"]];

ProductApp/ProductApp/ProductMain/引导/拍照写作/view/StartPZXZView.m

@@ -188,14 +188,44 @@
     [self.motionManager stopAccelerometerUpdates];
     self.motionManager = nil;
 }
-
+-(UIImage *)jietu:(UIView *)view
+{
+    UIGraphicsBeginImageContextWithOptions(CGSizeMake(UISCREEN_WIDTH, view.height), NO, 0.0);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    [view.layer renderInContext:context];
+    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return image;
+}
 -(void)paiAction
 {
+    [self setUserInteractionEnabled:NO];
     [self stopMotion];
-    ///
-    StartPZXZDetailViewController *vc = [StartPZXZDetailViewController new];
-    vc.isshiyong = YES;
-    vc.modelYD = self.arrdataYD[self.btselect.tag];
-    [self.viewController.navigationController pushViewController:vc animated:YES];
+    
+    UIView *view = self.arrView[self.btselect.tag];
+    UIImage *image = [self jietu:view];
+    UIImageView *imgvback = [[UIImageView alloc] init];
+    [imgvback setImage:image];
+    [self addSubview:imgvback];
+    [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.equalTo(self);
+        make.height.equalTo(self.scvback);
+    }];
+    
+    
+    [UIView animateWithDuration:1 delay:0.0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+        imgvback.alpha = 0.0; // 将视图的透明度逐渐调整为0.0，即透明
+    } completion:^(BOOL finished) {
+        if (finished) {
+            // 动画完成后，可以选择将视图从父视图上移除
+            [imgvback removeFromSuperview];
+            [self setUserInteractionEnabled:YES];
+            ///
+            StartPZXZDetailViewController *vc = [StartPZXZDetailViewController new];
+            vc.isshiyong = YES;
+            vc.modelYD = self.arrdataYD[self.btselect.tag];
+            [self.viewController.navigationController pushViewController:vc animated:YES];
+        }
+    }];
 }
 @end

ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/StartPZXZDetailViewController.m

@@ -55,6 +55,11 @@
     {
         [self.navigationView setMuenTitle:@"反馈" titleColor:RGBCOLOR(60, 60, 60)];
     }
+//    if(self.isshiyong)
+//    {
+//        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+//        [self.navigationView.backButton setHidden:YES];
+//    }
 }
 -(void)navMuenButtonAction
 {
@@ -71,11 +76,11 @@
         make.left.right.bottom.equalTo(self.view);
         make.top.offset(NavHeight);
     }];
-    view.type = self.type;
     view.isshiyong = self.isshiyong;
     view.modelYD = self.modelYD;
     view.modelHestory = self.modelHestory;
     view.arrXZImages = self.arrXZImages;
+    view.type = self.type;
     view.strID = self.strID;
     
 }

ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/view/StartPZXZDetailView.m

@@ -388,9 +388,17 @@
 -(void)setType:(int)type
 {
     _type = type;
-    if(type>=10&&type<=12)
+    
+    if(self.modelHestory||self.modelYD)
     {
-        [self drawBottomViewXZ:self.viewbottom];
+        
+    }
+    else
+    {
+        if(type>=10&&type<=12)
+        {
+            [self drawBottomViewXZ:self.viewbottom];
+        }
     }
 }
 -(void)setArrXZImages:(NSArray *)arrXZImages
@@ -509,6 +517,12 @@
 
 -(void)copyAction
 {
+    if(self.isdrawEnd==NO)
+    {
+        [HXHud showMessage:@"请等待写作完成" afterDelayType:0];
+        return;
+    }
+    
     UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
     pasteboard.string = [Tools isStringnilkong:self.modelHestory.result.content];
     [HXHud showMessage:@"复制成功" afterDelayType:0];

ProductApp/ProductApp/ProductMain/引导/支付页/StartPayViewController.m

@@ -10,7 +10,8 @@
 #import "PublicNetWorkManager.h"
 
 @interface StartPayViewController ()
-
+///
+@property (nonatomic , strong) StartPayView *viewshow;
 @end
 
 @implementation StartPayViewController
@@ -19,11 +20,32 @@
 }
 -(void)viewDidDisappear:(BOOL)animated{
     [super viewDidDisappear:animated];
+    NSArray *arrvc = self.navigationController.viewControllers;
+    if(![arrvc containsObject:self])
+    {
+        [self.viewshow removeTimer];
+    }
+}
+-(void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    if(self.ptype==0)
+    {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+        [self.navigationView.backButton setHidden:YES];
+    }
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.navigationView setHidden:YES];
     [self.navigationController setNavigationBarHidden:YES animated:NO];
+    if(self.ptype==1)
+    {
+        [self.navigationView setHidden:NO];
+        [self showNaviGationView:YES];
+        [self.navigationView setBackgroundColor:[UIColor clearColor]];
+        [self.navigationView setTitle:@"开通会员" titleColor:RGBCOLOR(51, 51, 51)];
+    }
     
     StartPayView *view = [[StartPayView alloc] init];
     [self.view addSubview:view];
@@ -33,7 +55,9 @@
     }];
     view.ptype = self.ptype;
     view.source = self.source;
+    [self.view sendSubviewToBack:view];
     [view setHidden:YES];
+    _viewshow = view;
     
     [HXLoadingHUD showWithStatus:@"" maskType:0];
     [PublicNetWorkManager requestOrderGoodsData:self.view type:@"member" Callback:^(BOOL state, OrderGoodsModel *responseObject, NSString * _Nullable describle) {

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

@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic , strong) NSString *source;
 ///商品
 @property (nonatomic , strong) NSArray *arrGoods;
+
+-(void)removeTimer;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -19,6 +19,7 @@
 
 
 @interface StartPayView ()<PayManagerDelegate>
+@property (nonatomic , strong) UIButton *btdel;
 ///
 @property (nonatomic , strong) StartPayGoodsView *viewgoods;
 ///
@@ -70,9 +71,10 @@
             make.right.offset(UISCREEN_WIDTH-10);
         }];
         [btdel addTarget:self action:@selector(delAction) forControlEvents:UIControlEventTouchUpInside];
+        _btdel = btdel;
         
         UILabel *lbname = [[UILabel alloc] init];
-        [lbname setText:@"智能写作"];
+        [lbname setText:@"写作批改"];
         [lbname setTextColor:RGBCOLOR(23, 31, 96)];
         [lbname setTextAlignment:NSTextAlignmentLeft];
         [lbname setFont:[UIFont fontWithName:@"zihunbiantaoti" size:50]];
@@ -364,6 +366,15 @@
 -(void)wbXieYiAction:(UIButton *)sender
 {
     
+}
+-(void)setPtype:(int)ptype
+{
+    _ptype = ptype;
+    
+    if(ptype == 1)
+    {
+        [self.btdel setHidden:YES];
+    }
 }
 -(void)setArrGoods:(NSArray *)arrGoods
 {
@@ -383,7 +394,10 @@
     
 }
 
-
+-(void)removeTimer
+{
+    [self.viewgoods removeTime];
+}
 -(void)delAction
 {
     [self.viewgoods removeTime];

ProductApp/ProductApp/ProductMain/引导/智能PPT/StartZNPPTViewController.m

@@ -19,14 +19,15 @@
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.navigationController setNavigationBarHidden:YES animated:NO];
     [self showNaviGationView:YES];
-    [self.navigationView setTitle:@"智能PPT" titleColor:RGBCOLOR(31, 31, 31)];
+    [self.navigationView setTitle:@"创作PPT" titleColor:RGBCOLOR(31, 31, 31)];
     [self.navigationView setBackgroundColor:[UIColor clearColor]];
+    [self.navigationView.backButton setHidden:YES];
     
     [self.view setBackgroundColor:RGBCOLOR(246, 249, 250)];
     UIImageView *imgvback = [[UIImageView alloc] init];

ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/StartZNPPTDaGangViewController.m

@@ -23,6 +23,11 @@
     [self showNaviGationView:YES];
     [self.navigationView setTitle:@"您可以对大纲进行编辑和排序" titleColor:RGBCOLOR(60, 60, 60)];
     [self.navigationView setBackgroundColor:[UIColor whiteColor]];
+    if(self.isyindao)
+    {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+        [self.navigationView.backButton setHidden:YES];
+    }
 }
 - (void)viewDidLoad {
     [super viewDidLoad];

ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/view/StartZNPPTDaGangAlterView.m

@@ -8,6 +8,7 @@
 #import "StartZNPPTDaGangAlterView.h"
 #import "StartZNPPTDaGangAlterLoadView.h"
 #import "AppDelegate.h"
+#import <libpag/PAGView.h>
 
 static StartZNPPTDaGangAlterView *viewShow;
 
@@ -15,6 +16,9 @@ static StartZNPPTDaGangAlterView *viewShow;
 ///
 @property (nonatomic , strong) StartZNPPTDaGangAlterLoadView *viewjd;
 
+///
+@property (nonatomic , strong) PAGView *pagView;
+
 @end
 
 @implementation StartZNPPTDaGangAlterView
@@ -47,24 +51,31 @@ static StartZNPPTDaGangAlterView *viewShow;
             make.centerX.equalTo(viewback);
         }];
         
-        UIImageView *imgvlog = [[UIImageView alloc] init];
-        [imgvlog setImage:[UIImage imageNamed:@"yd_hudppt"]];
-        [viewback addSubview:imgvlog];
-        [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
+//        UIImageView *imgvlog = [[UIImageView alloc] init];
+//        [imgvlog setImage:[UIImage imageNamed:@"yd_hudppt"]];
+//        [viewback addSubview:imgvlog];
+//        [imgvlog mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.width.height.offset(90);
+//            make.top.equalTo(lbname.mas_bottom).offset(39);
+//            make.centerX.equalTo(viewback);
+//        }];
+        PAGView *pagView = [[PAGView alloc] initWithFrame:CGRectMake(0, 0, 110, 110)];
+        [viewback addSubview:pagView];
+        dispatch_async(dispatch_get_global_queue(0, 0), ^{
+            NSString *strpath = [[NSBundle mainBundle] pathForResource:@"ppt加载" ofType:@"pag"];
+            PAGFile* pagFile = [PAGFile Load:strpath];
+            [pagView setComposition:pagFile];
+            [pagView setRepeatCount:0];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [pagView play];
+            });
+        });
+        [pagView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.height.offset(90);
             make.top.equalTo(lbname.mas_bottom).offset(39);
             make.centerX.equalTo(viewback);
         }];
-        
-        UIImageView *viewline = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 70, 9)];
-        [viewline setImage:[UIImage imageNamed:@"tuoyuan"]];
-        [viewback addSubview:viewline];
-        [viewline mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.size.sizeOffset(CGSizeMake(70, 9));
-            make.top.equalTo(imgvlog.mas_bottom).offset(22);
-            make.centerX.equalTo(viewback);
-        }];
-        
+        _pagView = pagView;
         
         
         StartZNPPTDaGangAlterLoadView *viewjd = [StartZNPPTDaGangAlterLoadView new];
@@ -73,7 +84,7 @@ static StartZNPPTDaGangAlterView *viewShow;
             make.left.offset(22);
             make.right.equalTo(viewback).offset(-22);
             make.height.offset(22);
-            make.top.equalTo(viewline.mas_bottom).offset(44);
+            make.top.equalTo(pagView.mas_bottom).offset(44);
         }];
         viewjd.fblv = 0.0;
         _viewjd = viewjd;
@@ -104,6 +115,9 @@ static StartZNPPTDaGangAlterView *viewShow;
 {
     if(viewShow)
     {
+        [viewShow.pagView stop];
+        [viewShow.pagView freeCache];
+        
         [viewShow removeFromSuperview];
         viewShow = nil;
     }

ProductApp/ProductApp/ProductMain/引导/智能PPT/预览PPT/StartZNPPTYuLanViewController.m

@@ -25,6 +25,8 @@
     [self.navigationController setNavigationBarHidden:YES animated:animated];
     [self showNaviGationView:YES];
     [self.navigationView setBackgroundColor:[UIColor whiteColor]];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    [self.navigationView.backButton setHidden:YES];
 }
 - (void)viewDidLoad {
     [super viewDidLoad];

ProductApp/ProductApp/ProductMain/引导/课堂写作/StartKTXZWenZhangViewController.m

@@ -24,6 +24,9 @@
     [self.navigationView setBackImg:@"back_write"];
     [self.navigationView setTitle:@"" titleColor:[UIColor whiteColor]];
     [self.navigationView setBackgroundColor:[UIColor clearColor]];
+    
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    [self.navigationView.backButton setHidden:YES];
 }
 - (void)viewDidLoad {
     [super viewDidLoad];

ProductApp/ProductApp/ProductMain/引导/课堂写作/StartKeTangXieZuoViewController.m

@@ -26,6 +26,7 @@
     [self.navigationView setBackImg:@"back_write"];
     [self.navigationView setTitle:@"" titleColor:[UIColor whiteColor]];
     [self.navigationView setBackgroundColor:[UIColor clearColor]];
+    [self.navigationView.backButton setHidden:YES];
 }
 - (void)viewDidLoad {
     [super viewDidLoad];

ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKTXZWenZhangView.m

@@ -222,9 +222,9 @@
     
     UIButton *btzhan= [[UIButton alloc] init];
     [btzhan setTitle:@"展开" forState:UIControlStateNormal];
-    [btzhan setImage:[UIImage imageNamed:@"yd_展开"] forState:UIControlStateNormal];
+    [btzhan setImage:[UIImage imageNamed:@"yd_收起"] forState:UIControlStateNormal];
     [btzhan setTitle:@"收起" forState:UIControlStateSelected];
-    [btzhan setImage:[UIImage imageNamed:@"yd_收起"] forState:UIControlStateSelected];
+    [btzhan setImage:[UIImage imageNamed:@"yd_展开"] forState:UIControlStateSelected];
     [btzhan setTitleColor:RGBCOLOR(153, 153, 153) forState:UIControlStateNormal];
     [btzhan.titleLabel setFont:[UIFont systemFontOfSize:14]];
     [self.viewback addSubview:btzhan];
@@ -451,12 +451,6 @@
         [HXHud showMessage:@"请等待文章写作完成" afterDelayType:0];
         return;
     }
-    
-//    StartKTXZPGViewController *vc = [[StartKTXZPGViewController alloc] init];
-//    vc.isshiyong = YES;
-//    vc.modelDetailYDY = self.modelDetailYDY;
-//    [self.viewController.navigationController pushViewController:vc animated:YES];
-    
     StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
     view.isshiyong = YES;
     view.modelDetailYDY = self.modelDetailYDY;

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

@@ -25,14 +25,18 @@
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:YES animated:animated];
     [self showNaviGationView:YES];
-    [self.navigationView setTitle:@"写作思路" titleColor:RGBCOLOR(60, 60, 60)];
+    [self.navigationView setTitle:@"作文批改" titleColor:RGBCOLOR(60, 60, 60)];
     [self.navigationView setBackgroundColor:[UIColor whiteColor]];
     [self.navigationView.backButton setHidden:self.isshiyong];
     if(self.strID.length>0)
     {
         [self.navigationView setMuenImg:@"xz_fenxiang"];
     }
-    
+    if(self.isshiyong)
+    {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+        [self.navigationView.backButton setHidden:YES];
+    }
     [self getQuanXian];
 }
 -(void)navMuenButtonAction
@@ -131,7 +135,7 @@
 }
 -(void)getQuanXian
 {
-    if(self.isquanxian==YES)return;
+    if(self.isquanxian==YES || self.isshiyong==YES)return;
     [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO  back:^(BOOL value) {
        if(value==NO)
        {

ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/综合评价/StartKTXZPGDetailZHView.m

@@ -175,14 +175,6 @@
     
     UILabel *lbbzName = [[UILabel alloc] init];
     [lbbzName setText:[Tools isStringnilkong:self.modelResult.complex_review.full_review.style]];
-    if(self.modelPF)
-    {
-        [lbbzName setText:[UserInfoModel shareModel].user_stage.parent_name];
-    }
-    if(self.modelHestoryResult)
-    {
-        [lbbzName setText:[UserInfoModel shareModel].user_stage.parent_name];
-    }
     [lbbzName setTextColor:RGBCOLOR(61, 61, 61)];
     [lbbzName setTextAlignment:NSTextAlignmentLeft];
     [lbbzName setFont:[UIFont systemFontOfSize:12]];
@@ -192,6 +184,27 @@
         make.centerY.equalTo(lbbz);
     }];
     
+    UILabel *lbnumber = [[UILabel alloc] init];
+    [lbnumber setText:[NSString stringWithFormat:@"%@字",[Tools isStringnilkong:self.modelResult.complex_review.word_size]]];
+    [lbnumber setTextColor:RGBCOLOR(61, 61, 61)];
+    [lbnumber setTextAlignment:NSTextAlignmentLeft];
+    [lbnumber setFont:[UIFont systemFontOfSize:12]];
+    [view addSubview:lbnumber];
+    [lbnumber mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(view).offset(-15);
+        make.centerY.equalTo(lbbz);
+    }];
+    if(self.modelPF)
+    {
+        [lbbzName setText:[UserInfoModel shareModel].user_stage.parent_name];
+        [lbnumber setText:[NSString stringWithFormat:@"%@字",[Tools isStringnilkong:self.modelPF.total_words]]];
+    }
+    if(self.modelHestoryResult)
+    {
+        [lbbzName setText:[UserInfoModel shareModel].user_stage.parent_name];
+        [lbnumber setText:[NSString stringWithFormat:@"%@字",[Tools isStringnilkong:self.modelHestoryResult.write_correct_score.total_words]]];
+    }
+    
     
     UIView *viewinfo = [[UIView alloc] init];
     [viewinfo setBackgroundColor:[UIColor whiteColor]];

ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreShiLiView.m

@@ -107,7 +107,7 @@
         make.top.offset(KMagrinTop+50);
         make.height.offset(CamreShiLiViewCellHeight);
     }];
-    [bannerView setClipsToBounds:NO];
+    [bannerView setClipsToBounds:YES];
     _bannerView = bannerView;
     
 }