BUG1

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

@@ -36,98 +36,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F33A2D73-E914-4309-8C86-1BC4FA3BA81D"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "338"
-            endingLineNumber = "338"
-            landmarkName = "-bottomAction:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "F33A2D73-E914-4309-8C86-1BC4FA3BA81D - f0b70fbf7c1b29"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[CamreViewController bottomAction:]"
-                  moduleName = "ProductApp"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "338"
-                  endingLineNumber = "338">
-               </Location>
-               <Location
-                  uuid = "F33A2D73-E914-4309-8C86-1BC4FA3BA81D - 318eb1806ca6068f"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__36-[CamreViewController bottomAction:]_block_invoke"
-                  moduleName = "ProductApp"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "339"
-                  endingLineNumber = "339">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "24246768-FB4F-4C9A-9FAF-51A9F99C84C5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "363"
-            endingLineNumber = "363"
-            landmarkName = "-bottomAction:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "24246768-FB4F-4C9A-9FAF-51A9F99C84C5 - f0b70fbf7c1fe0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[CamreViewController bottomAction:]"
-                  moduleName = "ProductApp"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "363"
-                  endingLineNumber = "363">
-               </Location>
-               <Location
-                  uuid = "24246768-FB4F-4C9A-9FAF-51A9F99C84C5 - a82b2db259f82353"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__36-[CamreViewController bottomAction:]_block_invoke_2"
-                  moduleName = "ProductApp"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "364"
-                  endingLineNumber = "364">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -147,32 +55,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "C2315BAF-37C0-44A6-BB89-CA3A65C178F7"
+            uuid = "3256B2D9-FB36-4C77-B166-F3F35875544A"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
+            filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x8bfe;&#x5802;&#x5199;&#x4f5c;/&#x6279;&#x6539;&#x4fe1;&#x606f;/StartKTXZPGDetailViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "354"
+            startingLineNumber = "63"
-            endingLineNumber = "354"
+            endingLineNumber = "63"
-            landmarkName = "-bottomAction:"
+            landmarkName = "-viewDidLoad"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3E79A7F2-E55C-4BDB-A68C-0689167DA248"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x626b;&#x63cf;&#x8bc6;&#x522b;&#x9875;&#x9762;/view/StartKTXZPGView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "269"
-            endingLineNumber = "269"
-            landmarkName = "-createJiLu"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

ProductApp/ProductApp/AppDelegate.m

@@ -27,6 +27,8 @@
 #import <UMCommonLog/UMCommonLogHeaders.h>
 #import <UMLink/UMLink.h>
 
+#import "LoginViewController.h"
+
 @interface AppDelegate ()<WXApiDelegate,MobClickLinkDelegate,GeTuiSdkDelegate>
 
 @end
@@ -48,10 +50,21 @@
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.backgroundColor = [UIColor whiteColor];
     
-    [self.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[StartViewController new]]];
     [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:HomeToosRef];
+    [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:DengluZhangHaoTanChuang];
+    
     [UserInfoModel setAiChatIsDrawing:0];
 
+    if([UserInfoModel shareModel].loginState.intValue == -1)
+    {
+        [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserInfoModelToken];
+        [self.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
+    }
+    else
+    {
+        [self.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[StartViewController new]]];
+    }
+    
     
     
     [self.window makeKeyAndVisible];

ProductApp/ProductApp/BaseControl/TabBar/BaseViewController.m

