2.5.1版本提交

ProductApp/ProductApp.xcodeproj/project.pbxproj

@@ -391,6 +391,7 @@
 		CAC8066C2CA16DCC00C21AA7 /* StartPZXZViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAC8066B2CA16DCC00C21AA7 /* StartPZXZViewController.m */; };
 		CAC806702CA16E0700C21AA7 /* StartPZXZView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAC8066F2CA16E0700C21AA7 /* StartPZXZView.m */; };
 		CAC806732CA171ED00C21AA7 /* StartPZXZPageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAC806722CA171ED00C21AA7 /* StartPZXZPageView.m */; };
+		CAC8F4062CF9993C00D578D2 /* ShouYeLSPLPGTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAC8F4052CF9993C00D578D2 /* ShouYeLSPLPGTableViewCell.m */; };
 		CACB9EFA2CD225B700449541 /* FMDMySql.m in Sources */ = {isa = PBXBuildFile; fileRef = CACB9EF92CD225B700449541 /* FMDMySql.m */; };
 		CAD092C22CD46F7E00853A26 /* ChatCheckModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAD092C12CD46F7E00853A26 /* ChatCheckModel.m */; };
 		CAD092C52CD478F400853A26 /* PptThemeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAD092C42CD478F400853A26 /* PptThemeModel.m */; };
@@ -1301,6 +1302,8 @@
 		CAC8066F2CA16E0700C21AA7 /* StartPZXZView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StartPZXZView.m; sourceTree = "<group>"; };
 		CAC806712CA171ED00C21AA7 /* StartPZXZPageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartPZXZPageView.h; sourceTree = "<group>"; };
 		CAC806722CA171ED00C21AA7 /* StartPZXZPageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StartPZXZPageView.m; sourceTree = "<group>"; };
+		CAC8F4042CF9993C00D578D2 /* ShouYeLSPLPGTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLSPLPGTableViewCell.h; sourceTree = "<group>"; };
+		CAC8F4052CF9993C00D578D2 /* ShouYeLSPLPGTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLSPLPGTableViewCell.m; sourceTree = "<group>"; };
 		CACB9EF82CD225B700449541 /* FMDMySql.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FMDMySql.h; sourceTree = "<group>"; };
 		CACB9EF92CD225B700449541 /* FMDMySql.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FMDMySql.m; sourceTree = "<group>"; };
 		CAD092C02CD46F7E00853A26 /* ChatCheckModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatCheckModel.h; sourceTree = "<group>"; };
@@ -1964,6 +1967,8 @@
 			children = (
 				CA0D08522CA543370086855E /* ShouYeLSZWPGTableViewCell.h */,
 				CA0D08532CA543370086855E /* ShouYeLSZWPGTableViewCell.m */,
+				CAC8F4042CF9993C00D578D2 /* ShouYeLSPLPGTableViewCell.h */,
+				CAC8F4052CF9993C00D578D2 /* ShouYeLSPLPGTableViewCell.m */,
 				CA0D08552CA543440086855E /* ShouYeLSKTPGTableViewCell.h */,
 				CA0D08562CA543440086855E /* ShouYeLSKTPGTableViewCell.m */,
 			);
@@ -5239,6 +5244,7 @@
 				CAB0F3642CAA8523003B0C39 /* XieZuoXiangQingView.m in Sources */,
 				CA22D1E12CD0C7F300CA7E93 /* FanWenSearchHestoryView.m in Sources */,
 				CB489F662744A0BD00DA044A /* DAYUtils.m in Sources */,
+				CAC8F4062CF9993C00D578D2 /* ShouYeLSPLPGTableViewCell.m in Sources */,
 				CA4257B22CA2BB8500A36A10 /* StartPayViewController.m in Sources */,
 				CB489F6A2744A0BD00DA044A /* UILabel+PGGLabText.m in Sources */,
 				CA5D02E92CC0DD6B007B3BA5 /* UserCodeModel.m in Sources */,
@@ -5671,7 +5677,7 @@
 					"$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib",
 					"$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib",
 				);
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.batiao.aiwrite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -5742,7 +5748,7 @@
 					"$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib",
 					"$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib",
 				);
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.batiao.aiwrite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

ProductApp/ProductApp/Assets.xcassets/首页/sy_ktxzback.imageset/Contents.json

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

ProductApp/ProductApp/Assets.xcassets/首页/sy_plpgbt.imageset/Contents.json

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

ProductApp/ProductApp/Assets.xcassets/首页/sy_plpgcellback.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "组 43357@2x(1).png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 43357@3x(1).png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ProductApp/ProductApp/Assets.xcassets/首页/sy_plpgdgzs.imageset/Contents.json

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

ProductApp/ProductApp/Assets.xcassets/首页/sy_plpgface.imageset/Contents.json

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

ProductApp/ProductApp/Assets.xcassets/首页/sy_plpgxin.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "容器 163@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "容器 163@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ProductApp/ProductApp/Assets.xcassets/首页/sy_pzxzback.imageset/Contents.json

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

ProductApp/ProductApp/Assets.xcassets/首页/sy_znxzback.imageset/Contents.json

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

ProductApp/ProductApp/Other/ViewLable.m

@@ -86,6 +86,7 @@
         UIImageView *imgvb = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 18, 18)];
         [imgvb setImage:[UIImage imageNamed:@"yd_drawTextB"]];
         [self addSubview:imgvb];
+        [self.imgvb setHidden:YES];
         _imgvb = imgvb;
     }
     return self;
