Explorar el Código

modify:添加兼容成检的任务列表处理

runming56 hace 1 año
padre
commit
d9ebf20197

BIN
.vs/lqnet/FileContentIndex/d05a9e7b-9426-4c92-b009-8ae5137854b2.vsidx


BIN
.vs/lqnet/FileContentIndex/d4385618-9deb-43ca-8282-0c015fb024a8.vsidx


BIN
.vs/lqnet/v17/.suo


+ 18 - 2
lqnet/Forms/MainForm.cs

@@ -152,8 +152,24 @@ namespace lqnet.Forms
             });
             if (r.Code == MyConstants.CODE_SUCCESS_200)
             {
-                TaskPage page = JsonConvert.DeserializeObject<TaskPage>(r.Data.ToString());
-                TaskToList c = JsonConvert.DeserializeObject<TaskToList>("{\"ListTask\":" + page.Records.ToString() + "}");
+                TaskPage page = null;
+                TaskToList c = null;
+                try
+                {
+                    page = JsonConvert.DeserializeObject<TaskPage>(r.Data.ToString());
+                    c = JsonConvert.DeserializeObject<TaskToList>("{\"ListTask\":" + page.Records.ToString() + "}");
+                } catch
+                {
+                    page = new TaskPage()
+                    {
+                        Pages = 1,
+                        Records = r.Data,
+                        Current = 1
+                    };
+                    c = JsonConvert.DeserializeObject<TaskToList>("{\"ListTask\":" + r.Data.ToString() + "}");
+                    page.Size = c.ListTask.Count;
+                    page.Total = c.ListTask.Count;
+                }
 
                 this.taskListBindingSource.Clear();
                 if (null == c.ListTask || c.ListTask.Count == 0)

+ 0 - 3
lqnet/Forms/MainForm.resx

@@ -123,7 +123,4 @@
   <metadata name="taskListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>731, 17</value>
   </metadata>
-  <metadata name="taskListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>731, 17</value>
-  </metadata>
 </root>

BIN
lqnet/bin/Debug/app.publish/lqnet.exe


+ 1 - 1
lqnet/bin/Debug/lqnet.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>4sKQOrCKAKt0kMzC4RcCysxYI/lkmfCYtCwE2pZOxsg=</dsig:DigestValue>
+        <dsig:DigestValue>FYurituw26rvptZIhftBJpWbEXjpDjg2tXw4/WI9b+k=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
lqnet/bin/Debug/lqnet.exe


+ 1 - 1
lqnet/bin/Debug/lqnet.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>Ccf/HEzkHHK8KpFf51GZ0otXdo2b5vyMVNLNIjRs3gc=</dsig:DigestValue>
+        <dsig:DigestValue>WsHGzuSYFuiTfeiUQUuY5KxyZ8qcKjB8z4TmXAiLKhc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
lqnet/bin/Debug/lqnet.pdb


BIN
lqnet/obj/Debug/DesignTimeResolveAssemblyReferences.cache


BIN
lqnet/obj/Debug/Lqnet.csproj.GenerateResource.cache


+ 1 - 1
lqnet/obj/Debug/lqnet.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>4sKQOrCKAKt0kMzC4RcCysxYI/lkmfCYtCwE2pZOxsg=</dsig:DigestValue>
+        <dsig:DigestValue>FYurituw26rvptZIhftBJpWbEXjpDjg2tXw4/WI9b+k=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
lqnet/obj/Debug/lqnet.exe


+ 1 - 1
lqnet/obj/Debug/lqnet.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>Ccf/HEzkHHK8KpFf51GZ0otXdo2b5vyMVNLNIjRs3gc=</dsig:DigestValue>
+        <dsig:DigestValue>WsHGzuSYFuiTfeiUQUuY5KxyZ8qcKjB8z4TmXAiLKhc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
lqnet/obj/Debug/lqnet.pdb