@@ -185,22 +185,24 @@ static int tabnavHeight;
 
 -(void)tanLoginChuan
 {
-    if([UserInfoModel shareModel].temp.intValue == 1 && ([UserInfoModel shareModel].vip.intValue == 2||[UserInfoModel shareModel].vip.intValue == 3||[UserInfoModel shareModel].vip.intValue == 11 || [UserInfoModel shareModel].vip.intValue == 12))
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-    {
+        if([UserInfoModel shareModel].temp.intValue == 1 && ([UserInfoModel shareModel].vip.intValue == 2||[UserInfoModel shareModel].vip.intValue == 3||[UserInfoModel shareModel].vip.intValue == 11 || [UserInfoModel shareModel].vip.intValue == 12))
-        AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
+        {
+            AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
 
-        [UserInfoModel shijianShangBao:0 key:@"client.member.force.login" value:@"" extra:@""];
+            [UserInfoModel shijianShangBao:0 key:@"client.member.force.login" value:@"" extra:@""];
             
-        [GuiZheAlterView showInfo:@"系统检测到您目前尚未登录，\n但您已成为我们尊贵的会员。\n为了防止您的会员账号丢失，\n建议您立即前往登录。" title:@"温馨提示" bttitle:@"立即前往" superview:appde.window backAction:^{
+            [GuiZheAlterView showInfo:@"系统检测到您目前尚未登录，\n但您已成为我们尊贵的会员。\n为了防止您的会员账号丢失，\n建议您立即前往登录。" title:@"温馨提示" bttitle:@"立即前往" superview:appde.window backAction:^{
                 
-            dispatch_async(dispatch_get_main_queue(), ^{
+                dispatch_async(dispatch_get_main_queue(), ^{
-                AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
+                    AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
-                [appde.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
+                    [appde.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
                     
-                [GuiZheAlterView dismisView];
+                    [GuiZheAlterView dismisView];
-            });
+                });
-        }];
+            }];
-    }
+        }
+    });
 }
 
 #pragma mark - lary

ProductApp/ProductApp/ProductMain/AIChart/view/AIChatBottomView.m

@@ -10,6 +10,7 @@
 #import "FSTextView.h"
 #import "AIChatYuYinView.h"
 #import "ChatRoomTipsModel.h"
+#import "NetWorkManager.h"
 
 @interface AIChatBottomView ()<UICollectionViewDelegate,UICollectionViewDataSource>
 ///
@@ -162,7 +163,7 @@
     [view setBackValue:^(AIChatModel * _Nonnull value) {
        if(self.backValue)
        {
-           self.backValue(value);
+           [self juegeModel:value];
        }
     }];
     _viewYy = view;
@@ -250,17 +251,37 @@
         return;
     }
     [self endEditing:YES];
+    
     AIChatModel *modeltemp = [AIChatModel new];
     modeltemp.text = self.viewtext.text;
     modeltemp.ismy = YES;
     modeltemp.isnetwork = YES;
-    if(self.backValue)
+    
-    {
+    [self juegeModel:modeltemp];
-        self.backValue(modeltemp);
+    
-    }
-    self.viewtext.text = @"";
 }
 
