Skip to content

Commit 1b2e375

Browse files
KenChoiKenChoi
KenChoi
authored and
KenChoi
committed
modified demo
1 parent 062ad33 commit 1b2e375

21 files changed

+80
-79
lines changed

‎example/android/app/AndroidManifest.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:tools="http://schemas.android.com/tools"
3-
package="io.jchat.android">
3+
package="com.sample.application">
44

55
<application
6-
android:name=".MainApplication"
6+
android:name="com.sample.application.MainApplication"
77
android:allowBackup="true"
88
android:icon="@drawable/ic_launcher"
99
android:label="@string/app_name"
@@ -14,10 +14,11 @@
1414
<meta-data android:name="JPUSH_APPKEY" android:value="${JPUSH_APPKEY}"/>
1515

1616
<activity
17-
android:name=".MainActivity"
17+
android:name="com.sample.application.MainActivity"
1818
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
1919
android:label="@string/app_name"
20-
android:windowSoftInputMode="adjustPan">
20+
android:windowSoftInputMode="adjustPan"
21+
android:screenOrientation="portrait">
2122
<intent-filter>
2223
<action android:name="android.intent.action.MAIN" />
2324
<category android:name="android.intent.category.LAUNCHER" />

‎example/android/app/app.iml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6464
<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" />
7365
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7466
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -78,7 +70,18 @@
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8285
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
8386
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars" />
@@ -92,11 +95,17 @@
9295
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
9396
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
9497
<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" />
95100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
96102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
97103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
98105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
99107
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
100109
</content>
101110
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
102111
<orderEntry type="sourceFolder" forTests="false" />
@@ -123,7 +132,6 @@
123132
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
124133
<orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
125134
<orderEntry type="module" module-name="react-native-camera" exported="" />
126-
<orderEntry type="module" module-name="react-native-orientation" exported="" />
127135
<orderEntry type="module" module-name="jmessage-react-plugin" exported="" />
128136
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
129137
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
@@ -143,7 +151,6 @@
143151
<orderEntry type="library" exported="" name="xmpcore-5.1.2" level="project" />
144152
<orderEntry type="library" exported="" name="metadata-extractor-2.9.1" level="project" />
145153
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
146-
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
147154
<orderEntry type="library" exported="" name="jcore-android_v1.1.0" level="project" />
148155
<orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
149156
<orderEntry type="library" exported="" name="jmessage-android-2.0.0" level="project" />

