Merge remote-tracking branch 'origin/dev' into dev

Author: linyuchen

src/ntqqapi/api/file.ts

@@ -269,7 +269,7 @@ export class NTQQFileApi extends Service {
       [
         fileSetId,
         sceneType,
-        { 'isIncludeCompressInnerFiles': false },
+        { isIncludeCompressInnerFiles: false },
       ],
     )
     if (res.result !== 0) {
@@ -296,9 +296,9 @@ export class NTQQFileApi extends Service {
           reqInfos: [
             {
               count: 18,
-              paginationInfo: {},
-              parentId: "",
-              reqIndexPath: "",
+              paginationInfo: new Uint8Array(),
+              parentId: '',
+              reqIndexPath: '',
               reqDepth: 1,
               filterCondition: {
                 fileCategory: 0,

src/ntqqapi/services/NodeIKernelFlashTransferService.ts

@@ -3,7 +3,7 @@ import { GeneralCallResult } from '@/ntqqapi/services/common'
 import { FlashFileListItem, FlashFileSetInfo } from '@/ntqqapi/types/flashfile'
 
 export interface NodeIKernelFlashTransferService {
-  createFlashTransferUploadTask(timestamp: string, params: {
+  createFlashTransferUploadTask(seq: number, createParam: {
     scene: number,  // 1
     name: string,
     uploaders: Array<{
@@ -33,23 +33,47 @@ export interface NodeIKernelFlashTransferService {
     }
   }
 
-  startFileSetDownload(sceneType: number, fileSetId: string): GeneralCallResult
+  startFileSetDownload(fileSetId: string, sceneType: number, option: { isIncludeCompressInnerFiles: boolean }): GeneralCallResult
 
-  getFileList(fileSetId: string): {
+  getFileList(req: {
+    seq: number
+    fileSetId: string
+    isUseCache: boolean
+    sceneType: number
+    reqInfos: {
+      count: number
+      paginationInfo: Uint8Array
+      parentId: string
+      reqIndexPath: string
+      reqDepth: number
+      filterCondition: {
+        fileCategory: number
+        filterType: number
+      },
+      sortConditions: { sortField: number, sortOrder: number }[]
+      isNeedPhysicalInfoReady: boolean
+    }[]
+  }): {
     rsp: {
       seq: number,
       result: number,
       errMs: string,
       fileLists:
-        FlashFileListItem[]
+      FlashFileListItem[]
     }
   }
 
   getFileSetIdByCode(code: string): GeneralCallResult & {
     fileSetId: string
   }
 
-  getFileSet(fileSetId: string): GeneralCallResult & {
+  getFileSet(req: {
+    seq: number
+    fileSetId: string
+    isUseCache: boolean
+    isNoReqSvr: boolean
+    sceneType: number
+  }): GeneralCallResult & {
     fileSet: FlashFileSetInfo
   }
 }

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -66,7 +66,11 @@ export interface NodeIKernelGroupService {
     }
   }>
 
-  kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise<void>
+  kickMember(groupCode: string, kickUids: string[], refuseForever: boolean, kickReason: string): Promise<{
+    errCode: number
+    errMsg: string
+    resultList: { uid: string, result: number }[]
+  }>
 
   modifyMemberRole(groupCode: string, uid: string, role: GroupMemberRole): void