+-(void)juegeModel:(AIChatModel *)model
+{
+    [LoadAlterView show];
+    [NetWorkManager requestChatCheckData:self content:model.text Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
+        if(state)
+        {
+            if(self.backValue)
+            {
+                self.backValue(model);
+            }
+            self.viewtext.text = @"";
+        }
+        else
+        {
+            [HXHud showMessage:responseObject.message afterDelayType:1];
+            [LoadAlterView dismiss];
+        }
+    }];
+}
+
+
 -(void)setArrdata:(NSArray *)arrdata
 {
     _arrdata = arrdata;

ProductApp/ProductApp/ProductMain/AIChart/view/AIChatYuYinView.m

@@ -169,6 +169,8 @@
 }
 -(void)okAction
 {
+    NSString *strtemp = [self.strshibie stringByReplacingOccurrencesOfString:@" " withString:@""];
+    if(strtemp.length==0)return;
     NSString *strfile = [[AudioRecored manager] stopAudio];
     AIChatModel *model = [AIChatModel new];
     model.ismy = YES;

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

@@ -8,6 +8,8 @@
 #import "BaseViewController.h"
 #import "ExampleCorrectList.h"
 #import "CorrectSaveDetailModel.h"
+#import "WriteCorrectScoreModel.h"
+#import "CorrectWriteCorrectModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface StartZWPIDetailViewController : BaseViewController
@@ -16,10 +18,18 @@ NS_ASSUME_NONNULL_BEGIN
 ///引导页数据-作文批改
 @property (nonatomic , strong) ExampleCorrectListDataItems *modelDetailZWPG;
 
+///////正式的数据
 ///批改的图片
 @property (nonatomic , strong) NSArray *arrXZImages;
 ///
 @property (nonatomic , strong) NSString *strID;
+///评分
+@property (nonatomic , strong) WriteCorrectScoreModelData *modelPF;
+///句子数据
+@property (nonatomic , strong) CorrectWriteCorrectModelData *modelContentItems;
+
+///////////
+
 
 ///批改历史
 @property (nonatomic , strong) CorrectSaveDetailModelData *modelHestory;

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

@@ -63,59 +63,71 @@
     view.arrXZImages = self.arrXZImages;
     view.strID = self.strID;
     self.viewShow = view;
-    if(self.arrXZImages.count>0)
-    {
-        [LoadAlterView show];
-        __block int loadcount = 0;
-        [NetWorkManager requestCorrectWrite_correct_scoreData:self.view ID:self.strID Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
-            loadcount++;
-            if(state)
-            {
-                view.modelPF = responseObject.data;
-            }
-            else
-            {
-                [HXHud showMessage:responseObject.message afterDelayType:1];
-            }
-            if(loadcount>=3)
-            {
-                [LoadAlterView dismiss];
-            }
-        }];
     
-        [NetWorkManager requestCorrectWrite_correctData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
+    view.modelPF = self.modelPF;
-            loadcount++;
+    view.modelContentItems = self.modelContentItems;
-            if(state)
-            {
-                view.modelContentItems = responseObject.data;
-            }
-            else
-            {
-                [HXHud showMessage:responseObject.message afterDelayType:1];
-            }
-            if(loadcount>=3)
-            {
-                [LoadAlterView dismiss];
-            }
-        }];
     
-        ///可以不请求
+    
-        [NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
+//    /*
-            loadcount++;
+//     ///评分
-            if(state)
+//     @property (nonatomic , strong) WriteCorrectScoreModelData *modelPF;
-            {
+//     ///句子数据
-                view.arrErrorLocation = responseObject.data;
+//     @property (nonatomic , strong) CorrectWriteCorrectModelData *modelContentItems;
-            }
+//     */
-            else
+//    
-            {
+//    if(self.arrXZImages.count>0)
-                [HXHud showMessage:responseObject.message afterDelayType:1];
+//    {
-            }
+//        [LoadAlterView show];
-            if(loadcount>=3)
+//        __block int loadcount = 0;
-            {
+//        [NetWorkManager requestCorrectWrite_correct_scoreData:self.view ID:self.strID Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
-                [LoadAlterView dismiss];
+//            loadcount++;
-            }
+//            if(state)
-        }];
+//            {
-    }
+//                view.modelPF = responseObject.data;
+//            }
+//            else
+//            {
+//                [HXHud showMessage:responseObject.message afterDelayType:1];
+//            }
+//            if(loadcount>=3)
+//            {
+//                [LoadAlterView dismiss];
+//            }
+//        }];
+//        
+//        [NetWorkManager requestCorrectWrite_correctData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
+//            loadcount++;
+//            if(state)
+//            {
+//                view.modelContentItems = responseObject.data;
+//            }
+//            else
+//            {
+//                [HXHud showMessage:responseObject.message afterDelayType:1];
+//            }
+//            if(loadcount>=3)
+//            {
+//                [LoadAlterView dismiss];
+//            }
+//        }];
+//        
+//        ///可以不请求
+//        [NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
+//            loadcount++;
+//            if(state)
+//            {
+//                view.arrErrorLocation = responseObject.data;
+//            }
+//            else
+//            {
+//                [HXHud showMessage:responseObject.message afterDelayType:1];
+//            }
+//            if(loadcount>=3)
+//            {
+//                [LoadAlterView dismiss];
+//            }
+//        }];
+//    }
 }
 
 -(void)getQuanXian

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