‎example/android/app/build.gradle‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@ android {
8181
buildToolsVersion "25.0.0"
8282

8383
defaultConfig {
84-
applicationId "io.jchat.android"
84+
applicationId "com.sample.application"
8585
minSdkVersion 16
86-
targetSdkVersion 23
86+
targetSdkVersion 22
8787
versionCode 1
8888
versionName "1.0"
8989
ndk {
9090
abiFilters "armeabi-v7a", "x86"
9191
}
9292
manifestPlaceholders = [
93-
JPUSH_APPKEY: "4f7aef34fb361292c566a1cd", //在此替换你的APPKey
93+
JPUSH_APPKEY: "426251cac0146ce0a08ca38f", //在此替换你的APPKey
9494
APP_CHANNEL: "developer-default" //应用渠道号
9595
]
9696
}
@@ -139,6 +139,5 @@ dependencies {
139139
compile "com.android.support:appcompat-v7:23.0.1"
140140
compile project(':jmessage-react-plugin')
141141
compile project(':react-native-camera')
142-
compile project(':react-native-orientation')
143-
compile "com.facebook.react:react-native:+"
142+
compile "com.facebook.react:react-native:0.37.0"
144143
}

‎example/android/app/res/layout/activity_main.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:paddingRight="@dimen/activity_horizontal_margin"
99
android:paddingTop="@dimen/activity_vertical_margin"
1010
android:paddingBottom="@dimen/activity_vertical_margin"
11-
tools:context="io.jchat.android.MainActivity">
11+
tools:context="io.jchat.android.com.jchat.example.MainActivity">
1212

1313
<TextView
1414
android:text="Hello World!"

example/android/app/src/io/jchat/android/MainActivity.java renamed to example/android/app/src/com/sample/application/MainActivity.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
package io.jchat.android;
1+
package com.sample.application;
22

33
import android.os.Bundle;
4-
import android.view.KeyEvent;
54

65
import com.facebook.react.ReactActivity;
7-
import com.facebook.react.ReactInstanceManager;
8-
import com.facebook.react.ReactRootView;
96
import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
107

118
import java.lang.Override;
129

1310
import cn.jiguang.api.JCoreInterface;
1411

1512

16-
public class MainActivity extends ReactActivity implements DefaultHardwareBackBtnHandler {
13+
public class MainActivity extends ReactActivity {
1714

1815
@Override
1916
protected void onCreate(Bundle savedInstanceState) {
@@ -37,9 +34,4 @@ protected void onResume() {
3734
JCoreInterface.onResume(this);
3835
}
3936

40-
@Override
41-
protected void onDestroy() {
42-
super.onDestroy();
43-
}
44-
4537
}

example/android/app/src/io/jchat/android/MainApplication.java renamed to example/android/app/src/com/sample/application/MainApplication.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
package io.jchat.android;
1+
package com.sample.application;
22

33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
66
import com.facebook.react.ReactNativeHost;
77
import com.facebook.react.ReactPackage;
88
import com.facebook.react.shell.MainReactPackage;
9-
import com.github.yamill.orientation.OrientationPackage;
109
import com.lwansbrough.RCTCamera.RCTCameraPackage;
1110

1211
import java.util.Arrays;
1312
import java.util.List;
1413

14+
import io.jchat.android.BuildConfig;
15+
import io.jchat.android.JMessageReactPackage;
1516

1617

1718
public class MainApplication extends Application implements ReactApplication {
@@ -33,7 +34,7 @@ protected List<ReactPackage> getPackages() {
3334
return Arrays.<ReactPackage>asList(
3435
new MainReactPackage(),
3536
new RCTCameraPackage(),
36-
new OrientationPackage()
37+
new JMessageReactPackage()
3738
);
3839
}
3940
};

‎example/android/settings.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
rootProject.name = 'ReactJChat'
22

3-
include ':app', ':jmessage-react-plugin', ':react-native-orientation', ':react-native-camera', 'react-native-dialogs'
3+
include ':app', ':jmessage-react-plugin', ':react-native-camera', 'react-native-dialogs'
44
project(':jmessage-react-plugin').projectDir = new File(rootProject.projectDir, '../node_modules/jmessage-react-plugin/android')
55
project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
6-
project(':react-native-orientation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation/android')
76
project(':react-native-dialogs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-dialogs/android')

‎example/package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
"start": "node node_modules/react-native/local-cli/cli.js start"
77
},
88
"dependencies": {
9-
"jmessage-react-plugin": "0.0.2",
10-
"normalizr": "^2.0.0",
11-
"react": "^0.14.7",
9+
"jmessage-react-plugin": "0.0.3",
10+
"react": "^15.4.2",
1211
"react-native": "^0.37.0",
13-
"react-native-camera": "git+https://github.com/lwansbrough/react-native-camera.git",
14-
"react-native-orientation": "github:yamill/react-native-orientation",
12+
"react-native-camera": "0.4.1",
13+
"react-native-dialogs": "0.0.19",
1514
"react-redux": "^4.4.6",
1615
"redux": "^3.6.0",
1716
"redux-thunk": "^2.1.0"
1817
},
1918
"devDependencies": {
2019
"redux-devtools": "^3.1.1"
2120
}
22-
}
21+
}

‎example/react-native-android/containers/BaseApp.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import React from 'react';
44
import ReactNative from 'react-native';
5+
import JMessageModule from 'jmessage-react-plugin';
56

67
var {
78
Text,
@@ -28,7 +29,6 @@ import LoginDialog from './login_dialog';
2829
import CameraActivity from './camera';
2930
import ChatActivity from './chat_activity';
3031
import configureStore from '../store/configureStore';
31-
var JMessageHelper = NativeModules.JMessageHelper;
3232

3333
var _navigator;
3434
class BaseApp extends React.Component {
@@ -45,7 +45,7 @@ class BaseApp extends React.Component {
4545

4646

4747
componentWillMount() {
48-
JMessageHelper.isLogin((map) => {
48+
JMessageModule.isLogin((map) => {
4949
switch (map.result) {
5050
case 're-login':
5151
_navigator.replace({

‎example/react-native-android/containers/camera.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
var React = require('react');
4-
var ReactNative = require('react-native');
3+
import React from 'react';
4+
import ReactNative from 'react-native';
55

66
var {
77
Text,

0 commit comments

Comments
 (0)