@@ -163,7 +164,7 @@
     if(self.timer==nil)
     {
         [self endAction];
-        [self.imgvb setHidden:NO];
+//        [self.imgvb setHidden:NO];
         self.inow = 0;
         NSTimer *timer = [NSTimer scheduledTimerWithTimeInterval:self.fspeed>0?self.fspeed:0.02 target:self selector:@selector(textSpeedAppend) userInfo:nil repeats:YES];
         _timer = timer;
@@ -213,13 +214,14 @@
     {
         self.backHeight(fheight,NO);
     }
-    
-    CGPoint point = [self boundingRectForLastCharacterInLabel:self.lbname];
-    if(point.x>0&&point.y>0)
+    if(self.imgvb.hidden==NO)
     {
-        self.imgvb.center = point;
+        CGPoint point = [self boundingRectForLastCharacterInLabel:self.lbname];
+        if(point.x>0&&point.y>0)
+        {
+            self.imgvb.center = point;
+        }
     }
-    
 }
 - (CGPoint)boundingRectForLastCharacterInLabel:(UILabel *)label {
     NSString *text = label.text;

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

@@ -162,9 +162,19 @@
     ///真实数据
     if(self.arrXZImages.count>0)
     {
-        if(fvalue>=0.98 && (self.modelPF==nil || self.modelContentItems==nil))
+        if (self.type>=10&&self.type<=12)
         {
-            fvalue = 0.98;
+            if(fvalue>=0.98 && [Tools isStringnil:self.strID].length == 0)
+            {
+                fvalue = 0.98;
+            }
+        }
+        else
+        {
+            if(fvalue>=0.98 && (self.modelPF==nil || self.modelContentItems==nil))
+            {
+                fvalue = 0.98;
+            }
         }
     }
     

ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m

@@ -23,6 +23,8 @@
 #import "FanWenDetailViewController.h"
 #import "UpdataAlterView.h"
 
+#import "ShouYeLSPLPGTableViewCell.h"
+
 @interface ShouYeViewController ()<UITableViewDelegate,UITableViewDataSource>
 ///
 @property (nonatomic , strong) UIButton *btnianji;
@@ -172,13 +174,24 @@
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     if([UserInfoModel shareModel].identityType.intValue==3)return 4;
+    if([UserInfoModel shareModel].identityType.intValue==2)return 6;
     return 5;
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    if(section==4)
-    {///高分作文
-        return self.arrFanWen.count;
+    if([UserInfoModel shareModel].identityType.intValue==2)
+    {
+        if(section==5)
+        {///高分作文
+            return self.arrFanWen.count;
+        }
+    }
+    else
+    {
+        if(section==4)
+        {///高分作文
+            return self.arrFanWen.count;
+        }
     }
     return 1;
 }
@@ -186,10 +199,134 @@
 {
     ///0学生 1家长 2老师 3职场
     int type = [UserInfoModel shareModel].identityType.intValue;
-    if(indexPath.section==0)
+    if(type==0||type==1)
     {
-        if(type==3)
-        {///职场
+        if(indexPath.section==0)
+        {
+            static NSString *strcell = @"ShouYeZNXZTableViewCell";
+            ShouYeZNXZTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeZNXZTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            
+            return cell;
+        }
+        else if(indexPath.section==1)
+        {
+            static NSString *strcell = @"ShouYeXieZuoTableViewCell";
+            ShouYeXieZuoTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeXieZuoTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            
+            return cell;
+        }
+        else if(indexPath.section==2)
+        {
+            static NSString *strcell = @"ShouYeBannerTableViewCell";
+            ShouYeBannerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeBannerTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            
+            return cell;
+        }
+        else if(indexPath.section==3)
+        {
+            static NSString *strcell = @"ShouYeToolsTableViewCell";
+            ShouYeToolsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeToolsTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            cell.arrdata = self.arrTools;
+            
+            return cell;
+        }
+    }
+    else if (type==2)
+    {
+        if(indexPath.section==0)
+        {
+            static NSString *strcell = @"ShouYeLSZWPGTableViewCell";
+            ShouYeLSZWPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeLSZWPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            
+            return cell;
+        }
+        else if(indexPath.section==1)
+        {
+            static NSString *strcell = @"ShouYeLSPLPGTableViewCell";
+            ShouYeLSPLPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeLSPLPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            
+            return cell;
+        }
+        else if(indexPath.section==2)
+        {
+            static NSString *strcell = @"ShouYeLSKTPGTableViewCell";
+            ShouYeLSKTPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeLSKTPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            
+            return cell;
+        }
+        else if(indexPath.section==3)
+        {
+            static NSString *strcell = @"ShouYeBannerTableViewCell";
+            ShouYeBannerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeBannerTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            
+            return cell;
+        }
+        else if(indexPath.section==4)
+        {
+            static NSString *strcell = @"ShouYeToolsTableViewCell";
+            ShouYeToolsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
+            {
+                cell = [[ShouYeToolsTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
+            }
+            cell.arrdata = self.arrTools;
+            return cell;
+        }
+    }
+    else
+    {
+        if(indexPath.section==0)
+        {
             static NSString *strcell = @"ShouYeZCPPTTableViewCell";
             ShouYeZCPPTTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
             if(!cell)
@@ -201,41 +338,8 @@
             
             return cell;
         }
-        else
+        else if(indexPath.section==1)
         {
-            int shenfen = [UserInfoModel shareModel].identityType.intValue;
-            if (shenfen==2)
-            {
-                static NSString *strcell = @"ShouYeLSZWPGTableViewCell";
-                ShouYeLSZWPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
-                if(!cell)
-                {
-                    cell = [[ShouYeLSZWPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
-                    [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-                    [cell setBackgroundColor:[UIColor clearColor]];
-                }
-                
-                return cell;
-            }
-            else
-            {
-                static NSString *strcell = @"ShouYeZNXZTableViewCell";
-                ShouYeZNXZTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
-                if(!cell)
-                {
-                    cell = [[ShouYeZNXZTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
-                    [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-                    [cell setBackgroundColor:[UIColor clearColor]];
-                }
-                
-                return cell;
-            }
-        }
-    }
-    else if(indexPath.section==1)
-    {
-        if(type==3)
-        {///职场
             static NSString *strcell = @"ShouYeZCXZTableViewCell";
             ShouYeZCXZTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
             if(!cell)
@@ -247,64 +351,33 @@
             
             return cell;
         }
-        else
+        else if(indexPath.section==2)
         {
-            int shenfen = [UserInfoModel shareModel].identityType.intValue;
-            if (shenfen==2)
+            static NSString *strcell = @"ShouYeBannerTableViewCell";
+            ShouYeBannerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
             {
-                static NSString *strcell = @"ShouYeLSKTPGTableViewCell";
-                ShouYeLSKTPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
-                if(!cell)
-                {
-                    cell = [[ShouYeLSKTPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
-                    [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-                    [cell setBackgroundColor:[UIColor clearColor]];
-                }
-                
-                return cell;
+                cell = [[ShouYeBannerTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
             }
-            else
+            
+            return cell;
+        }
+        else if(indexPath.section==3)
+        {
+            static NSString *strcell = @"ShouYeToolsTableViewCell";
+            ShouYeToolsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
+            if(!cell)
             {
-                static NSString *strcell = @"ShouYeXieZuoTableViewCell";
-                ShouYeXieZuoTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
-                if(!cell)
-                {
-                    cell = [[ShouYeXieZuoTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
-                    [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-                    [cell setBackgroundColor:[UIColor clearColor]];
-                }
-                
-                return cell;
+                cell = [[ShouYeToolsTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
+                [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+                [cell setBackgroundColor:[UIColor clearColor]];
             }
+            cell.arrdata = self.arrTools;
+            return cell;
         }
     }
-    else if(indexPath.section==2)
-    {
-        static NSString *strcell = @"ShouYeBannerTableViewCell";
-        ShouYeBannerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
-        if(!cell)
-        {
-            cell = [[ShouYeBannerTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
-            [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-            [cell setBackgroundColor:[UIColor clearColor]];
-        }
-        
-        return cell;
-    }
-    else if(indexPath.section==3)
-    {
-        static NSString *strcell = @"ShouYeToolsTableViewCell";
-        ShouYeToolsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
-        if(!cell)
-        {
-            cell = [[ShouYeToolsTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell];
-            [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
-            [cell setBackgroundColor:[UIColor clearColor]];
-        }
-        cell.arrdata = self.arrTools;
-        
-        return cell;
-    }
     
     static NSString *strcell = @"ShouYeZuoWenTableViewCell";
     ShouYeZuoWenTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
@@ -327,7 +400,7 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
-    if(section==4)
+    if(([UserInfoModel shareModel].identityType.intValue==2 && section==5)||([UserInfoModel shareModel].identityType.intValue!=2 && section==4))
     {///高分作文
         return 45;
     }
@@ -335,7 +408,7 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
 {
-    if(section==4)
+    if(([UserInfoModel shareModel].identityType.intValue==2 && section==5)||([UserInfoModel shareModel].identityType.intValue!=2 && section==4))
     {///高分作文
         return 10;
     }
@@ -343,40 +416,97 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if(indexPath.section==0)
+    int type = [UserInfoModel shareModel].identityType.intValue;
+    if(type==0||type==1)
     {
-        return 140;
-    }
-    else if(indexPath.section==1)
-    {
-        int type = [UserInfoModel shareModel].identityType.intValue;
-        if(type==3)
+        if(indexPath.section==0)
         {
             return 140;
         }
-        return 160;
-    }
-    else if(indexPath.section==2)
-    {
-        return 92;
-    }
-    else if(indexPath.section==3)
-    {
-        /// 没得工具52  有 +86一行 第一行是76；
-        float fheight = 52;
-        NSInteger iline = self.arrTools.count/4;
-        if(self.arrTools.count%4!=0)iline+=1;
-        if(iline>0)
+        else if(indexPath.section==1)
         {
-            fheight+=86*iline-10;
+            return 160;
+        }
+        else if(indexPath.section==2)
+        {
+            return 92;
+        }
+        else if(indexPath.section==3)
+        {
+            /// 没得工具52  有 +86一行 第一行是76；
+            float fheight = 52;
+            NSInteger iline = self.arrTools.count/4;
+            if(self.arrTools.count%4!=0)iline+=1;
+            if(iline>0)
+            {
+                fheight+=86*iline-10;
+            }
+            return fheight;
         }
-        return fheight;
     }
-    return 75;
+    else if (type==2)
+    {
+        if(indexPath.section==0)
+        {
+            return 140;
+        }
+        else if(indexPath.section==1)
+        {
+            return 80;
+        }
+        else if(indexPath.section==2)
+        {
+            return 80;
+        }
+        else if(indexPath.section==3)
+        {
+            return 92;
+        }
+        else if(indexPath.section==4)
+        {
+            /// 没得工具52  有 +86一行 第一行是76；
+            float fheight = 52;
+            NSInteger iline = self.arrTools.count/4;
+            if(self.arrTools.count%4!=0)iline+=1;
+            if(iline>0)
+            {
+                fheight+=86*iline-10;
+            }
+            return fheight;
+        }
+    }
+    else
+    {
+        if(indexPath.section==0)
+        {
+            return 140;
+        }
+        else if(indexPath.section==1)
+        {
+            return 76;
+        }
+        else if(indexPath.section==2)
+        {
+            return 92;
+        }
+        else if(indexPath.section==3)
+        {
+            /// 没得工具52  有 +86一行 第一行是76；
+            float fheight = 52;
+            NSInteger iline = self.arrTools.count/4;
+            if(self.arrTools.count%4!=0)iline+=1;
+            if(iline>0)
+            {
+                fheight+=86*iline-10;
+            }
+            return fheight;
+        }
+    }
+    return 72;
 }
 -(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    if(section==4)
+    if(([UserInfoModel shareModel].identityType.intValue==2 && section==5)||([UserInfoModel shareModel].identityType.intValue!=2 && section==4))
     {///高分作文
         UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 45)];
         [viewback setBackgroundColor:[UIColor whiteColor]];
@@ -418,7 +548,7 @@
 }
 -(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
 {
-    if(section==4)
+    if(([UserInfoModel shareModel].identityType.intValue==2 && section==5)||([UserInfoModel shareModel].identityType.intValue!=2 && section==4))
     {///高分作文
         UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 10)];
         [viewback setBackgroundColor:[UIColor whiteColor]];
@@ -433,7 +563,7 @@
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if(indexPath.section==4)
+    if(([UserInfoModel shareModel].identityType.intValue==2 && indexPath.section==5)||([UserInfoModel shareModel].identityType.intValue!=2 && indexPath.section==4))
     {
         ExampleTextGreatModelDataItems *model = self.arrFanWen[indexPath.row];
         FanWenDetailViewController *vc = [FanWenDetailViewController new];

ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m

@@ -19,41 +19,26 @@
 {
     if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
     {
-        UIView *viewback = [[UIView alloc] init];
-        [self.contentView addSubview:viewback];
-        [viewback mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self);
-        }];
-        
-        UIView *viewpz = [[UIView alloc] init];
-        [viewpz setBackgroundColor:[UIColor whiteColor]];
-        [viewback addSubview:viewpz];
-        [viewpz mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.top.bottom.equalTo(viewback);
+        UIView *viewleft = [[UIView alloc] init];
+        [viewleft setBackgroundColor:RGBCOLOR(231, 232, 254)];
+        [self.contentView addSubview:viewleft];
+        [viewleft mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.offset(0);
+            make.top.bottom.equalTo(self);
             make.width.offset((UISCREEN_WIDTH-42)/2.0);
         }];
-        [self drawPZView:viewpz];
+        [self drawSmillView:viewleft title:@"课堂写作" info:@"提升能力" img:@"sy_ktxzback" tag:0];
         
-        
-        UIView *viewkt = [[UIView alloc] init];
-        [viewkt setBackgroundColor:[UIColor whiteColor]];
-        [viewback addSubview:viewkt];
-        [viewkt mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.equalTo(viewpz.mas_right).offset(10);
-            make.top.right.equalTo(viewback);
-            make.height.offset(75);
+        UIView *viewright = [[UIView alloc] init];
+        [viewright setBackgroundColor:RGBCOLOR(227, 255, 252)];
+        [self.contentView addSubview:viewright];
+        [viewright mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(viewleft.mas_right).offset(10);
+            make.top.bottom.equalTo(self);
+            make.width.offset((UISCREEN_WIDTH-42)/2.0);
         }];
-        [self drawSmillView:viewkt title:@"写作生成" info:@"优秀作家" img:@"home_ls_znxz" tag:1];
+        [self drawSmillView:viewright title:@"拍照写作" info:@"破壁作家" img:@"sy_pzxzback" tag:1];
         
-        
-        UIView *viewpg = [[UIView alloc] init];
-        [viewpg setBackgroundColor:[UIColor whiteColor]];
-        [viewback addSubview:viewpg];
-        [viewpg mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.height.equalTo(viewkt);
-            make.top.equalTo(viewkt.mas_bottom).offset(10);
-        }];
-        [self drawSmillView:viewpg title:@"拍照写作" info:@"破壁作家" img:@"home_ls_pzxz" tag:2];
     }
     return self;
 }
@@ -64,7 +49,6 @@
     [view.layer setCornerRadius:8];
     UIImageView *imgvback = [[UIImageView alloc] init];
     [imgvback setImage:[UIImage imageNamed:img]];
-//    [imgvback setContentMode:UIViewContentModeBottomRight];
     [view addSubview:imgvback];
     [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(view);
@@ -74,18 +58,18 @@
     [lbname setText:title];
     [lbname setTextColor:RGBCOLOR(26, 26, 26)];
     [lbname setTextAlignment:NSTextAlignmentLeft];
-    [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:20]];
+    [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:18]];
     [view addSubview:lbname];
     [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.offset(13);
-        make.top.offset(13);
+        make.left.offset(12);
+        make.top.offset(16);
     }];
     
     UILabel *lbinfo = [[UILabel alloc] init];
     [lbinfo setText:info];
     [lbinfo setTextColor:RGBCOLOR(102, 102, 102)];
     [lbinfo setTextAlignment:NSTextAlignmentLeft];
-    [lbinfo setFont:[UIFont systemFontOfSize:14]];
+    [lbinfo setFont:[UIFont systemFontOfSize:13]];
     [view addSubview:lbinfo];
     [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(lbname);
@@ -99,56 +83,11 @@
     [btaction setTag:tag];
     [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside];
 }
-
--(void)drawPZView:(UIView *)view
-{
-    [view.layer setMasksToBounds:YES];
-    [view.layer setCornerRadius:8];
-    UIImageView *imgvback = [[UIImageView alloc] init];
-    [imgvback setImage:[UIImage imageNamed:@"home_ls_ktpg"]];
-//    [imgvback setContentMode:UIViewContentModeBottomRight];
-    [view addSubview:imgvback];
-    [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(view);
-    }];
-    
-    UILabel *lbname = [[UILabel alloc] init];
-    [lbname setText:@"课堂批改"];
-    [lbname setTextColor:RGBCOLOR(26, 26, 26)];
-    [lbname setTextAlignment:NSTextAlignmentLeft];
-    [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]];
-    [view addSubview:lbname];
-    [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.offset(16);
-        make.top.offset(20);
-    }];
-    
-    UILabel *lbinfo = [[UILabel alloc] init];
-    [lbinfo setText:@"跟随课堂批改作文"];
-    [lbinfo setTextColor:RGBCOLOR(102, 102, 102)];
-    [lbinfo setTextAlignment:NSTextAlignmentLeft];
-    [lbinfo setFont:[UIFont systemFontOfSize:14]];
-    [view addSubview:lbinfo];
-    [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(lbname);
-        make.top.equalTo(lbname.mas_bottom).offset(4);
-    }];
-    UIButton *btaction = [[UIButton alloc] init];
-    [view addSubview:btaction];
-    [btaction mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(view);
-    }];
-    [btaction setTag:0];
-    [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside];
-}
 -(void)btAction:(UIButton *)sender
 {
     switch (sender.tag) {
         case 0:
             {
-//                CamreViewController *vc = [CamreViewController new];
-//                vc.type = 3;
-//                [self.viewController.navigationController pushViewController:vc animated:YES];
                 KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new];
                 [self.viewController.navigationController pushViewController:vc animated:YES];
                 
@@ -158,19 +97,20 @@
             break;
         case 1:
             {
-                ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new];
-                [self.viewController.navigationController pushViewController:vc animated:YES];
-                
-                [UserInfoModel shijianShangBao:0 key:@"client.jump.to.ai.write" value:@"home" extra:@""];
-            }
-            break;
-        case 2:
-            {
+//                ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new];
+//                [self.viewController.navigationController pushViewController:vc animated:YES];
+//                
+//                [UserInfoModel shijianShangBao:0 key:@"client.jump.to.ai.write" value:@"home" extra:@""];
                 CamreViewController *vc = [CamreViewController new];
                 vc.type = 2;
                 [self.viewController.navigationController pushViewController:vc animated:YES];
                 
                 [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"photos_write" extra:@""];
+            }
+            break;
+        case 2:
+            {
+                
                 
             }
             break;

ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSPLPGTableViewCell.h

@@ -0,0 +1,16 @@
+//
+//  ShouYeLSPLPGTableViewCell.h
+//  ProductApp
+//
+//  Created by 工作 on 2024/11/29.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ShouYeLSPLPGTableViewCell : UITableViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END

ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSPLPGTableViewCell.m

@@ -0,0 +1,118 @@
+//
+//  ShouYeLSPLPGTableViewCell.m
+//  ProductApp
+//
+//  Created by 工作 on 2024/11/29.
+//
+
+#import "ShouYeLSPLPGTableViewCell.h"
+#import "PiLiangXiuGaiViewController.h"
+#import "ZhiNengXieZuoViewController.h"
+
+
+@interface ShouYeLSPLPGTableViewCell ()
+
+
+@end
+
+@implementation ShouYeLSPLPGTableViewCell
+
+-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
+    {
+        UIView *viewleft = [[UIView alloc] init];
+        [viewleft setBackgroundColor:RGBCOLOR(231, 232, 254)];
+        [self.contentView addSubview:viewleft];
+        [viewleft mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.offset(0);
+            make.top.bottom.equalTo(self);
+            make.width.offset((UISCREEN_WIDTH-42)/2.0);
+        }];
+        [self drawSmillView:viewleft title:@"批量批改" info:@"智能批量评分" img:@"sy_plpgcellback" tag:0];
+        
+        UIView *viewright = [[UIView alloc] init];
+        [viewright setBackgroundColor:RGBCOLOR(227, 255, 252)];
+        [self.contentView addSubview:viewright];
+        [viewright mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(viewleft.mas_right).offset(10);
+            make.top.bottom.equalTo(self);
+            make.width.offset((UISCREEN_WIDTH-42)/2.0);
+        }];
+        [self drawSmillView:viewright title:@"智能写作" info:@"优秀作家" img:@"sy_znxzback" tag:1];
+        
+    }
+    return self;
+}
+
+-(void)drawSmillView:(UIView *)view title:(NSString *)title info:(NSString *)info img:(NSString *)img tag:(int)tag
+{
+    [view.layer setMasksToBounds:YES];
+    [view.layer setCornerRadius:8];
+    UIImageView *imgvback = [[UIImageView alloc] init];
+    [imgvback setImage:[UIImage imageNamed:img]];
+//    [imgvback setContentMode:UIViewContentModeBottomRight];
+    [view addSubview:imgvback];
+    [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(view);
+    }];
+    
+    UILabel *lbname = [[UILabel alloc] init];
+    [lbname setText:title];
+    [lbname setTextColor:RGBCOLOR(26, 26, 26)];
+    [lbname setTextAlignment:NSTextAlignmentLeft];
+    [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:18]];
+    [view addSubview:lbname];
+    [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.offset(12);
+        make.top.offset(16);
+    }];
+    
+    UILabel *lbinfo = [[UILabel alloc] init];
+    [lbinfo setText:info];
+    [lbinfo setTextColor:RGBCOLOR(102, 102, 102)];
+    [lbinfo setTextAlignment:NSTextAlignmentLeft];
+    [lbinfo setFont:[UIFont systemFontOfSize:13]];
+    [view addSubview:lbinfo];
+    [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(lbname);
+        make.top.equalTo(lbname.mas_bottom).offset(4);
+    }];
+    UIButton *btaction = [[UIButton alloc] init];
+    [view addSubview:btaction];
+    [btaction mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(view);
+    }];
+    [btaction setTag:tag];
+    [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside];
+}
+-(void)btAction:(UIButton *)sender
+{
+    switch (sender.tag) {
+        case 0:
+            {
+                PiLiangXiuGaiViewController *vc = [PiLiangXiuGaiViewController new];
+                [self.viewController.navigationController pushViewController:vc animated:YES];
+                
+            }
+            break;
+        case 1:
+            {
+                ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new];
+                [self.viewController.navigationController pushViewController:vc animated:YES];
+
+                [UserInfoModel shijianShangBao:0 key:@"client.jump.to.ai.write" value:@"home" extra:@""];
+            }
+            break;
+        case 2:
+            {
+                
+                
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+@end

ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m

@@ -38,7 +38,7 @@
         [viewback setImage:[UIImage imageNamed:@"home_ls_zwpg"]];
         
         UILabel *lbname = [[UILabel alloc] init];
-        [lbname setText:@"批量批改"];
+        [lbname setText:@"作文批改"];
         [lbname setTextColor:RGBCOLOR(26, 26, 26)];
         [lbname setTextAlignment:NSTextAlignmentLeft];
         [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]];
@@ -49,7 +49,7 @@
         }];
         
         UILabel *lbinfo = [[UILabel alloc] init];
-        [lbinfo setText:@"自定义拍照批量批改作文"];
+        [lbinfo setText:@"拍照批改快速整理作文优缺点"];
         [lbinfo setTextColor:RGBCOLOR(102, 102, 102)];
         [lbinfo setTextAlignment:NSTextAlignmentLeft];
         [lbinfo setFont:[UIFont systemFontOfSize:14]];
@@ -112,13 +112,13 @@
 
 -(void)nextAction
 {
-    PiLiangXiuGaiViewController *vc = [PiLiangXiuGaiViewController new];
-    [self.viewController.navigationController pushViewController:vc animated:YES];
-//    CamreViewController *vc = [CamreViewController new];
-//    vc.type = 1;
+//    PiLiangXiuGaiViewController *vc = [PiLiangXiuGaiViewController new];
 //    [self.viewController.navigationController pushViewController:vc animated:YES];
-//    
-//    [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"correct" extra:@""];
+    CamreViewController *vc = [CamreViewController new];
+    vc.type = 1;
+    [self.viewController.navigationController pushViewController:vc animated:YES];
+    
+    [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"correct" extra:@""];
 }
 
 @end

ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m

@@ -7,6 +7,8 @@
 
 #import "ShouYeZCXZTableViewCell.h"
 #import "ZhiNengXieZuoViewController.h"
+#import "GongJuCreateViewController.h"
+#import "NetWorkManager.h"
 
 @interface ShouYeZCXZTableViewCell ()
 
@@ -17,89 +19,104 @@
 {
     if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
     {
-        UIImageView *viewback = [[UIImageView alloc] init];
-        [viewback setBackgroundColor:[UIColor whiteColor]];
-        [self.contentView addSubview:viewback];
-        [viewback mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self);
+        UIView *viewleft = [[UIView alloc] init];
+        [viewleft setBackgroundColor:RGBCOLOR(231, 232, 254)];
+        [self.contentView addSubview:viewleft];
+        [viewleft mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.offset(0);
+            make.top.bottom.equalTo(self);
+            make.width.offset((UISCREEN_WIDTH-42)/2.0);
         }];
-        [viewback.layer setMasksToBounds:YES];
-        [viewback.layer setCornerRadius:8];
-        [viewback setImage:[UIImage imageNamed:@"home_znxzback"]];
-        [viewback setUserInteractionEnabled:YES];
+        [self drawSmillView:viewleft title:@"方案策划" info:@"精准策划，共创卓越" img:@"sy_plpgface" tag:0];
         
-        UIImageView *viewback1 = [[UIImageView alloc] init];
-        [self.contentView addSubview:viewback1];
-        [viewback1 mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self);
+        UIView *viewright = [[UIView alloc] init];
+        [viewright setBackgroundColor:RGBCOLOR(227, 255, 252)];
+        [self.contentView addSubview:viewright];
+        [viewright mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(viewleft.mas_right).offset(10);
+            make.top.bottom.equalTo(self);
+            make.width.offset((UISCREEN_WIDTH-42)/2.0);
         }];
-        [viewback1.layer setMasksToBounds:YES];
-        [viewback1.layer setCornerRadius:8];
-        [viewback1 setImage:[UIImage imageNamed:@"home_ppt_znxz_back"]];
-        
-        
-        
-        UILabel *lbname = [[UILabel alloc] init];
-        [lbname setText:@"写作生成"];
-        [lbname setTextColor:RGBCOLOR(26, 26, 26)];
-        [lbname setTextAlignment:NSTextAlignmentLeft];
-        [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]];
-        [viewback addSubview:lbname];
-        [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.offset(29);
-            make.top.offset(20);
-        }];
-        
-        UILabel *lbinfo = [[UILabel alloc] init];
-        [lbinfo setText:@"优秀的虚拟作家"];
-        [lbinfo setTextColor:RGBCOLOR(102, 102, 102)];
-        [lbinfo setTextAlignment:NSTextAlignmentLeft];
-        [lbinfo setFont:[UIFont systemFontOfSize:14]];
-        [viewback addSubview:lbinfo];
-        [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.equalTo(lbname);
-            make.top.equalTo(lbname.mas_bottom).offset(4);
-        }];
-        
-        UIButton *btsy = [[UIButton alloc] init];
-        [btsy setTitle:@"立即使用" forState:UIControlStateNormal];
-        [btsy setTitleColor:RGBCOLOR(27, 123, 103) forState:UIControlStateNormal];
-        [btsy.titleLabel setFont:[UIFont systemFontOfSize:16]];
-        [btsy setBackgroundImage:[UIImage imageNamed:@"home_znxz_bt"] forState:UIControlStateNormal];
-        [viewback addSubview:btsy];
-        [btsy mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.offset(26);
-            make.size.sizeOffset(CGSizeMake(102, 33));
-            make.top.equalTo(lbinfo.mas_bottom).offset(15);
-        }];
-        [btsy setUserInteractionEnabled:NO];
-        
-        UILabel *lbts = [[UILabel alloc] init];
-        [lbts setText:@"100万+正在使用"];
-        [lbts setTextColor:RGBCOLOR(27, 123, 103)];
-        [lbts setTextAlignment:NSTextAlignmentLeft];
-        [lbts setFont:[UIFont systemFontOfSize:14]];
-        [viewback addSubview:lbts];
-        [lbts mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.offset(11);
-            make.right.equalTo(viewback).offset(-18);
-        }];
-        
-        UIButton *btnext = [[UIButton alloc] init];
-        [viewback addSubview:btnext];
-        [btnext mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(viewback);
-        }];
-        [btnext addTarget:self action:@selector(nextAction) forControlEvents:UIControlEventTouchUpInside];
+        [self drawSmillView:viewright title:@"大纲助手" info:@"构思实现，一步到位" img:@"sy_plpgdgzs" tag:1];
     }
     return self;
 }
--(void)nextAction
+-(void)drawSmillView:(UIView *)view title:(NSString *)title info:(NSString *)info img:(NSString *)img tag:(int)tag
 {
-    ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new];
-    [self.viewController.navigationController pushViewController:vc animated:YES];
-    [UserInfoModel shijianShangBao:0 key:@"client.jump.to.ai.write" value:@"home" extra:@""];
+    [view.layer setMasksToBounds:YES];
+    [view.layer setCornerRadius:8];
+    [view.layer setBorderWidth:1];
+    [view.layer setBorderColor:RGBACOLOR(255, 255, 255, 0.8).CGColor];
+    
+    UIImageView *imgvback = [[UIImageView alloc] init];
+    [imgvback setImage:[UIImage imageNamed:img]];
+    [view addSubview:imgvback];
+    [imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.offset(10);
+        make.width.height.offset(30);
+        make.centerY.equalTo(view);
+    }];
+    
+    UILabel *lbname = [[UILabel alloc] init];
+    [lbname setText:title];
+    [lbname setTextColor:RGBCOLOR(26, 26, 26)];
+    [lbname setTextAlignment:NSTextAlignmentLeft];
+    [lbname setFont:[UIFont boldSystemFontOfSize:15]];
+    [view addSubview:lbname];
+    [lbname mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(imgvback.mas_right).offset(8);
+        make.bottom.equalTo(view.mas_centerY).offset(-2);
+    }];
+    
+    UILabel *lbinfo = [[UILabel alloc] init];
+    [lbinfo setText:info];
+    [lbinfo setTextColor:RGBCOLOR(153, 153, 153)];
+    [lbinfo setTextAlignment:NSTextAlignmentLeft];
+    [lbinfo setFont:[UIFont systemFontOfSize:12]];
+    [view addSubview:lbinfo];
+    [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(lbname);
+        make.top.equalTo(lbname.mas_bottom).offset(4);
+    }];
+    UIButton *btaction = [[UIButton alloc] init];
+    [view addSubview:btaction];
+    [btaction mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(view);
+    }];
+    [btaction setTag:tag];
+    [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside];
 }
 
