Skip to content

Commit 1c6414e

Browse files
author
garenwang
committed
fix:一些修改
1 parent a0a45dd commit 1c6414e

File tree

6 files changed

+131
-23
lines changed

6 files changed

+131
-23
lines changed

QCloudCOSXML/Classes/CI/model/QCloudAudioAsrqueueResult.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
@class QCloudAudioAsrqueueQueueListItem;
1111
@class QCloudAudioAsrqueueNotifyConfig;
12+
@class QCloudAudioAsrqueueResultNonExistPIDs;
1213
NS_ASSUME_NONNULL_BEGIN
1314

1415
@interface QCloudAudioAsrqueueResult : NSObject
@@ -28,8 +29,19 @@ NS_ASSUME_NONNULL_BEGIN
2829
/// 队列数组
2930
@property (nonatomic,strong)NSArray <QCloudAudioAsrqueueQueueListItem *> *QueueList;
3031

32+
/// 队列 ID
33+
@property (nonatomic,strong)QCloudAudioAsrqueueResultNonExistPIDs * NonExistPIDs;
34+
3135
@end
3236

37+
38+
/// 不存在的队列 ID 列表
39+
@interface QCloudAudioAsrqueueResultNonExistPIDs : NSObject
40+
41+
@property (nonatomic,strong)NSString *QueueID;
42+
@end
43+
44+
3345
@interface QCloudAudioAsrqueueQueueListItem : NSObject
3446

3547
/// 队列 ID

QCloudCOSXML/Classes/CI/model/QCloudAudioAsrqueueResult.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
@implementation QCloudAudioAsrqueueResult
1111
+ (NSDictionary *)modelContainerPropertyGenericClass {
1212
return @{
13-
@"QueueList": [QCloudAudioAsrqueueQueueListItem class]
13+
@"QueueList": [QCloudAudioAsrqueueQueueListItem class],
14+
@"NonExistPIDs": [QCloudAudioAsrqueueResultNonExistPIDs class]
1415
};
1516
}
1617

