diff --git a/android-example/app/build.gradle b/android-example/app/build.gradle index 5172b09..611e5aa 100644 --- a/android-example/app/build.gradle +++ b/android-example/app/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 28 - buildToolsVersion '28.0.3' defaultConfig { applicationId "net.irext.ircontrol" minSdkVersion 19 @@ -27,6 +26,7 @@ android { } productFlavors { } + namespace 'net.irext.ircontrol' } dependencies { diff --git a/android-example/app/src/main/AndroidManifest.xml b/android-example/app/src/main/AndroidManifest.xml index f5d4d6b..6e5b411 100644 --- a/android-example/app/src/main/AndroidManifest.xml +++ b/android-example/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ +> @@ -15,6 +15,7 @@ android:icon="@mipmap/ir_logo" android:label="@string/app_name" android:supportsRtl="true" + android:networkSecurityConfig="@xml/network_security_config" android:theme="@android:style/Theme.Holo.Light.DarkActionBar"> + + + irext-debug.oss-cn-hangzhou.aliyuncs.com + + \ No newline at end of file diff --git a/android-example/build.gradle b/android-example/build.gradle index d73672e..2e2d29d 100644 --- a/android-example/build.gradle +++ b/android-example/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/android-example/decodesdk/build.gradle b/android-example/decodesdk/build.gradle index d431073..85c4077 100644 --- a/android-example/decodesdk/build.gradle +++ b/android-example/decodesdk/build.gradle @@ -6,8 +6,6 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 28 - versionCode 1 - versionName "1.0" } buildTypes { release { @@ -15,6 +13,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'net.irext.sdk' } dependencies { diff --git a/android-example/decodesdk/src/main/AndroidManifest.xml b/android-example/decodesdk/src/main/AndroidManifest.xml index c93ec06..69e31bf 100644 --- a/android-example/decodesdk/src/main/AndroidManifest.xml +++ b/android-example/decodesdk/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ +> diff --git a/android-example/gradle/wrapper/gradle-wrapper.properties b/android-example/gradle/wrapper/gradle-wrapper.properties index a14a975..8049c68 100644 --- a/android-example/gradle/wrapper/gradle-wrapper.properties +++ b/android-example/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Nov 18 18:37:19 CST 2020 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android-example/web-api/build.gradle b/android-example/web-api/build.gradle index 0d69142..80d2ba6 100644 --- a/android-example/web-api/build.gradle +++ b/android-example/web-api/build.gradle @@ -3,22 +3,20 @@ apply plugin: 'com.android.library' android { signingConfigs { } - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 19 - targetSdkVersion 28 - versionCode 1 - versionName "0.1.2" + targetSdkVersion 33 } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - versionNameSuffix '0.1.2' } } productFlavors { } + namespace 'net.irext.webapi' } dependencies { diff --git a/android-example/web-api/src/main/AndroidManifest.xml b/android-example/web-api/src/main/AndroidManifest.xml index 179f9a3..fc22de6 100644 --- a/android-example/web-api/src/main/AndroidManifest.xml +++ b/android-example/web-api/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ +> diff --git a/android-example/web-api/src/main/java/net/irext/webapi/WebAPIs.java b/android-example/web-api/src/main/java/net/irext/webapi/WebAPIs.java index 11db8e0..12b2a01 100644 --- a/android-example/web-api/src/main/java/net/irext/webapi/WebAPIs.java +++ b/android-example/web-api/src/main/java/net/irext/webapi/WebAPIs.java @@ -35,7 +35,7 @@ public class WebAPIs { private static WebAPIs mInstance = null; - private static final String DEFAULT_ADDRESS = "http://irext.net"; + private static final String DEFAULT_ADDRESS = "http://srv.irext.net"; private static final String DEFAULT_APP = "/irext-server"; private static String URL_PREFIX = DEFAULT_ADDRESS + DEFAULT_APP; @@ -93,6 +93,7 @@ public class WebAPIs { = MediaType.parse("application/json; charset=utf-8"); RequestBody body = RequestBody.create(JSON, json); + Log.d(TAG, "post URL = " + url); Request request = new Request.Builder() .url(url) .post(body)