+-(void)btAction:(UIButton *)sender
+{
+    NSArray *arr = @[@"方案策划",@"大纲助手"];
     
+    [self getdata:arr[sender.tag]];
+}
+
+-(void)getdata:(NSString *)name
+{
+    [LoadAlterView show];
+    [NetWorkManager requestToolsSearchData:self page:1 query:name Callback:^(BOOL state, ToolsListModel *responseObject, NSString * _Nullable describle) {
+        [LoadAlterView dismiss];
+        if(state)
+        {
+            if(responseObject.data.items.count>0)
+            {
+                [UserInfoModel shijianShangBao:0 key:@"client.jump.to.write_tools" value:@"home" extra:@""];
+                GongJuCreateViewController *vc = [GongJuCreateViewController new];
+                vc.modelDetail = responseObject.data.items.firstObject;
+                [self.viewController.navigationController pushViewController:vc animated:YES];
+            }
+            else
+            {
+                [HXHud showMessage:@"数据错误，请联系客服" afterDelayType:1];
+            }
+        }
+        else
+        {
+            [HXHud showMessage:responseObject.message afterDelayType:1];
+        }
+    }];
+}
 @end

ProductApp/ProductApp/ProductMain/首页/批量批改/PiLiangXiuGaiViewController.m

@@ -44,6 +44,9 @@
 ///需要移除的数据
 @property (nonatomic , strong) NSString *strremoveid;
 
