From 7d4112a00b18839a9efe5f40971360a40080b863 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Wed, 30 May 2018 11:31:14 +0800 Subject: [PATCH] Add keystore for auto updating --- app/build.gradle | 14 +++++++++++++- app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java | 3 +++ app/src/main/jni/Application.mk | 2 +- app/src/main/res/menu/main.xml | 6 ++++++ keystore/rtmpclient.jks | Bin 0 -> 2237 bytes 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 keystore/rtmpclient.jks 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 0000000000000000000000000000000000000000..318726517da8ba636aa6177148576ddfa1abf1bc GIT binary patch literal 2237 zcmchY`8U*y8^=Gh7~9Q|t;ii&vs9lMdo+ZxWUF!Q#=gfenk33HT&C;{nS>%sLY8F9 zuE;({$dY7>Y*|vYeBFD#_ndpaf57*L_YcqOJm)#jc|Xs2o}X(!*8l*39t!feI0DIj z0j|E@?nLq-axL%X(E-C|)ENbc5 z&kW~OQ`^SLnR@JQw4mtjkWZYxeflc}V-mh@d`mTklU~Dc3b=twAcmi6qe(ryx=dyG zUJ=jg`9O&VCWUpEtVlXUWq{#&Qd!t!Rm~gNRhGIzMvCIy?okIx1;oZR{9Q-jWvTFD*8w4G)|!V~d|iWJJ6JCH`_GG;2(&J#)gk5Il$b~jaIZLtWN8H zuTeit#>D!4FNW`Di{eF>McWyJrRu@?P~?;+cOt?*Dd!^Ys27hR%X$pWN`8 zP1gq9b0H+cpmKd5)L%mth?q;BlWS->Jp~i%GFai%)X>Qwwrr6dPsD`VSWB>fZ4a9k zgQFHX<|1>ssk}myBMRqa4~ovaZn>0x+qZd|XsLmf)9!Z9h_4EC$r=9YUh&BP)K;Lz zQcP-ppoZ3oYe&mM!!D@YPd+{`joI1B;DfkAOWzIO+3LQEUk=T@F>@-P%c3t#JIWV_ zsTH;Fy9w1p9ni~YNge}sbJ0TI($5H{)glRRsvkQrF@h_>Pc?x`F|!JH&CbM@%8AtT znu8hHupcH^*=7N}zuqN1IynX2Gi=rSK_>%L3+mXJGh35D2 zHh*+Zy%_eJtC25h#H-Q#U1_VbW8|0L!n=&~2Lff=7^Mw@J_+BlP7m!lg7?Q-#wq(-O{4kNN0h3gk%7`}m z=Lu4Irw+QqQhiL*P)?<^WmkH4&nt8&#e0_apv!GwjD;1aQ27(P*0$#%B)@uDaVu<3 z!8bo#lxdb&9h>;Xs*OUVuWCxk#LQ>0Rr!=jGWgZ^DypkZgH4}c-WT^JTxd+slaX9b zsWc9Ms_37;T^W6pJr(!`X99^a<2_Lgpx?U%1a)QvLflvRI!{ z0@VNjMgl1?Kac{ocmRV!pip>_nR*>~1i>yFV-T}<1Onk?0YFbQC&-R~S-=szP#shB zQIPwufQ^@3|C%$=)6JjgiRJ;3e=$~GHghj`V#uM;$ip&+h=Uh#^)M~O`yashzX0|R z0Dl)ef>s5U6hIIIV$dqKf=3h;KqZXgf5ZP@BNT|(zfCxN5ikk_34jy`2b2PV0Q6YA z?>F$n#tzvD@z#N9T0E{oUXH*uExJ96wPR}VxLZH8O}2^c_=rjh8Av7#z6(&vvy3kj zw&@yjC=p&WmUr6;)mL1rZyR(LpJp4fG%J6eik@k{Oc^lmEP2Ie==GcQ+B9sOHvY5n zSdr#sxk#S6S_O*E3YnlLa=u7y@|$wM#gA#FF;{b)+~{LktI)zl$**3|j9#6siReiC z>>4Zcrs=WTV)OX-i$hir_Pl4b-^&c%McL4cISb*!F^J<81jjwqs_OB@?iKlFB-|mq z4IMYUyN%<}yNibsyQ^ojbq5IH5ydBNU#Glw7BIY+Jr-(#YVBu^^NAtd2~ZdWfaIS9 zQJ~1-j77NM0&qUcdXiD->hk+BbE$cXL_6x%mDZ7en|QcMhbBURD7WHGp@S3?zsu^; z!olZ5$dkVIzbvhFy|6H#c01r}{cr?%0;^>MdxGLb+ikP($LC-!ICFr0X{5I~#y*hY zqCTAq)P;)PBmy;reL>pA`%Pt&cpbXvnq^(6$V4<5al=EmK+VcQwPvdt<3IIjN3-R| z!mqKTdKC@GSAQA`)iCz)!JokcHQ!O?55_Q^i=()G0^gzB;; INMrSX0JFO0k^lez literal 0 HcmV?d00001 -- 2.11.0