Skip to content

Commit 1e1ca2b

Browse files
hzlgithzlgit
committed
更改库的引入方式
1 parent c05a4d0 commit 1e1ca2b

18 files changed

+175
-52
lines changed

‎android/build.gradle

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
useLibrary 'org.apache.http.legacy'
4+
// useLibrary 'org.apache.http.legacy'
55

6-
compileSdkVersion 23
7-
// buildToolsVersion "23.0.1"
6+
compileSdkVersion 26
87

98
defaultConfig {
109
minSdkVersion 16
11-
targetSdkVersion 22
10+
targetSdkVersion 26
1211
versionCode 1
1312
versionName "1.0"
13+
ndk {
14+
//设置支持的SO库架构
15+
abiFilters "armeabi-v7a", "x86","arm64-v8a","x86_64"
16+
}
1417
}
1518
buildTypes {
1619
release {
@@ -34,6 +37,12 @@ repositories {
3437
dependencies {
3538
compile fileTree(include: '*.jar', dir: 'libs')
3639
compile 'com.facebook.react:react-native:+'
37-
implementation 'com.huawei.android.hms:push:2.6.3.301'
40+
// 基础功能 (必需)
41+
implementation 'com.netease.nimlib:basesdk:6.3.0'
42+
implementation 'com.netease.nimlib:push:6.3.0'
43+
implementation 'com.alibaba:fastjson:1.2.57'
44+
implementation 'com.huawei.android.hms:push:2.6.0.301'
45+
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
46+
3847
}
3948

‎android/libs/arm64-v8a/libcosine.so

-37.6 KB
Binary file not shown.

‎android/libs/arm64-v8a/libne_audio.so

-1.21 MB
Binary file not shown.

‎android/libs/armeabi-v7a/libcosine.so

-33.4 KB
Binary file not shown.

‎android/libs/armeabi-v7a/libne_audio.so

-735 KB
Binary file not shown.

‎android/libs/cosinesdk.jar

-65.2 KB
Binary file not shown.

‎android/libs/fastjson-1.1.34.android.jar

-255 KB
Binary file not shown.

‎android/libs/nim-basesdk-6.1.2.jar

-1.02 MB
Binary file not shown.

‎android/libs/nim-push-6.1.2.jar

-54.2 KB
Binary file not shown.

‎android/libs/universal-image-loader-1.9.5.jar

-158 KB
Binary file not shown.

‎android/libs/x86/libcosine.so

-33.3 KB
Binary file not shown.

‎android/libs/x86/libne_audio.so

-1.18 MB
Binary file not shown.

‎android/libs/x86_64/libcosine.so

-33.9 KB
Binary file not shown.

‎android/libs/x86_64/libne_audio.so

-1.24 MB
Binary file not shown.

‎android/src/main/AndroidManifest.xml

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,37 @@
44

55
<!-- 加入应用需要的权限 -->
66
<!-- 网络相关 -->
7-
<uses-permission android:name="android.permission.INTERNET"/>
8-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
9-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
10-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
11-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
12-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
13-
<uses-permission android:name="android.permission.WRITE_SETTINGS"
14-
tools:ignore="ProtectedPermissions" />
15-
16-
<!-- 手机状态 -->
17-
<uses-permission android:name="android.permission.GET_TASKS"/>
18-
<uses-permission android:name="android.permission.FLASHLIGHT"/>
19-
<uses-permission android:name="android.permission.VIBRATE"/>
20-
<uses-permission android:name="android.permission.WAKE_LOCK"/>
21-
<uses-permission android:name="android.permission.BLUETOOTH"/>
22-
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
23-
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION"
24-
tools:ignore="ProtectedPermissions" />
25-
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
7+
<uses-permission android:name="android.permission.INTERNET" />
8+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
9+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
10+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
2611

2712
<!-- 读写文件 -->
28-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
29-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
13+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
14+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
15+
16+
<!-- 定位相关 -->
17+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
18+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
19+
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
3020

3121
<!-- 多媒体 -->
32-
<uses-permission android:name="android.permission.CAMERA"/>
33-
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
34-
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
22+
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
23+
<uses-permission android:name="android.permission.CAMERA" />
24+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
25+
<uses-permission android:name="android.permission.BLUETOOTH" />
26+
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
3527

36-
<uses-permission android:name="android.permission.CLEAR_APP_CACHE"
37-
tools:ignore="ProtectedPermissions" />
38-
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
28+
<!-- 手机状态 -->
29+
<uses-permission android:name="android.permission.GET_TASKS" />
30+
<uses-permission android:name="android.permission.FLASHLIGHT" />
31+
<uses-permission android:name="android.permission.VIBRATE" />
32+
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
33+
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
34+
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
35+
36+
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
37+
<uses-permission android:name="android.permission.WAKE_LOCK" />
3938

4039
<!--以下两处 {你的包名} 改开发者App的包名-->
4140
<permission android:name="${applicationId}.permission.MIPUSH_RECEIVE"

‎android/src/main/java/com/netease/im/IMApplication.java

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,6 @@
5252
public class IMApplication {
5353

5454

55-
// public static class MiPushConfig {
56-
//
57-
// public String certificate;
58-
// public String appID;
59-
// public String appKey;
60-
//
61-
// /**
62-
// * 注册小米推送证书名称 、推送appID 以及在云信管理后台添加的appKey
63-
// */
64-
// public MiPushConfig(String certificate, String appID, String appKey) {
65-
// this.certificate = certificate;
66-
// this.appID = appID;
67-
// this.appKey = appKey;
68-
// }
69-
// }
70-
7155
// context
7256
private static Context context;
7357

@@ -88,7 +72,7 @@ public class IMApplication {
8872
private static StatusBarNotificationConfig statusBarNotificationConfig;
8973
private static boolean DEBUG = false;
9074

91-
public static void init(Context context, Class mainActivityClass, @DrawableRes int notify_msg_drawable_id, MixPushConfig miPushConfig) {
75+
public static void init(Context context, Class mainActivityClass, @DrawableRes int notify_msg_drawable_id, ImPushConfig miPushConfig) {
9276
IMApplication.context = context.getApplicationContext();
9377
IMApplication.mainActivityClass = mainActivityClass;
9478
IMApplication.notify_msg_drawable_id = notify_msg_drawable_id;
@@ -161,7 +145,7 @@ public static String getSdkStorageRooPath() {
161145
return Environment.getExternalStorageDirectory() + "/" + context.getPackageName() + "/nim";
162146
}
163147

164-
private static SDKOptions getOptions(Context context, MixPushConfig miPushConfig) {
148+
private static SDKOptions getOptions(Context context, ImPushConfig miPushConfig) {
165149
SDKOptions options = new SDKOptions();
166150

167151
// 如果将新消息通知提醒托管给SDK完成，需要添加以下配置。
@@ -195,9 +179,15 @@ private static SDKOptions getOptions(Context context, MixPushConfig miPushConfig
195179
//teamNotificationMessageMarkUnread 登录选项添加群通知消息是否计入未读数开关
196180
//sdkStorageRootPath 配置的外置存储缓存根目录
197181

182+
198183
// 推送配置
199184
if(miPushConfig!=null) {
200-
options.mixPushConfig = miPushConfig;
185+
MixPushConfig pushConfig = new MixPushConfig();
186+
pushConfig.xmAppId = miPushConfig.xmAppId;
187+
pushConfig.xmAppKey = miPushConfig.xmAppKey;
188+
pushConfig.xmCertificateName = miPushConfig.xmCertificateName;
189+
pushConfig.hwCertificateName = miPushConfig.hwCertificateName;
190+
options.mixPushConfig = pushConfig;
201191
}
202192

203193
return options;

‎android/src/main/java/com/netease/im/ImPushConfig.java

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
package com.netease.im;
2+
3+
public class ImPushConfig {
4+
5+
/**
6+
* 小米推送 appId
7+
*/
8+
public String xmAppId;
9+
10+
/**
11+
* 小米推送 appKey
12+
*/
13+
public String xmAppKey;
14+
15+
/**
16+
* 小米推送证书，请在云信管理后台申请
17+
*/
18+
public String xmCertificateName;
19+
20+
/**
21+
* 华为推送 appId 请在 AndroidManifest.xml 文件中配置
22+
* 华为推送证书，请在云信管理后台申请
23+
*/
24+
public String hwCertificateName;
25+
26+
/**
27+
* 魅族推送 appId
28+
*/
29+
public String mzAppId;
30+
31+
/**
32+
* 魅族推送 appKey
33+
*/
34+
public String mzAppKey;
35+
36+
/**
37+
* 魅族推送证书，请在云信管理后台申请
38+
*/
39+
public String mzCertificateName;
40+
41+
/**
42+
* FCM 推送证书，请在云信管理后台申请
43+
* 海外客户使用
44+
*/
45+
public String fcmCertificateName;
46+
47+
public String getXmAppKey() {
48+
return xmAppKey;
49+
}
50+
51+
public void setXmAppKey(String xmAppKey) {
52+
this.xmAppKey = xmAppKey;
53+
}
54+
55+
public String getVivoCertificateName() {
56+
return vivoCertificateName;
57+
}
58+
59+
public void setVivoCertificateName(String vivoCertificateName) {
60+
this.vivoCertificateName = vivoCertificateName;
61+
}
62+
63+
public String getMzCertificateName() {
64+
return mzCertificateName;
65+
}
66+
67+
public void setMzCertificateName(String mzCertificateName) {
68+
this.mzCertificateName = mzCertificateName;
69+
}
70+
71+
public String getFcmCertificateName() {
72+
return fcmCertificateName;
73+
}
74+
75+
public void setFcmCertificateName(String fcmCertificateName) {
76+
this.fcmCertificateName = fcmCertificateName;
77+
}
78+
79+
public String getMzAppKey() {
80+
return mzAppKey;
81+
}
82+
83+
public void setMzAppKey(String mzAppKey) {
84+
this.mzAppKey = mzAppKey;
85+
}
86+
87+
public String getMzAppId() {
88+
return mzAppId;
89+
}
90+
91+
public void setMzAppId(String mzAppId) {
92+
this.mzAppId = mzAppId;
93+
}
94+
95+
public String getHwCertificateName() {
96+
return hwCertificateName;
97+
}
98+
99+
public void setHwCertificateName(String hwCertificateName) {
100+
this.hwCertificateName = hwCertificateName;
101+
}
102+
103+
public String getXmCertificateName() {
104+
return xmCertificateName;
105+
}
106+
107+
public void setXmCertificateName(String xmCertificateName) {
108+
this.xmCertificateName = xmCertificateName;
109+
}
110+
111+
/**
112+
* VIVO推送 appId apiKey请在 AndroidManifest.xml 文件中配置
113+
* VIVO推送证书，请在云信管理后台申请
114+
*/
115+
public String vivoCertificateName;
116+
117+
public String getXmAppId() {
118+
return xmAppId;
119+
}
120+
121+
public void setXmAppId(String xmAppId) {
122+
this.xmAppId = xmAppId;
123+
}
124+
125+
}

‎android/src/main/java/com/netease/im/session/SessionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ public void onFailed(int code) {
911911

912912
@Override
913913
public void onException(Throwable throwable) {
914-
// LogUtil.w(TAG, "throwable:" + throwable.getLocalizedMessage());
914+
LogUtil.w(TAG, "throwable:" + throwable.getLocalizedMessage());
915915
}
916916
});
917917
onMessageStatusChange(message, true);

0 commit comments

Comments
 (0)