+///
+@property (nonatomic , strong) NSArray *arrpeizhi;
+
 @end
 
 @implementation PiLiangXiuGaiViewController
@@ -64,6 +67,9 @@
 {
     [super viewDidAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    
+    [self getdataConfig:NO];
+    
 }
 -(void)viewDidDisappear:(BOOL)animated
 {
@@ -140,7 +146,6 @@
     }];
     [self drawBottomView:viewbottom];
     
-    [self getdataConfig];
     
     self.arrDataIDs = [NSMutableArray new];
     self.arrData = [NSMutableArray new];
@@ -216,7 +221,7 @@
     }];
     
     UILabel *lbname = [[UILabel alloc] init];
-    [lbname setText:@"通用批改"];
+    [lbname setText:@"批改设置"];
     [lbname setTextColor:RGBCOLOR(51, 51, 51)];
     [lbname setTextAlignment:NSTextAlignmentLeft];
     [lbname setFont:[UIFont boldSystemFontOfSize:15]];
@@ -268,6 +273,17 @@
 }
 ///添加作文
 -(void)addAction
+{
+    if(self.arrpeizhi.count==0)
+    {
+        [self addNomoPeiZhi];
+    }
+    else
+    {
+        [self pushAdd];
+    }
+}
+-(void)pushAdd
 {
     if([Tools isStringnil:self.strid].length==0)
     {
@@ -288,6 +304,37 @@
     }];
     [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"correct" extra:@""];
 }
