From: Peng Li Date: Wed, 30 May 2018 03:31:14 +0000 (+0800) Subject: Add keystore for auto updating X-Git-Tag: v0.3.4~1^2~1 X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=7d4112a00b18839a9efe5f40971360a40080b863;p=rtmpclient.git Add keystore for auto updating --- diff --git a/app/build.gradle b/app/build.gradle index ea7a0ce..7d8568a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,10 +19,22 @@ android { } } + signingConfigs { + release { + storeFile file("../keystore/rtmpclient.jks") + storePassword '123456' + keyAlias 'rtmpclient' + keyPassword '123456' + } + } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + } + debug { + signingConfig signingConfigs.release } } } @@ -43,5 +55,5 @@ dependencies { implementation files('libs/android-mail-1.5.5.jar') implementation files('libs/android-activation-1.5.5.jar') implementation 'com.android.support:design:27.1.1' - implementation group: 'org.apache.httpcomponents' , name: 'httpclient-android' , version: '4.3.5.1' + implementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1' } diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java index 223740a..5779298 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -357,6 +357,9 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi break; case R.id.action_about: break; + case R.id.action_update: + gLogger.debug("onOptionsItemSelected - check update"); + new CheckVersionInfoTask(this).execute(); } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk index f0d9ca8..08f2103 100644 --- a/app/src/main/jni/Application.mk +++ b/app/src/main/jni/Application.mk @@ -1,2 +1,2 @@ -APP_ABI := armeabi-v7a x86 +APP_ABI := armeabi-v7a APP_STL := c++_shared \ No newline at end of file diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 757ea5c..a168dd4 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -14,4 +14,10 @@ android:orderInCategory="100" android:showAsAction="never" android:title="About"/> + + \ No newline at end of file diff --git a/keystore/rtmpclient.jks b/keystore/rtmpclient.jks new file mode 100644 index 0000000..3187265 Binary files /dev/null and b/keystore/rtmpclient.jks differ