Skip to content

Commit ffe4a4e

Browse files
KenChoi1992KenChoi1992
authored
Merge pull request #2 from jpush/dev
Dev
2 parents a4c6e70 + d31460b commit ffe4a4e

File tree

263 files changed

+73641
-63058
lines changed

Some content is hidden

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

263 files changed

+73641
-63058
lines changed

‎.npmignore‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# OSX
2+
#
3+
.DS_Store
4+
5+
# Xcode
6+
#
7+
build/
8+
*.pbxuser
9+
!default.pbxuser
10+
*.mode1v3
11+
!default.mode1v3
12+
*.mode2v3
13+
!default.mode2v3
14+
*.perspectivev3
15+
!default.perspectivev3
16+
xcuserdata
17+
*.xccheckout
18+
*.moved-aside
19+
DerivedData
20+
*.hmap
21+
*.ipa
22+
*.xcuserstate
23+
24+
# node.js
25+
#
26+
node_modules/
27+
npm-debug.log
28+
29+
# Don't publish example apps
30+
example/
31+
# .idea
32+
33+
.idea/
34+
.gradle/

‎.travis.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
language: node_js
2+
sudo: true
3+
node_js:
4+
- '4.1.1'
5+
cache:
6+
directories:
7+
- node_modules
8+
before_install:
9+
- npm install
10+
script:
11+
- npm test
12+
- npm run dev
13+
- npm run build
14+
- npm run checkdir
15+
after_script:
16+
- npm run coverage

‎ReactJChat.iml‎

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

android/app/AndroidManifest.xml renamed to android/AndroidManifest.xml

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@
3131
<uses-permission android:name="android.permission.RECORD_AUDIO" />
3232
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
3333

34-
<application
35-
android:name=".JChatApplication"
36-
android:allowBackup="true"
37-
android:icon="@drawable/ic_launcher"
38-
android:label="@string/app_name"
39-
android:theme="@style/AppTheme">
34+
<application>
4035

4136
<!-- Required Push SDK核心功能-->
4237
<service
@@ -73,23 +68,6 @@
7368
</intent-filter>
7469
</receiver>
7570

76-
<!-- Required Push SDK核心功能 -->
77-
<activity
78-
android:name="cn.jpush.android.ui.PushActivity"
79-
android:configChanges="orientation|keyboardHidden"
80-
android:theme="@android:style/Theme.Translucent.NoTitleBar">
81-
<intent-filter>
82-
<action android:name="cn.jpush.android.ui.PushActivity" />
83-
84-
<category android:name="android.intent.category.DEFAULT" />
85-
<category android:name="${applicationId}" />
86-
</intent-filter>
87-
</activity>
88-
<!-- Required Push SDK核心功能 -->
89-
<service
90-
android:name="cn.jpush.android.service.DownloadService"
91-
android:enabled="true"
92-
android:exported="false" />
9371
<!-- Required Push SDK核心功能 -->
9472
<receiver android:name="cn.jpush.android.service.AlarmReceiver" />
9573

@@ -106,38 +84,6 @@
10684
</intent-filter>
10785
</receiver>
10886

109-
<!-- option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
110-
<!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
111-
<service
112-
android:name="cn.jpush.android.service.DaemonService"
113-
android:enabled="true"
114-
android:exported="true">
115-
<intent-filter>
116-
<action android:name="cn.jpush.android.intent.DaemonService" />
117-
<category android:name="${applicationId}" />
118-
</intent-filter>
119-
120-
</service>
121-
122-
<!-- Required. Enable it you can get statistics data with channel -->
123-
<meta-data
124-
android:name="JPUSH_CHANNEL"
125-
android:value="developer-default" />
126-
<!-- Required. AppKey copied from Portal -->
127-
<meta-data
128-
android:name="JPUSH_APPKEY"
129-
android:value="4f7aef34fb361292c566a1cd" />
130-
131-
<activity
132-
android:name=".MainActivity"
133-
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
134-
android:label="@string/app_name"
135-
android:windowSoftInputMode="adjustPan">
136-
<intent-filter>
137-
<action android:name="android.intent.action.MAIN" />
138-
<category android:name="android.intent.category.LAUNCHER" />
139-
</intent-filter>
140-
</activity>
14187
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
14288
</application>
14389

‎android/ReactJChat.iml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="ReactJChat" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3-
<component name="FacetManager">
4-
<facet type="java-gradle" name="Java-Gradle">
5-
<configuration>
6-
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7-
<option name="BUILDABLE" value="false" />
8-
</configuration>
9-
</facet>
10-
</component>
11-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
12-
<exclude-output />
13-
<content url="file://$MODULE_DIR$">
14-
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
15-
</content>
16-
<orderEntry type="inheritedJdk" />
2+
<module version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="false">
174
<orderEntry type="sourceFolder" forTests="false" />
185
</component>
196
</module>

android/app/app.iml renamed to android/android.iml

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ReactJChat" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
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">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
6-
<option name="GRADLE_PROJECT_PATH" value=":app" />
6+
<option name="GRADLE_PROJECT_PATH" value=":" />
77
</configuration>
88
</facet>
99
<facet type="android" name="Android">
@@ -12,32 +12,32 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2219
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
20+
<option name="LIBRARY_PROJECT" value="true" />
2321
</configuration>
2422
</facet>
2523
</component>
2624
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2725
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
26+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2927
<exclude-output />
3028
<content url="file://$MODULE_DIR$">
3129
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3230
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3331
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3432
<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" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4039
<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" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -47,21 +47,41 @@
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4949
<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" />
5059
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
5160
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
5261
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
5362
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
5463
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" 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" />
5673
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5774
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
5875
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5976
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6077
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6178
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6279
<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" />
6382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
6686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
6787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
@@ -72,14 +92,16 @@
7292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.8.1/jars" />
7393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp/0.8.1/jars" />
7494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.8.1/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.23.0/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.20.1/jars" />
7696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
7797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
7899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
79101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
81102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
82103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
83105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
84106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
85107
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -90,27 +112,26 @@
90112
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
91113
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
92114
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
115+
<orderEntry type="library" exported="" name="jcore-android_v1.1.0" level="project" />
93116
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
94117
<orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
95118
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
96-
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
97119
<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" />
98122
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
99123
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
100124
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
101-
<orderEntry type="library" exported="" name="react-native-0.23.0" level="project" />
102125
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
103126
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
104127
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
105128
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
106129
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
107-
<orderEntry type="library" exported="" name="jmessage-android-1.2.3" level="project" />
108130
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
109131
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
110132
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
133+
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
111134
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
112135
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
113-
<orderEntry type="module" module-name="react-native-camera" exported="" />
114-
<orderEntry type="module" module-name="Orientation" exported="" />
115136
</component>
116137
</module>

0 commit comments

Comments
 (0)