+
+-(void)addNomoPeiZhi
+{
+    NSMutableArray *arrsingle_score = [NSMutableArray new];
+    [arrsingle_score addObject:@{@"name":@"主题",@"max":[NSNumber numberWithInt:20]}];
+    [arrsingle_score addObject:@{@"name":@"深度",@"max":[NSNumber numberWithInt:10]}];
+    [arrsingle_score addObject:@{@"name":@"观点",@"max":[NSNumber numberWithInt:10]}];
+    [arrsingle_score addObject:@{@"name":@"逻辑清晰",@"max":[NSNumber numberWithInt:20]}];
+    [arrsingle_score addObject:@{@"name":@"语言运用",@"max":[NSNumber numberWithInt:20]}];
+    [arrsingle_score addObject:@{@"name":@"整体结构",@"max":[NSNumber numberWithInt:20]}];
+    
+    NSMutableDictionary *dicconfig = [NSMutableDictionary new];
+    [dicconfig setObject:arrsingle_score forKey:@"single_score"];
+    
+    NSArray *arrscenes = [[UserInfoModel shareModel].config objectForKey:@"client.batch.correct.scene"];
+    [dicconfig setObject:arrscenes forKey:@"scenes"];
+    
+    [LoadAlterView show];
+    [NetWorkManager requestAddCorrectConfigData:self.view ID:@"" name:@"通用配置" is_default:NO score:@"100" config:dicconfig Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
+        if(state)
+        {
+            [self getdataConfig:YES];
+        }
+        else
+        {
+            [LoadAlterView dismiss];
+            [HXHud showMessage:responseObject.message afterDelayType:1];
+        }
+    }];
+}
+
 ///重新拍照上传
 -(void)updateAddAction
 {
@@ -322,22 +369,69 @@
     [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"correct" extra:@""];
 }
 