@@ -28,6 +29,9 @@ - (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dic {
2829

2930
@end
3031

32+
@implementation QCloudAudioAsrqueueResultNonExistPIDs
33+
@end
34+
3135
@implementation QCloudAudioAsrqueueQueueListItem
3236
+ (NSDictionary *)modelContainerPropertyGenericClass {
3337
return @{

QCloudCOSXML/Classes/CI/model/QCloudGetAudioDiscernTaskResult.h

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#import <Foundation/Foundation.h>
99
#import "QCloudPostAudioDiscernTaskInfo.h"
10-
@class QCloudGetAudioDiscernTaskSpeechRecognitionResult;
1110
NS_ASSUME_NONNULL_BEGIN
1211

1312
@interface QCloudGetAudioDiscernTaskResult : NSObject
@@ -19,18 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
1918
@property (nonatomic,strong)NSString *NonExistJobIds;
2019

2120
/// 在 job 的类型为 SpeechRecognition 且 job 状态为 success 时,返回语音识别的识别结果详情。
22-
@property (nonatomic,strong)QCloudGetAudioDiscernTaskSpeechRecognitionResult *SpeechRecognitionResult;
23-
@end
24-
25-
26-
@interface QCloudGetAudioDiscernTaskSpeechRecognitionResult : NSObject
27-
/// 识别结果
28-
@property (nonatomic,strong)NSString *Result;
29-
/// Response.SpeechRecognition.ResultDetail 识别结果详情,包含每个句子中的词时间偏移,一般用于生成字幕的场景。(识别请求中ResTextFormat=1时该字段不为空)
30-
/// 注意:此字段可能返回 null,表示取不到有效值。
31-
@property (nonatomic,strong)NSString *ResultDetail;
32-
/// 语音时长
33-
@property (nonatomic,assign)CGFloat AudioTime;
21+
@property (nonatomic,strong)QCloudPostAudioDiscernTaskInfoSpeechRecognitionResult *SpeechRecognitionResult;
3422
@end
3523

3624

QCloudCOSXML/Classes/CI/model/QCloudGetAudioDiscernTaskResult.m

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,9 @@ @implementation QCloudGetAudioDiscernTaskResult
1212
+ (NSDictionary *)modelContainerPropertyGenericClass {
1313
return @{
1414
@"JobsDetail": [QCloudPostAudioDiscernTaskJobsDetail class],
15-
@"SpeechRecognitionResult": [QCloudGetAudioDiscernTaskSpeechRecognitionResult class],
15+
@"SpeechRecognitionResult": [QCloudPostAudioDiscernTaskInfoSpeechRecognitionResult class],
1616
};
1717
}
18-
@end
19-
20-
21-
@implementation QCloudGetAudioDiscernTaskSpeechRecognitionResult
22-
23-
24-
2518
@end
2619

2720
@implementation QCloudBatchGetAudioDiscernTaskResult

QCloudCOSXML/Classes/CI/model/QCloudPostAudioDiscernTaskInfo.h

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
@class QCloudPostAudioDiscernTaskJobsOperation;
1818

1919
@class QCloudPostAudioDiscernTaskResultInput;
20+
@class QCloudPostAudioDiscernTaskInfoSpeechRecognitionResult;
21+
22+
@class QCloudPostAudioDiscernTaskInfoSpeechWords;
23+
@class QCloudPostAudioDiscernTaskInfoSpeechResultDetail;
2024
NS_ASSUME_NONNULL_BEGIN
2125

2226
@interface QCloudPostAudioDiscernTaskInfo : NSObject
@@ -124,6 +128,9 @@ NS_ASSUME_NONNULL_BEGIN
124128

125129
@property (nonatomic,strong)NSString *EndTime;
126130

131+
132+
@property (nonatomic,strong)NSString *StartTime;
133+
127134
/// 任务所属的队列 ID
128135
@property (nonatomic,strong)NSString *QueueId;
129136

@@ -156,6 +163,63 @@ NS_ASSUME_NONNULL_BEGIN
156163
@property (nonatomic,strong)QCloudPostAudioDiscernTaskInfoOutput *Output;
157164

158165
@property (nonatomic,strong)QCloudPostAudioDiscernTaskInfoSpeechRecognition *SpeechRecognition;
166+
167+
@property (nonatomic,strong)QCloudPostAudioDiscernTaskInfoSpeechRecognitionResult *SpeechRecognitionResult;
168+
@end
169+
170+
@interface QCloudPostAudioDiscernTaskInfoSpeechRecognitionResult : NSObject
171+
172+
/// 语音时长
173+
@property (nonatomic,strong)NSString *AudioTime;
174+
175+
/// 识别结果
176+
@property (nonatomic,strong)NSString *Result;
177+
178+
/// 结果详情
179+
@property (nonatomic,strong)NSArray <QCloudPostAudioDiscernTaskInfoSpeechResultDetail *> *ResultDetail;
159180
@end
160181

182+
@interface QCloudPostAudioDiscernTaskInfoSpeechResultDetail : NSObject
183+
184+
/// 单句结束时间(毫秒)
185+
@property (nonatomic,strong)NSString * EndMs;
186+
187+
/// 单句最终识别结果
188+
@property (nonatomic,strong)NSString * FinalSentence;
189+
190+
/// 单句中间识别结果,使用空格拆分为多个词
191+
@property (nonatomic,strong)NSString * SliceSentence;
192+
193+
/// 声道或说话人 Id(请求中如果设置了 speaker_diarization或者ChannelNum为双声道,可区分说话人或声道)
194+
@property (nonatomic,strong)NSString * SpeakerId;
195+
196+
/// 单句语速,单位:字数/秒
197+
@property (nonatomic,strong)NSString * SpeechSpeed;
198+
199+
/// 单句开始时间(毫秒)
200+
@property (nonatomic,strong)NSString * StartMs;
201+
202+
/// 单句中词详情
203+
@property (nonatomic,strong)NSArray <QCloudPostAudioDiscernTaskInfoSpeechWords *> * Words;
204+
205+
/// 单句中词个数
206+
@property (nonatomic,strong)NSString * WordsNum;
207+
@end
208+
209+
@interface QCloudPostAudioDiscernTaskInfoSpeechWords : NSObject
210+
211+
212+
/// 在句子中的结束时间偏移量
213+
@property (nonatomic,strong)NSString * OffsetEndMs;
214+
215+
/// 在句子中的开始时间偏移量
216+
@property (nonatomic,strong)NSString * OffsetStartMs;
217+
@property (nonatomic,strong)NSString * VoiceType;
218+
219+
/// 词文本
220+
@property (nonatomic,strong)NSString * Word;
221+
222+
@end
223+
224+
161225
NS_ASSUME_NONNULL_END

QCloudCOSXML/Classes/CI/model/QCloudPostAudioDiscernTaskInfo.m

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ @implementation QCloudPostAudioDiscernTaskJobsOperation
7575
+ (NSDictionary *)modelContainerPropertyGenericClass {
7676
return @{
7777
@"Output": [QCloudPostAudioDiscernTaskInfoOutput class],
78-
@"SpeechRecognition":[QCloudPostAudioDiscernTaskInfoSpeechRecognition class]
78+
@"SpeechRecognition":[QCloudPostAudioDiscernTaskInfoSpeechRecognition class],
79+
@"SpeechRecognitionResult":[QCloudPostAudioDiscernTaskInfoSpeechRecognitionResult class]
7980
};
8081
}
8182

@@ -84,3 +85,49 @@ + (NSDictionary *)modelContainerPropertyGenericClass {
8485
@implementation QCloudPostAudioDiscernTaskResultInput
8586

8687
@end
88+
89+
@implementation QCloudPostAudioDiscernTaskInfoSpeechRecognitionResult
90+
+ (NSDictionary *)modelContainerPropertyGenericClass {
91+
return @{
92+
@"ResultDetail": [QCloudPostAudioDiscernTaskInfoSpeechResultDetail class]
93+
};
94+
}
95+
96+
- (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dic {
97+
if (!dic) {
98+
return dic;
99+
}
100+
101+
NSMutableDictionary * mdic = [NSMutableDictionary dictionaryWithDictionary:dic];
102+
if ([mdic[@"ResultDetail"] isKindOfClass:[NSDictionary class]]) {
103+
[mdic setValue:@[mdic[@"ResultDetail"]] forKey:@"ResultDetail"];
104+
}
105+
return mdic.mutableCopy;
106+
}
107+
@end
108+
109+
110+
@implementation QCloudPostAudioDiscernTaskInfoSpeechResultDetail
111+
+ (NSDictionary *)modelContainerPropertyGenericClass {
112+
return @{
113+
@"Words": [QCloudPostAudioDiscernTaskInfoSpeechWords class]
114+
};
115+
}
116+
117+
- (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dic {
118+
if (!dic) {
119+
return dic;
120+
}
121+
122+
NSMutableDictionary * mdic = [NSMutableDictionary dictionaryWithDictionary:dic];
123+
if ([mdic[@"Words"] isKindOfClass:[NSDictionary class]]) {
124+
[mdic setValue:@[mdic[@"Words"]] forKey:@"Words"];
125+
}
126+
return mdic.mutableCopy;
127+
}
128+
@end
129+
130+
@implementation QCloudPostAudioDiscernTaskInfoSpeechWords
131+
132+
@end
133+

0 commit comments

Comments
 (0)