@@ -34,6 +34,12 @@
 ///
 @property (nonatomic , strong) NSString *strID;
 
+///评分
+@property (nonatomic , strong) WriteCorrectScoreModelData *modelPF;
+///句子数据
+@property (nonatomic , strong) CorrectWriteCorrectModelData *modelContentItems;
+
+@property (nonatomic , assign) BOOL isback;
 @end
 
 @implementation StartKTXZPGView
@@ -156,7 +162,7 @@
     ///真实数据
     if(self.arrXZImages.count>0)
     {
-        if(self.strID.length==0 && fvalue>=0.98)
+        if(self.modelPF==nil || self.modelContentItems==nil)
         {
             fvalue = 0.98;
         }
@@ -256,6 +262,7 @@
 }
 -(void)createJiLu
 {
+    ///0课堂写作 1作文批改
     if(self.type==1||self.type==0)
     {
         NSString *sse_type = @"2";
@@ -267,10 +274,11 @@
             if(state)
             {
                 self.strID = responseObject.data.ID;
+                [self getDetailInfoData];
             }
             else
             {
-                [HXHud showMessage:responseObject.message afterDelayType:1];
+                [HXHud showMessage:@"请上传清晰的图片" afterDelayType:1];
                 [self.viewController.navigationController popViewControllerAnimated:YES];
             }
         }];
@@ -284,16 +292,99 @@
             }
             else
             {
-                [HXHud showMessage:responseObject.message afterDelayType:1];
+                [HXHud showMessage:@"请上传清晰的图片" afterDelayType:1];
                 [self.viewController.navigationController popViewControllerAnimated:YES];
             }
         }];
     }
-    
-    
-    
-    
 }
+
+-(void)getDetailInfoData
+{
+    ///0课堂写作 1作文批改
+    if(self.type==0)
+    {
+        if([Tools isStringnil:self.textbook_id].length>0)
+        {
+            [NetWorkManager requestCorrectClassroom_correct_scoreData:self ID:self.strID textbook_id:self.textbook_id Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
+                if(state)
+                {
+                    self.modelPF = responseObject.data;
+                }
+                else
+                {
+                    [HXHud showMessage:@"请上传清晰的图片" afterDelayType:1];
+                    [self errorBack];
+                }
+            }];
+        }
+        else
+        {
+            [NetWorkManager requestCorrectWrite_correct_scoreData:self ID:self.strID Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
+                if(state)
+                {
+                    self.modelPF = responseObject.data;
+                }
+                else
+                {
+                    [HXHud showMessage:@"请上传清晰的图片" afterDelayType:1];
+                    [self errorBack];
+                }
+            }];
+        }
+        
+        [NetWorkManager requestCorrectWrite_correctData:self ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
+            if(state)
+            {
+                self.modelContentItems = responseObject.data;
+            }
+            else
+            {
+                [HXHud showMessage:@"请上传清晰的图片" afterDelayType:1];
+                [self errorBack];
+            }
+        }];
+    }
+    else if(self.type==1)
+    {
+        [NetWorkManager requestCorrectWrite_correct_scoreData:self ID:self.strID Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
+            if(state)
+            {
+                self.modelPF = responseObject.data;
+            }
+            else
+            {
+                [HXHud showMessage:@"请上传清晰的图片" afterDelayType:1];
+                [self errorBack];
+            }
+        }];
+        
+        [NetWorkManager requestCorrectWrite_correctData:self ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
+
+            if(state)
+            {
+                self.modelContentItems = responseObject.data;
+            }
+            else
+            {
+                [HXHud showMessage:@"请上传清晰的图片" afterDelayType:1];
+                [self errorBack];
+            }
+        }];
+    }
+}
+
+-(void)errorBack
+{
+    if(!self.isback)
+    {
+        self.isback = YES;
+        [self.timer invalidate];
+        self.timer = nil;
+        [self removeFromSuperview];
+    }
+}
+
 -(void)getJiLu:(NSString *)ID
 {
     [NetWorkManager requestPicAiResultData:self ID:ID Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
@@ -322,6 +413,8 @@
                 vc.strID = self.strID;
                 vc.arrXZImages = self.arrXZImages;
                 vc.isquanxian = self.isquanxian;
+                vc.modelPF = self.modelPF;
+                vc.modelContentItems = self.modelContentItems;
                 [self.viewController.navigationController pushViewController:vc animated:YES];
             }
             break;
@@ -333,6 +426,8 @@
                 vc.strID = self.strID;
                 vc.arrXZImages = self.arrXZImages;
                 vc.isquanxian = self.isquanxian;
+                vc.modelPF = self.modelPF;
+                vc.modelContentItems = self.modelContentItems;
                 [self.viewController.navigationController pushViewController:vc animated:YES];
             }
             break;

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

