Skip to content

Commit 86b2bf5

Browse files
author
jordanqin
committed
update qcloud sdk to 5.9.2
1 parent dbba904 commit 86b2bf5

25 files changed

+2114
-9
lines changed

‎QCloudCosXml/cos-android/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,16 @@ fataar {
106106
}
107107

108108
dependencies {
109-
110109
compileOnly 'androidx.appcompat:appcompat:1.2.0'
111110
testCompileOnly 'junit:junit:4.13'
112111

113112
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
114113
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
115114
androidTestImplementation 'com.android.support.test:rules:1.0.2'
116115

116+
androidTestCompileOnly project(path: ':cos-android')
117+
androidTestCompileOnly project(path: ':cos-android-base')
118+
117119
// if (compileQuic() && false) {
118120
// api project(path: ':quic')
119121
// }

‎QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/TestConst.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ public class TestConst {
4444
public static final String AUDIT_BUCKET_DOCUMENT = "03_路由.pdf";
4545
public static final String AUDIT_WEBPAGE = "https://tech.meituan.com/2021/06/10/react-native-hybrid-practice-dsl-in-meituan.html";
4646

47+
//声音识别
48+
public static final String ASR_BUCKET_REGION = "ap-guangzhou";
49+
public static final String ASR_BUCKET = "ci-auditing-sample-1253960454";
50+
public static final String ASR_OBJECT_FF_1C = "asr/ff-16b-1c-44100hz.aac";
51+
public static final String ASR_OBJECT_FF_2C = "asr/ff-16b-2c-44100hz.aac";
52+
public static final String ASR_OBJECT_GS_1C = "asr/gs-16b-1c-8000hz.amr";
53+
public static final String ASR_OBJECT_GS_2C = "asr/gs-16b-2c-44100hz.aac";
54+
public static final String ASR_OBJECT_LONG = "asr/aaa.m4a";
55+
public static final String ASR_OBJECT_OUTPUT = "asr/output.txt";
56+
public static final String ASR_QUEUE_ID = "p74b5265ab1df455782b7b355007d0dfc";
57+
4758

4859
public static final long PERSIST_BUCKET_SMALL_OBJECT_SIZE = 1024 * 1024;
4960
public static final long PERSIST_BUCKET_BIG_OBJECT_SIZE = 10 * 1024 * 1024;

‎QCloudCosXml/cos-android/src/androidTestNormal/java/com/tencent/cos/xml/ci/CosXmlCITest.java‎

Lines changed: 224 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@
2727
import com.tencent.cos.xml.model.ci.QRCodeUploadResult;
2828
import com.tencent.cos.xml.model.ci.SensitiveContentRecognitionRequest;
2929
import com.tencent.cos.xml.model.ci.SensitiveContentRecognitionResult;
30+
import com.tencent.cos.xml.model.ci.asr.CreateSpeechJobsRequest;
31+
import com.tencent.cos.xml.model.ci.asr.CreateSpeechJobsResult;
32+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechJobRequest;
33+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechJobResult;
34+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechJobsRequest;
35+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechJobsResult;
36+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechBucketsRequest;
37+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechBucketsResult;
38+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechQueuesRequest;
39+
import com.tencent.cos.xml.model.ci.asr.DescribeSpeechQueuesResult;
3040
import com.tencent.cos.xml.model.ci.audit.GetAudioAuditRequest;
3141
import com.tencent.cos.xml.model.ci.audit.GetAudioAuditResult;
3242
import com.tencent.cos.xml.model.ci.audit.GetDocumentAuditRequest;
@@ -150,10 +160,8 @@ public void getDescribeMediaBuckets() {
150160
request.setPageSize(10);
151161
try {
152162
GetDescribeMediaBucketsResult result = ciService.getDescribeMediaBuckets(request);
153-
TestUtils.parseBadResponseBody(result);
154-
Assert.assertNotNull(result.printResult());
155163
Assert.assertNotNull(result.describeMediaBucketsResult);
156-
Assert.assertTrue(true);
164+
TestUtils.printXML(result.describeMediaBucketsResult);
157165
} catch (CosXmlClientException e) {
158166
Assert.fail(TestUtils.getCosExceptionMessage(e));
159167
} catch (CosXmlServiceException e) {
@@ -173,10 +181,8 @@ public void getDescribeMediaBucketsAsync() {
173181
@Override
174182
public void onSuccess(CosXmlRequest request, CosXmlResult cosResult) {
175183
GetDescribeMediaBucketsResult result = (GetDescribeMediaBucketsResult) cosResult;
176-
TestUtils.parseBadResponseBody(result);
177-
Assert.assertNotNull(result.printResult());
178184
Assert.assertNotNull(result.describeMediaBucketsResult);
179-
Assert.assertTrue(true);
185+
TestUtils.printXML(result.describeMediaBucketsResult);
180186
locker.release();
181187
}
182188

@@ -586,4 +592,216 @@ public void onFail(CosXmlRequest request, @Nullable CosXmlClientException client
586592
});
587593
testLocker.lock();
588594
}
595+
596+
@Test
597+
public void describeSpeechBuckets() {
598+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
599+
DescribeSpeechBucketsRequest request = new DescribeSpeechBucketsRequest();
600+
request.setPageNumber(1);
601+
request.setPageSize(10);
602+
request.setRegions("All");
603+
try {
604+
DescribeSpeechBucketsResult result = ciService.describeSpeechBuckets(request);
605+
Assert.assertNotNull(result.describeSpeechBucketsResponse);
606+
TestUtils.printXML(result.describeSpeechBucketsResponse);
607+
} catch (CosXmlClientException e) {
608+
Assert.fail(TestUtils.getCosExceptionMessage(e));
609+
} catch (CosXmlServiceException e) {
610+
Assert.fail(TestUtils.getCosExceptionMessage(e));
611+
}
612+
}
613+
614+
@Test
615+
public void describeSpeechBucketsAsync() {
616+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
617+
final TestLocker locker = new TestLocker();
618+
DescribeSpeechBucketsRequest request = new DescribeSpeechBucketsRequest();
619+
request.setPageNumber(1);
620+
request.setPageSize(10);
621+
request.setRegions("All");
622+
ciService.describeSpeechBucketsAsync(request, new CosXmlResultListener() {
623+
@Override
624+
public void onSuccess(CosXmlRequest request, CosXmlResult cosResult) {
625+
DescribeSpeechBucketsResult result = (DescribeSpeechBucketsResult) cosResult;
626+
Assert.assertNotNull(result.describeSpeechBucketsResponse);
627+
TestUtils.printXML(result.describeSpeechBucketsResponse);
628+
locker.release();
629+
}
630+
631+
@Override
632+
public void onFail(CosXmlRequest request, CosXmlClientException clientException, CosXmlServiceException serviceException) {
633+
Assert.fail(TestUtils.getCosExceptionMessage(clientException, serviceException));
634+
locker.release();
635+
}
636+
});
637+
locker.lock();
638+
}
639+
640+
@Test
641+
public void describeSpeechQueues() {
642+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
643+
DescribeSpeechQueuesRequest request = new DescribeSpeechQueuesRequest(TestConst.ASR_BUCKET);
644+
request.setPageNumber(1);
645+
request.setPageSize(10);
646+
request.setState("Active");
647+
try {
648+
DescribeSpeechQueuesResult result = ciService.describeSpeechQueues(request);
649+
Assert.assertNotNull(result.describeSpeechQueuesResponse);
650+
TestUtils.printXML(result.describeSpeechQueuesResponse);
651+
} catch (CosXmlClientException e) {
652+
Assert.fail(TestUtils.getCosExceptionMessage(e));
653+
} catch (CosXmlServiceException e) {
654+
Assert.fail(TestUtils.getCosExceptionMessage(e));
655+
}
656+
}
657+
658+
@Test
659+
public void describeSpeechQueuesAsync() {
660+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
661+
final TestLocker locker = new TestLocker();
662+
DescribeSpeechQueuesRequest request = new DescribeSpeechQueuesRequest(TestConst.ASR_BUCKET);
663+
request.setQueueIds(TestConst.ASR_QUEUE_ID+",ashjdaosdhjiasodj12312"+",ashjdaosdasdashjiasodj12312");
664+
ciService.describeSpeechQueuesAsync(request, new CosXmlResultListener() {
665+
@Override
666+
public void onSuccess(CosXmlRequest request, CosXmlResult cosResult) {
667+
DescribeSpeechQueuesResult result = (DescribeSpeechQueuesResult) cosResult;
668+
Assert.assertNotNull(result.describeSpeechQueuesResponse);
669+
TestUtils.printXML(result.describeSpeechQueuesResponse);
670+
locker.release();
671+
}
672+
673+
@Override
674+
public void onFail(CosXmlRequest request, CosXmlClientException clientException, CosXmlServiceException serviceException) {
675+
Assert.fail(TestUtils.getCosExceptionMessage(clientException, serviceException));
676+
locker.release();
677+
}
678+
});
679+
locker.lock();
680+
}
681+
682+
@Test
683+
public void createSpeechJobs() {
684+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
685+
CreateSpeechJobsRequest request = new CreateSpeechJobsRequest(TestConst.ASR_BUCKET);
686+
request.setInputObject(TestConst.ASR_OBJECT_LONG);
687+
request.setQueueId(TestConst.ASR_QUEUE_ID);
688+
request.setOutput(TestConst.ASR_BUCKET_REGION, TestConst.ASR_BUCKET, TestConst.ASR_OBJECT_OUTPUT);
689+
request.setEngineModelType("8k_zh");
690+
request.setChannelNum(1);
691+
request.setResTextFormat(1);
692+
try {
693+
CreateSpeechJobsResult result = ciService.createSpeechJobs(request);
694+
Assert.assertNotNull(result.createSpeechJobsResponse);
695+
TestUtils.printXML(result.createSpeechJobsResponse);
696+
} catch (CosXmlClientException e) {
697+
Assert.fail(TestUtils.getCosExceptionMessage(e));
698+
} catch (CosXmlServiceException e) {
699+
Assert.fail(TestUtils.getCosExceptionMessage(e));
700+
}
701+
}
702+
703+
@Test
704+
public void createSpeechJobsAsync() {
705+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
706+
final TestLocker locker = new TestLocker();
707+
CreateSpeechJobsRequest request = new CreateSpeechJobsRequest(TestConst.ASR_BUCKET);
708+
request.setInputObject(TestConst.ASR_OBJECT_GS_2C);
709+
request.setQueueId(TestConst.ASR_QUEUE_ID);
710+
request.setOutput(TestConst.ASR_BUCKET_REGION, TestConst.ASR_BUCKET, TestConst.ASR_OBJECT_OUTPUT);
711+
request.setEngineModelType("8k_zh");
712+
request.setChannelNum(2);
713+
request.setResTextFormat(0);
714+
ciService.createSpeechJobsAsync(request, new CosXmlResultListener() {
715+
@Override
716+
public void onSuccess(CosXmlRequest request, CosXmlResult cosResult) {
717+
CreateSpeechJobsResult result = (CreateSpeechJobsResult) cosResult;
718+
Assert.assertNotNull(result.createSpeechJobsResponse);
719+
TestUtils.printXML(result.createSpeechJobsResponse);
720+
locker.release();
721+
}
722+
723+
@Override
724+
public void onFail(CosXmlRequest request, CosXmlClientException clientException, CosXmlServiceException serviceException) {
725+
Assert.fail(TestUtils.getCosExceptionMessage(clientException, serviceException));
726+
locker.release();
727+
}
728+
});
729+
locker.lock();
730+
}
731+
732+
@Test
733+
public void describeSpeechJob() {
734+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
735+
DescribeSpeechJobRequest request = new DescribeSpeechJobRequest(TestConst.ASR_BUCKET, "s987956140cd811edb12f43ad9e15c4e2");
736+
try {
737+
DescribeSpeechJobResult result = ciService.describeSpeechJob(request);
738+
Assert.assertNotNull(result.describeSpeechJobResponse);
739+
TestUtils.printXML(result.describeSpeechJobResponse);
740+
} catch (CosXmlClientException e) {
741+
Assert.fail(TestUtils.getCosExceptionMessage(e));
742+
} catch (CosXmlServiceException e) {
743+
Assert.fail(TestUtils.getCosExceptionMessage(e));
744+
}
745+
}
746+
747+
@Test
748+
public void describeSpeechJobAsync() {
749+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
750+
final TestLocker locker = new TestLocker();
751+
DescribeSpeechJobRequest request = new DescribeSpeechJobRequest(TestConst.ASR_BUCKET, "s3841e6aa0cbd11ed923405b602cab698");
752+
ciService.describeSpeechJobAsync(request, new CosXmlResultListener() {
753+
@Override
754+
public void onSuccess(CosXmlRequest request, CosXmlResult cosResult) {
755+
DescribeSpeechJobResult result = (DescribeSpeechJobResult) cosResult;
756+
Assert.assertNotNull(result.describeSpeechJobResponse);
757+
TestUtils.printXML(result.describeSpeechJobResponse);
758+
locker.release();
759+
}
760+
761+
@Override
762+
public void onFail(CosXmlRequest request, CosXmlClientException clientException, CosXmlServiceException serviceException) {
763+
Assert.fail(TestUtils.getCosExceptionMessage(clientException, serviceException));
764+
locker.release();
765+
}
766+
});
767+
locker.lock();
768+
}
769+
770+
@Test
771+
public void DescribeSpeechJobs() {
772+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
773+
DescribeSpeechJobsRequest request = new DescribeSpeechJobsRequest(TestConst.ASR_BUCKET, TestConst.ASR_QUEUE_ID);
774+
try {
775+
DescribeSpeechJobsResult result = ciService.describeSpeechJobs(request);
776+
Assert.assertNotNull(result.describeSpeechJobsResponse);
777+
TestUtils.printXML(result.describeSpeechJobsResponse);
778+
} catch (CosXmlClientException e) {
779+
Assert.fail(TestUtils.getCosExceptionMessage(e));
780+
} catch (CosXmlServiceException e) {
781+
Assert.fail(TestUtils.getCosExceptionMessage(e));
782+
}
783+
}
784+
785+
@Test
786+
public void DescribeSpeechJobsAsync() {
787+
CIService ciService = NormalServiceFactory.INSTANCE.newCIService();
788+
final TestLocker locker = new TestLocker();
789+
DescribeSpeechJobsRequest request = new DescribeSpeechJobsRequest(TestConst.ASR_BUCKET, TestConst.ASR_QUEUE_ID);
790+
ciService.describeSpeechJobsAsync(request, new CosXmlResultListener() {
791+
@Override
792+
public void onSuccess(CosXmlRequest request, CosXmlResult cosResult) {
793+
DescribeSpeechJobsResult result = (DescribeSpeechJobsResult) cosResult;
794+
Assert.assertNotNull(result.describeSpeechJobsResponse);
795+
TestUtils.printXML(result.describeSpeechJobsResponse);
796+
locker.release();
797+
}
798+
799+
@Override
800+
public void onFail(CosXmlRequest request, CosXmlClientException clientException, CosXmlServiceException serviceException) {
801+
Assert.fail(TestUtils.getCosExceptionMessage(clientException, serviceException));
802+
locker.release();
803+
}
804+
});
805+
locker.lock();
806+
}
589807
}

0 commit comments

Comments
 (0)