Skip to content

Commit 171a329

Browse files
KenChoiKenChoi
KenChoi
authored and
KenChoi
committed
fix receive message bug
1 parent a8405a4 commit 171a329

File tree

126 files changed

+3219
-70788
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+3219
-70788
lines changed

‎android/src/io/jchat/android/JMessageModule.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,26 @@ public void enterConversation(String targetId, String appKey, String groupId) {
234234
}
235235
}
236236

237+
@ReactMethod
238+
public void exitConversation() {
239+
JMessageClient.exitConversation();
240+
}
241+
242+
@ReactMethod
243+
public void resetUnreadMsgCnt(String targetId, String appKey, String groupId) {
244+
Conversation conv;
245+
try {
246+
if (null != targetId && !TextUtils.isEmpty(targetId)) {
247+
conv = JMessageClient.getSingleConversation(targetId, appKey);
248+
} else {
249+
conv = JMessageClient.getGroupConversation(Long.parseLong(groupId));
250+
}
251+
conv.resetUnreadCount();
252+
} catch(Exception e) {
253+
e.printStackTrace();
254+
}
255+
}
256+
237257
@ReactMethod
238258
public void addListener() {
239259

‎example/android/AndroidManifest.xml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
package="io.jchat.android">
4+
5+
<permission
6+
android:name="${applicationId}.permission.JPUSH_MESSAGE"
7+
android:protectionLevel="signature" />
8+
9+
<!-- Required 一些系统要求的权限，如访问网络等-->
10+
<uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
11+
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
12+
<uses-permission android:name="android.permission.INTERNET" />
13+
<uses-permission android:name="android.permission.WAKE_LOCK" />
14+
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
15+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
16+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
17+
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
18+
<uses-permission android:name="android.permission.VIBRATE" />
19+
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
20+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
21+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
22+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
23+
24+
<uses-sdk tools:STRICT="com.facebook.react" />
25+
<uses-permission android:name="android.permission.CAMERA" />
26+
<uses-feature android:name="android.hardware.camera" android:required="true"/>
27+
<uses-feature android:name="android.hardware.camera.autofocus" />
28+
29+
30+
<!-- JMessage Demo required for record audio-->
31+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
32+
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
33+
34+
<application>
35+
36+
<!-- Required Push SDK核心功能-->
37+
<service
38+
android:name="cn.jpush.android.service.PushService"
39+
android:enabled="true"
40+
android:exported="false"
41+
android:process=":remote">
42+
<intent-filter>
43+
<action android:name="cn.jpush.android.intent.REGISTER" />
44+
<action android:name="cn.jpush.android.intent.REPORT" />
45+
<action android:name="cn.jpush.android.intent.PushService" />
46+
<action android:name="cn.jpush.android.intent.PUSH_TIME" />
47+
</intent-filter>
48+
</service>
49+
50+
<!-- Required Push SDK核心功能-->
51+
<receiver
52+
android:name="cn.jpush.android.service.PushReceiver"
53+
android:enabled="true">
54+
<intent-filter android:priority="1000">
55+
<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
56+
<category android:name="${applicationId}" />
57+
</intent-filter>
58+
<intent-filter>
59+
<action android:name="android.intent.action.USER_PRESENT" />
60+
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
61+
</intent-filter>
62+
<!-- Optional -->
63+
<intent-filter>
64+
<action android:name="android.intent.action.PACKAGE_ADDED" />
65+
<action android:name="android.intent.action.PACKAGE_REMOVED" />
66+
67+
<data android:scheme="package" />
68+
</intent-filter>
69+
</receiver>
70+
71+
<!-- Required Push SDK核心功能 -->
72+
<receiver android:name="cn.jpush.android.service.AlarmReceiver" />
73+
74+
<!-- IM Required IM SDK核心功能-->
75+
<receiver
76+
android:name="cn.jpush.im.android.helpers.IMReceiver"
77+
android:enabled="true"
78+
android:exported="false">
79+
<intent-filter android:priority="1000">
80+
<action android:name="cn.jpush.im.android.action.IM_RESPONSE" />
81+
<action android:name="cn.jpush.im.android.action.NOTIFICATION_CLICK_PROXY" />
82+
83+
<category android:name="${applicationId}" />
84+
</intent-filter>
85+
</receiver>
86+
87+
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
88+
</application>
89+
90+
</manifest>

‎example/android/TestReactJChat.iml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎example/android/android.iml‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
18+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
19+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
20+
<option name="LIBRARY_PROJECT" value="true" />
21+
</configuration>
22+
</facet>
23+
</component>
24+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
25+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
26+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
27+
<exclude-output />
28+
<content url="file://$MODULE_DIR$">
29+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.8.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.8.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.8.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp/0.8.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.8.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.20.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
109+
</content>
110+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
111+
<orderEntry type="sourceFolder" forTests="false" />
112+
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
113+
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
114+
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
115+
<orderEntry type="library" exported="" name="jcore-android_v1.1.0" level="project" />
116+
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
117+
<orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
118+
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
119+
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
120+
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
121+
<orderEntry type="library" exported="" name="jmessage-android-2.1.0" level="project" />
122+
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
123+
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
124+
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
125+
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
126+
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
127+
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
128+
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
129+
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
130+
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
131+
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
132+
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
133+
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
134+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
135+
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
136+
</component>
137+
</module>

‎example/android/app/AndroidManifest.xml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)