--(void)getdataConfig
+-(void)getdataConfig:(BOOL)ispush
 {
-    [LoadAlterView show];
+    if(ispush==NO)
+    {
+        [LoadAlterView show];
+    }
     [NetWorkManager requestCorrectConfigData:self.view page:@"1" Callback:^(BOOL state, CorrectConfigModel *responseObject, NSString * _Nullable describle) {
         [LoadAlterView dismiss];
         
         if(state)
         {
-            for(CorrectConfigModelDataItem *model in responseObject.data.items)
+            
+            self.arrpeizhi = responseObject.data.items;
+            
+            if([Tools isStringnil:self.strid].length>0)
             {
-                if(model.is_default)
+                CorrectConfigModelDataItem *modeltemp = nil;
+                if(responseObject.data.items.count>0)
                 {
-                    self.lbzd.text = model.name;
-                    self.strid = model.ID;
-                    break;
+                    for(CorrectConfigModelDataItem *model in responseObject.data.items)
+                    {
+                        if(model.is_default)
+                        {
+                            modeltemp = model;
+                            break;
+                        }
+                    }
                 }
+                for(CorrectConfigModelDataItem *model in responseObject.data.items)
+                {
+                    if([model.ID isEqualToString:self.strid])
+                    {
+                        modeltemp = model;
+                        break;
+                    }
+                }
+                
+                if(modeltemp)
+                {
+                    self.lbzd.text = modeltemp.name;
+                    self.strid = modeltemp.ID;
+                }
+                else
+                {
+                    self.lbzd.text = @"自定义";
+                    self.strid = @"";
+                }
+            }
+            else
+            {
+                for(CorrectConfigModelDataItem *model in responseObject.data.items)
+                {
+                    if(model.is_default)
+                    {
+                        self.lbzd.text = model.name;
+                        self.strid = model.ID;
+                        break;
+                    }
+                }
+            }
+            if(ispush)
+            {
+                [self pushAdd];
             }
         }
         else

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

@@ -265,7 +265,7 @@
     }];
     [btyinxiao setIconInLeftWithSpacing:4];
     [btyinxiao addTarget:self action:@selector(yinxiaoAction:) forControlEvents:UIControlEventTouchUpInside];
-    if([[[NSUserDefaults standardUserDefaults] objectForKey:yingxiaoSave] intValue ]== 0)
+    if([[[NSUserDefaults standardUserDefaults] objectForKey:yingxiaoSave] intValue ]== 1)
     {
         [btyinxiao setSelected:YES];
     }
@@ -288,7 +288,7 @@
     }];
     [btjiaoyan setIconInLeftWithSpacing:4];
     [btjiaoyan addTarget:self action:@selector(jiaoyanAction:) forControlEvents:UIControlEventTouchUpInside];
