Skip to content

Commit 379e403

Browse files
KenChoi1992KenChoi1992
authored
Merge pull request #36 from jpush/dev
Dev
2 parents cda84f8 + 506f73d commit 379e403

Some content is hidden

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

46 files changed

+53
-69901
lines changed

‎example/android/app/app.iml‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
<task>generateDebugSources</task>
1616
</afterSyncTasks>
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
18-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
18+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
19+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
21+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
1922
</configuration>
2023
</facet>
2124
</component>
@@ -60,10 +63,11 @@
6063
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
6164
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6265
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
63-
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
64-
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
65-
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6771
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6872
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6973
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -84,13 +88,11 @@
8488
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8589
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8690
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9092
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9295
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9496
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
9597
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9698
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
@@ -105,35 +107,35 @@
105107
</content>
106108
<orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
107109
<orderEntry type="sourceFolder" forTests="false" />
110+
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-okhttp3-1.3.0" level="project" />
108111
<orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
109-
<orderEntry type="library" name="com.squareup.okhttp3:okhttp-ws:3.4.1@jar" level="project" />
110112
<orderEntry type="library" name="com.google.android:flexbox-0.2.5" level="project" />
111-
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-base-1.0.1" level="project" />
112113
<orderEntry type="library" name="cn.jiguang.imui:chatinput-0.6.2" level="project" />
113114
<orderEntry type="library" name="javax.inject:javax.inject:1@jar" level="project" />
114115
<orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
115116
<orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
117+
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-base-1.3.0" level="project" />
116118
<orderEntry type="library" name="com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
117119
<orderEntry type="library" name="com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
118-
<orderEntry type="library" name="com.facebook.react:react-native-0.44.2" level="project" />
119-
<orderEntry type="library" name="com.squareup.okhttp3:okhttp-urlconnection:3.4.1@jar" level="project" />
120+
<orderEntry type="library" name="com.squareup.okhttp3:okhttp-urlconnection:3.6.0@jar" level="project" />
120121
<orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jcore-react-native/android/libs/jcore-android-1.1.7.jar:unspecified@jar" level="project" />
121122
<orderEntry type="library" name="cn.jiguang.imui:messagelist-0.5.8" level="project" />
122123
<orderEntry type="library" name="com.facebook.soloader:soloader-0.1.0" level="project" />
123124
<orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
125+
<orderEntry type="library" name="com.squareup.okio:okio:1.13.0@jar" level="project" />
124126
<orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
125-
<orderEntry type="library" name="com.facebook.fresco:fresco-1.0.1" level="project" />
126127
<orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
128+
<orderEntry type="library" name="com.facebook.fresco:fresco-1.3.0" level="project" />
127129
<orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
128-
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-okhttp3-1.0.1" level="project" />
129-
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-1.0.1" level="project" />
130-
<orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.4.1@jar" level="project" />
130+
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-1.3.0" level="project" />
131131
<orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
132-
<orderEntry type="library" name="com.facebook.fresco:fbcore-1.0.1" level="project" />
133-
<orderEntry type="library" name="com.facebook.fresco:drawee-1.0.1" level="project" />
132+
<orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.6.0@jar" level="project" />
133+
<orderEntry type="library" name="com.facebook.fresco:fbcore-1.3.0" level="project" />
134134
<orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-android_v2.3.0.jar:unspecified@jar" level="project" />
135135
<orderEntry type="library" name="com.android.support:transition-25.3.1" level="project" />
136136
<orderEntry type="library" name="com.android.support:design-25.3.1" level="project" />
137+
<orderEntry type="library" name="com.facebook.fresco:drawee-1.3.0" level="project" />
138+
<orderEntry type="library" name="com.facebook.react:react-native-0.51.0" level="project" />
137139
<orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:1.0@jar" level="project" />
138140
<orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
139141
<orderEntry type="library" name="org.greenrobot:eventbus:3.0.0@jar" level="project" />
@@ -143,7 +145,6 @@
143145
<orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
144146
<orderEntry type="library" name="org.webkit:android-jsc-r174650" level="project" />
145147
<orderEntry type="library" name="com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
146-
<orderEntry type="library" name="com.squareup.okio:okio:1.9.0@jar" level="project" />
147148
<orderEntry type="module" module-name="jcore-react-native" />
148149
<orderEntry type="module" module-name="react-native-fs" />
149150
<orderEntry type="module" module-name="aurora-imui-react-native" />

0 commit comments

Comments
 (0)