@@ -7,6 +7,9 @@
 
 #import "BaseViewController.h"
 #import "TextbookInfoModel.h"
+#import "WriteCorrectScoreModel.h"
+#import "CorrectWriteCorrectModel.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface StartKTXZPGDetailViewController : BaseViewController
@@ -22,6 +25,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic , strong) NSString *textbook_id;
 ///
 @property (nonatomic , strong) NSString *strID;
+///评分
+@property (nonatomic , strong) WriteCorrectScoreModelData *modelPF;
+///句子数据
+@property (nonatomic , strong) CorrectWriteCorrectModelData *modelContentItems;
+
 
 ///是否有权限
 @property (nonatomic , assign) BOOL isquanxian;

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

@@ -58,81 +58,93 @@
     _viewShow = view;
     view.arrXZImages = self.arrXZImages;
     view.strID = self.strID;
-    if(self.arrXZImages.count>0)
-    {
-        [LoadAlterView show];
-        __block int loadcount = 0;
-        if([Tools isStringnil:self.textbook_id].length>0)
-        {
-            [NetWorkManager requestCorrectClassroom_correct_scoreData:self.view ID:self.strID textbook_id:self.textbook_id Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
-                loadcount++;
-                if(state)
-                {
-                    view.modelPF = responseObject.data;
-                }
-                else
-                {
-                    [HXHud showMessage:responseObject.message afterDelayType:1];
-                }
-                if(loadcount>=3)
-                {
-                    [LoadAlterView dismiss];
-                }
-            }];
-        }
-        else
-        {
-            [NetWorkManager requestCorrectWrite_correct_scoreData:self.view ID:self.strID Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
-                loadcount++;
-                if(state)
-                {
-                    view.modelPF = responseObject.data;
-                }
-                else
-                {
-                    [HXHud showMessage:responseObject.message afterDelayType:1];
-                }
-                if(loadcount>=3)
-                {
-                    [LoadAlterView dismiss];
-                }
-            }];
-        }
     
-        [NetWorkManager requestCorrectWrite_correctData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
+    view.modelPF = self.modelPF;
-            loadcount++;
+    view.modelContentItems = self.modelContentItems;
-            if(state)
-            {
-                view.modelContentItems = responseObject.data;
-            }
-            else
-            {
-                [HXHud showMessage:responseObject.message afterDelayType:1];
-            }
-            if(loadcount>=3)
-            {
-                [LoadAlterView dismiss];
-            }
-        }];
     
