irext/examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
strawmanbobi
2025-10-19 20:37:16 +08:00
parent 7d729b4ba4 903d9bb796
commit 089fa5a3a4
30 changed files with 191 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android-example/web-api/build.gradle
View File

@@ -3,10 +3,10 @@ apply plugin: 'com.android.library'
android {
signingConfigs {
}
compileSdkVersion 33
compileSdk 36
defaultConfig {
minSdkVersion 19
targetSdkVersion 33
minSdkVersion 26
targetSdkVersion 36
}
buildTypes {
release {
@@ -20,7 +20,7 @@ android {
}
dependencies {
api files('libs/gson-2.8.0.jar')
api files('libs/okhttp-3.7.0.jar')
api files('libs/okio-1.12.0.jar')
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.squareup.okio:okio:3.4.0'
implementation 'com.google.code.gson:gson:2.13.2'
}

3
android-example/web-api/src/main/java/net/irext/webapi/WebAPIs.java
View File

@@ -43,7 +43,7 @@ public class WebAPIs {
// download bin from OSS
private static final String IR_BIN_FILE_PREFIX = "irda_";
private static final String IR_BIN_FILE_SUFFIX = ".bin";
private static final String IR_BIN_DOWNLOAD_PREFIX = "http://irext-debug.oss-cn-hangzhou.aliyuncs.com/";
private static final String IR_BIN_DOWNLOAD_PREFIX = "https://irext-release.oss-cn-hangzhou.aliyuncs.com/";
private static final String SERVICE_SIGN_IN = "/app/app_login";
private static final String SERVICE_LIST_CATEGORIES = "/indexing/list_categories";
@@ -81,6 +81,7 @@ public class WebAPIs {
}
private InputStream getFileByteStreamByURL(String url) throws IOException {
Log.d(TAG, "download remote binary file, url = " + url);
Request request = new Request.Builder()
.url(url)
.get()