Merge pull request #142 from xiongtiancheng/master

更新jmessage sdk至2.7.0
jpush · Oct 26, 2018 · 8c432f2 · 8c432f2
2 parents 3294b4d + b2bd54b
commit 8c432f2
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 84 deletions.
diff --git a/chatapp/build.gradle b/chatapp/build.gradle
@@ -11,6 +11,18 @@ android {
         versionName "2.2.0"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+        manifestPlaceholders = [
+                JPUSH_PKGNAME : applicationId,
+                JPUSH_APPKEY : "4f7aef34fb361292c566a1cd", //JPush上注册的包名对应的appkey.
+                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+        ]
+
+        ndk {
+            //选择要添加的对应cpu类型的.so库。
+            abiFilters 'armeabi', 'armeabi-v7a', 'armeabi-v8a','x86', 'x86_64', 'mips', 'mips64'
+        }
+
     }
     buildTypes {
         release {
@@ -19,20 +31,6 @@ android {
         }
     }
 
-    signingConfigs {
-        release {
-            storeFile file("release.keystore")
-            storePassword "jpush-release"
-            keyAlias "release.keystore"
-            keyPassword "jpush-release"
-        }
-        debug {
-            storeFile file("debug.keystore")
-            storePassword "jpush-debug"
-            keyAlias "debug.keystore"
-            keyPassword "jpush-debug"
-        }
-    }
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
@@ -65,4 +63,6 @@ dependencies {
     compile project(':reclib-qq')
     compile project(':reclib-testemoticons')
     compile 'com.contrarywind:Android-PickerView:3.2.4'
+    compile 'cn.jiguang.sdk:jmessage:2.7.0'  // 此处以JMessage 2.7.0 版本为例。
+    compile 'cn.jiguang.sdk:jcore:1.2.3'  // 此处以JCore 1.2.3 版本为例。
 }
diff --git a/chatapp/libs/arm64-v8a/libjcore117.so b/chatapp/libs/arm64-v8a/libjcore117.so
diff --git a/chatapp/libs/armeabi-v7a/libjcore117.so b/chatapp/libs/armeabi-v7a/libjcore117.so
diff --git a/chatapp/libs/armeabi/libjcore117.so b/chatapp/libs/armeabi/libjcore117.so
diff --git a/chatapp/libs/jcore-android-1.1.7.jar b/chatapp/libs/jcore-android-1.1.7.jar
diff --git a/chatapp/libs/jmessage-android_v2.3.0.jar b/chatapp/libs/jmessage-android_v2.3.0.jar
diff --git a/chatapp/libs/mips/libjcore117.so b/chatapp/libs/mips/libjcore117.so
diff --git a/chatapp/libs/mips64/libjcore117.so b/chatapp/libs/mips64/libjcore117.so
diff --git a/chatapp/libs/x86/libjcore117.so b/chatapp/libs/x86/libjcore117.so
diff --git a/chatapp/libs/x86_64/libjcore117.so b/chatapp/libs/x86_64/libjcore117.so
diff --git a/chatapp/src/main/AndroidManifest.xml b/chatapp/src/main/AndroidManifest.xml
@@ -50,84 +50,17 @@
             android:name="AA_DB_VERSION"
             android:value="4"/>
 
-        <!-- Required SDK 核心功能 -->
-        <!-- 可配置android:process参数将PushService放在其他进程中 -->
-        <service
-            android:name="cn.jpush.android.service.PushService"
-            android:enabled="true"
-            android:exported="false"
-            android:process=":remote">
-            <intent-filter>
-                <action android:name="cn.jpush.android.intent.REGISTER"/>
-                <action android:name="cn.jpush.android.intent.REPORT"/>
-                <action android:name="cn.jpush.android.intent.PushService"/>
-                <action android:name="cn.jpush.android.intent.PUSH_TIME"/>
-            </intent-filter>
-        </service>
-
-        <!-- Required SDK核心功能 -->
-        <receiver
-            android:name="cn.jpush.android.service.PushReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter android:priority="1000">
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
-
-                <category android:name="${applicationId}"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT"/>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
-            </intent-filter>
-            <!-- Optional -->
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-
-                <data android:scheme="package"/>
-            </intent-filter>
-        </receiver>
-
-        <!-- Required SDK核心功能 -->
-        <receiver
-            android:name="cn.jpush.im.android.helpers.IMReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter android:priority="1000">
-                <action android:name="cn.jpush.im.android.action.IM_RESPONSE"/>
-                <action android:name="cn.jpush.im.android.action.NOTIFICATION_CLICK_PROXY"/>
-
-                <category android:name="${applicationId}"/>
-            </intent-filter>
-        </receiver>
-
-
         <service
             android:name="com.baidu.location.f"
             android:enabled="true"
             android:process=":remote">
         </service>
+
+        <!--如果需要使用到位置服务，需要更换百度地图apikey为自己的apikey-->
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="UAkQeBK84ioVGzYgA1rSWYfuD4xYtpmV"/>
 
-        <!-- Required SDK核心功能 -->
-        <receiver
-            android:name="cn.jpush.android.service.AlarmReceiver"
-            android:exported="false"/>
-
-        <meta-data
-            android:name="JPUSH_CHANNEL"
-            android:value="developer-default"/>
-        <meta-data
-            android:name="JPUSH_APPKEY"
-            android:value="4f7aef34fb361292c566a1cd"/>
-
-        <provider
-            android:name="cn.jpush.android.service.DataProvider"
-            android:authorities="${applicationId}.DataProvider"
-            android:exported="true" />
-
         <activity
             android:name=".activity.WelcomeActivity"
             android:screenOrientation="portrait"

diff --git a/chatapp/src/main/java/jiguang/chat/activity/LoginActivity.java b/chatapp/src/main/java/jiguang/chat/activity/LoginActivity.java
@@ -48,7 +48,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
     private View mUserLine;
     private View mPswLine;
     //内部测试环境使用,发布时会置为false;此处对开发者来说即使打开也是没有效果的.
-    private boolean isTestVisibility = true;
+    private boolean isTestVisibility = false;
     private RadioGroup mRadioGroup;
     private RadioButton mRelease;
     private RadioButton mTest;