Skip to content

Commit 38de9dd

Browse files
author
jordanqin
committed
update qcloud sdk to 1.5.66
1 parent c81fe67 commit 38de9dd

File tree

8 files changed

+126
-9
lines changed

8 files changed

+126
-9
lines changed

QCloudFoundation/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
/build
88
/captures
99
.externalNativeBuild
10-
*.gradle
1110
quicdemo/src
1211
quicdemo

QCloudFoundation/.idea/gradle.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

QCloudFoundation/.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

QCloudFoundation/.idea/misc.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

QCloudFoundation/build.gradle

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
3+
buildscript {
4+
repositories {
5+
jcenter()
6+
maven {
7+
url 'https://maven.google.com'
8+
}
9+
mavenLocal()
10+
mavenCentral()
11+
jcenter()
12+
google()
13+
}
14+
dependencies {
15+
classpath 'com.android.tools.build:gradle:4.1.0'
16+
classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
17+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
18+
19+
// NOTE: Do not place your application dependencies here; they belong
20+
// in the individual module build.gradle files
21+
}
22+
}
23+
24+
allprojects {
25+
repositories {
26+
jcenter()
27+
mavenLocal()
28+
mavenCentral()
29+
jcenter()
30+
google()
31+
}
32+
}
33+
34+
task clean(type: Delete) {
35+
delete rootProject.buildDir
36+
}

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpConfiguration.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@
2222

2323
package com.tencent.qcloud.core.http;
2424

25-
import android.util.Log;
26-
2725
import com.tencent.qcloud.core.logger.QCloudLogger;
2826

2927
import java.text.ParseException;
3028
import java.text.SimpleDateFormat;
3129
import java.util.Date;
3230
import java.util.Locale;
3331
import java.util.TimeZone;
34-
import java.util.concurrent.atomic.AtomicInteger;
3532
import java.util.concurrent.atomic.AtomicLong;
3633

3734
public class HttpConfiguration {
@@ -62,8 +59,10 @@ public static void calculateGlobalTimeOffset(String sDate, Date deviceDate, int
6259
}
6360

6461
public static long getDeviceTimeWithOffset() {
65-
long current = System.currentTimeMillis() / 1000 + GLOBAL_TIME_OFFSET.get();
66-
return current;
62+
// long current = System.currentTimeMillis() / 1000 + GLOBAL_TIME_OFFSET.get();
63+
// return current;
64+
// 去掉本地时间校准(有一些Tencent Server返回的date并不准确)
65+
return System.currentTimeMillis() / 1000;
6766
}
6867

6968
public static String getGMTDate(Date date) {
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
apply plugin: 'com.android.library'
2+
3+
android {
4+
compileSdkVersion 33
5+
6+
defaultConfig {
7+
minSdkVersion 19
8+
targetSdkVersion 33
9+
10+
versionCode 10002
11+
versionName "1.0.2"
12+
13+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
14+
consumerProguardFiles "consumer-rules.pro"
15+
16+
multiDexEnabled true
17+
}
18+
buildTypes {
19+
debug {
20+
it.buildConfigField 'String', 'CLS_SECRET_ID', quotWrapper(System.getenv("CLS_SECRET_ID"))
21+
it.buildConfigField 'String', 'CLS_SECRET_KEY', quotWrapper(System.getenv("CLS_SECRET_KEY"))
22+
}
23+
release {
24+
minifyEnabled false
25+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
26+
}
27+
}
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_1_8
30+
targetCompatibility JavaVersion.VERSION_1_8
31+
}
32+
}
33+
34+
dependencies {
35+
testImplementation 'junit:junit:4.13.2'
36+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
37+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
38+
androidTestImplementation "androidx.test:rules:1.5.0"
39+
androidTestImplementation 'androidx.core:core:1.6.0'
40+
androidTestImplementation "androidx.test:runner:1.5.2"
41+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
42+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
43+
44+
androidTestCompileOnly project(path: ':qcloud-track')
45+
androidTestImplementation 'com.tencentcloudapi.cls:tencentcloud-cls-sdk-android:1.0.5'
46+
androidTestImplementation 'com.google.guava:guava:27.0.1-android'
47+
48+
compileOnly 'com.tencentcloudapi.cls:tencentcloud-cls-sdk-android:1.0.5'
49+
// implementation 'com.tencentcloudapi.cls:cls-network-diagnosis-reporter-android:1.0.5'
50+
compileOnly 'com.google.guava:guava:27.0.1-android'
51+
52+
compileOnly files(
53+
'libs/beacon-android-release-4.2.86.7-hf1-official.aar',
54+
'libs/qimei-1.2.18.3.aar',
55+
'libs/qimei-core-1.2.18.3-normal.aar',
56+
'libs/qmsp-oaid2-1.0.4.aar'
57+
)
58+
}
59+
60+
project.extensions.add('artifactId', 'qcloud-track')
61+
project.extensions.add('artifactDesc', 'the track for tencent cloud sdk')
62+
project.extensions.add('archiveFilePath', 'outputs/aar/qcloud-track-release.aar')
63+
64+
65+
apply from: '../../publishMavenCentral.gradle'
66+
67+
static String quotWrapper(key) {
68+
if (key == null) {
69+
return "\"\""
70+
}
71+
return "\"".concat(key).concat("\"")
72+
}

QCloudFoundation/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include ':foundation', ':quic'
2+
include ':qcloud-track'

0 commit comments

Comments
 (0)