-    if([[[NSUserDefaults standardUserDefaults] objectForKey:jiaoyanSave] intValue ]== 0)
+    if([[[NSUserDefaults standardUserDefaults] objectForKey:jiaoyanSave] intValue ]== 1)
     {
         [btjiaoyan setSelected:YES];
     }
@@ -404,7 +404,7 @@
                 return;
             }
             
-            if([[[NSUserDefaults standardUserDefaults] objectForKey:jiaoyanSave] intValue] == 0)
+            if([[[NSUserDefaults standardUserDefaults] objectForKey:jiaoyanSave] intValue] == 1)
             {///去校验图片
                 [self.session stopRunning];
                 ImageEditDrawViewController *vc = [ImageEditDrawViewController new];
@@ -519,7 +519,14 @@
         } success:^(UIImage *image, HXPhotoModel *model, NSDictionary *info) {
             // 获取成功
             
-            [self.arrData addObject:image];
+            UIImage *imagetemp = image;
+            NSData *dataimage = UIImageJPEGRepresentation(imagetemp, 0.5) ;
+            if(dataimage==nil)
+            {
+                dataimage = UIImagePNGRepresentation(imagetemp);
+            }
+            [self.arrData addObject:[UIImage imageWithData:dataimage]];
+//            [self.arrData addObject:image];
             self.viewImages.arrdata = self.arrData;
             [self.btnumber setTitle:[NSString stringWithFormat:@"%ld",self.arrData.count] forState:UIControlStateNormal];
             [self.btnumber setHidden:NO];
@@ -702,7 +709,7 @@
 }
 -(void)playAudio
 {
-    if([[[NSUserDefaults standardUserDefaults] objectForKey:yingxiaoSave] intValue]==1)
+    if([[[NSUserDefaults standardUserDefaults] objectForKey:yingxiaoSave] intValue]==0)
     {
         AVAudioSession *audioSession = [AVAudioSession sharedInstance];
         [audioSession setCategory:AVAudioSessionCategoryRecord error:nil];