-        ///可以不请求
+//    /*
-        [NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
+//     ///评分
-            loadcount++;
+//     @property (nonatomic , strong) WriteCorrectScoreModelData *modelPF;
-            if(state)
+//     ///句子数据
-            {
+//     @property (nonatomic , strong) CorrectWriteCorrectModelData *modelContentItems;
-                view.arrErrorLocation = responseObject.data;
+//     
-            }
+//     */
-            else
+//    
-            {
+//    if(self.arrXZImages.count>0)
-                [HXHud showMessage:responseObject.message afterDelayType:1];
+//    {
-            }
+//        [LoadAlterView show];
-            if(loadcount>=3)
+//        __block int loadcount = 0;
-            {
+//        if([Tools isStringnil:self.textbook_id].length>0)
-                [LoadAlterView dismiss];
+//        {
-            }
+//            [NetWorkManager requestCorrectClassroom_correct_scoreData:self.view ID:self.strID textbook_id:self.textbook_id Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
-        }];
+//                loadcount++;
-        
+//                if(state)
-    }
+//                {
+//                    view.modelPF = responseObject.data;
+//                }
+//                else
+//                {
+//                    [HXHud showMessage:responseObject.message afterDelayType:1];
+//                }
+//                if(loadcount>=3)
+//                {
+//                    [LoadAlterView dismiss];
+//                }
+//            }];
+//        }
+//        else
+//        {
+//            [NetWorkManager requestCorrectWrite_correct_scoreData:self.view ID:self.strID Callback:^(BOOL state, WriteCorrectScoreModel *responseObject, NSString * _Nullable describle) {
+//                loadcount++;
+//                if(state)
+//                {
+//                    view.modelPF = responseObject.data;
+//                }
+//                else
+//                {
+//                    [HXHud showMessage:responseObject.message afterDelayType:1];
+//                }
+//                if(loadcount>=3)
+//                {
+//                    [LoadAlterView dismiss];
+//                }
+//            }];
+//        }
+//        
+//        [NetWorkManager requestCorrectWrite_correctData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
+//            loadcount++;
+//            if(state)
+//            {
+//                view.modelContentItems = responseObject.data;
+//            }
+//            else
+//            {
+//                [HXHud showMessage:responseObject.message afterDelayType:1];
+//            }
+//            if(loadcount>=3)
+//            {
+//                [LoadAlterView dismiss];
+//            }
+//        }];
+//        
+//        ///可以不请求
+//        [NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
+//            loadcount++;
+//            if(state)
+//            {
+//                view.arrErrorLocation = responseObject.data;
+//            }
+//            else
+//            {
+//                [HXHud showMessage:responseObject.message afterDelayType:1];
+//            }
+//            if(loadcount>=3)
+//            {
+//                [LoadAlterView dismiss];
+//            }
+//        }];
+//        
+//    }
 }
 -(void)getQuanXian
 {

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

@@ -450,6 +450,7 @@
 }
 -(void)getdata
 {
+    [LoadAlterView show];
     [self nomoData];
     
     NSMutableDictionary *dicpush = [NSMutableDictionary new];

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

@@ -473,9 +473,30 @@
         {
             self.arrTools = responseObject.data.items;
             [self.tableView reloadData];
+            if(responseObject.data.items.count==0)
+            {
+                [self pushCollectInit];
+            }
         }
     }];
 }
+-(void)pushCollectInit
+{
+    [NetWorkManager requestToolsFavInitData:self.view Callback:^(BOOL state, id  _Nullable responseObject, NSString * _Nullable describle) {
+        if(state)
+        {
+            [NetWorkManager requestToolsFavData:self.view page:1 size:@"100" Callback:^(BOOL state, ToolsListModel *responseObject, NSString * _Nullable describle) {
+                [self.tableView.mj_header endRefreshing];
+                if(state)
+                {
+                    self.arrTools = responseObject.data.items;
+                    [self.tableView reloadData];
+                }
+            }];
+        }
+    }];
+}
+
 -(void)getFanWen
 {
     if([UserInfoModel shareModel].identityType.intValue==3)return;
@@ -494,6 +515,7 @@
     }];
 }
 
+
 -(void)updateBtShow
 {
     if([UserInfoModel shareModel].identityType.intValue==3)