Skip to content

M
manager-app-sz
提交 0b96188c authored 作者: 吴强's avatar 吴强
浏览文件
操作

添加欢迎首页

上级 01212947
显示空白字符变更
内嵌 并排
正在显示 包含 81 行增加 和 9 行删除
android/.idea/gradle.xml
浏览文件 @ 0b96188c
...@@ -5,14 +5,7 @@ ...@@ -5,14 +5,7 @@
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="gradleHome" value="$PROJECT_DIR$/.gradle" />
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/../node_modules/react-native-device-info/android" />
<option value="$PROJECT_DIR$/../node_modules/react-native-vector-icons/android" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
......
android/.idea/misc.xml
浏览文件 @ 0b96188c
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectInspectionProfilesVisibleTreeState"> <component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default"> <entry key="Project Default">
<profile-state> <profile-state>
......
android/app/build.gradle
浏览文件 @ 0b96188c
...@@ -158,6 +158,7 @@ dependencies { ...@@ -158,6 +158,7 @@ dependencies {
compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:multidex:1.0.1'
compile "com.facebook.react:react-native:+" // From node_modules compile "com.facebook.react:react-native:+" // From node_modules
compile project(':react-native-vector-icons') // 2017-10-31 wq add compile project(':react-native-vector-icons') // 2017-10-31 wq add
compile project(':react-native-splash-screen') //2017-11-7 wq Add for welcome screen
} }
// Run this once to be able to run the application with BUCK // Run this once to be able to run the application with BUCK
......
android/app/src/main/java/com/bolanmanagerapp/MainActivity.java
浏览文件 @ 0b96188c
package com.bolanmanagerapp; package com.bolanmanagerapp;
import android.os.Bundle;
import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivity;
import org.devio.rn.splashscreen.SplashScreen;
public class MainActivity extends ReactActivity { public class MainActivity extends ReactActivity {
/** /**
...@@ -11,4 +14,10 @@ public class MainActivity extends ReactActivity { ...@@ -11,4 +14,10 @@ public class MainActivity extends ReactActivity {
protected String getMainComponentName() { protected String getMainComponentName() {
return "bolanManagerApp"; return "bolanManagerApp";
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
System.out.println("Hello world");
SplashScreen.show(this, true); // here
super.onCreate(savedInstanceState);
}
} }
android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
浏览文件 @ 0b96188c
...@@ -16,6 +16,7 @@ import java.util.Arrays; ...@@ -16,6 +16,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import com.oblador.vectoricons.VectorIconsPackage;// wq add 2017-10-31 import com.oblador.vectoricons.VectorIconsPackage;// wq add 2017-10-31
import org.devio.rn.splashscreen.SplashScreenReactPackage;// wq add 2017-11-7 Add for welcome page
public class MainApplication extends Application implements ReactApplication { public class MainApplication extends Application implements ReactApplication {
...@@ -31,7 +32,8 @@ public class MainApplication extends Application implements ReactApplication { ...@@ -31,7 +32,8 @@ public class MainApplication extends Application implements ReactApplication {
new MainReactPackage(), new MainReactPackage(),
new RNDeviceInfo(), new RNDeviceInfo(),
new IDCardReactPackage(), new IDCardReactPackage(),
new VectorIconsPackage() new VectorIconsPackage(),
new SplashScreenReactPackage()
); );
} }
......
android/app/src/main/res/layout/launch_screen.xml 0 → 100644
浏览文件 @ 0b96188c
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/launch_screen">
</LinearLayout>
\ No newline at end of file
android/app/src/main/res/values/colors.xml 0 → 100644
浏览文件 @ 0b96188c
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="primary_dark">#1E000000</color>
</resources>
\ No newline at end of file
android/app/src/main/res/values/styles.xml
浏览文件 @ 0b96188c
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<!--设置透明背景-->
<item name="android:windowIsTranslucent">true</item>
</style> </style>
</resources> </resources>
android/settings.gradle
浏览文件 @ 0b96188c
...@@ -4,5 +4,8 @@ project(':react-native-device-info').projectDir = new File(rootProject.projectDi ...@@ -4,5 +4,8 @@ project(':react-native-device-info').projectDir = new File(rootProject.projectDi
include ':react-native-vector-icons' include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-splash-screen'
project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
include ':app' include ':app'
ios/bolanManagerApp.xcodeproj/project.pbxproj
浏览文件 @ 0b96188c
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
07BDEFA20656470B88D48554 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DADBDDA7F504C5193847D2D /* libRNDeviceInfo.a */; }; 07BDEFA20656470B88D48554 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DADBDDA7F504C5193847D2D /* libRNDeviceInfo.a */; };
53E9F8ADCC714D9693F0C068 /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83554850969D48C684F45F7F /* libRNDeviceInfo-tvOS.a */; }; 53E9F8ADCC714D9693F0C068 /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83554850969D48C684F45F7F /* libRNDeviceInfo-tvOS.a */; };
3FB191FD84A84EE59701A8DA /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78557CAE6D494E449ACA2E70 /* libSplashScreen.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
...@@ -268,6 +269,8 @@ ...@@ -268,6 +269,8 @@
20C53C1323F44CCBB35F0247 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; name = "RNDeviceInfo.xcodeproj"; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; 20C53C1323F44CCBB35F0247 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; name = "RNDeviceInfo.xcodeproj"; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
4DADBDDA7F504C5193847D2D /* libRNDeviceInfo.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo.a"; path = "libRNDeviceInfo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; 4DADBDDA7F504C5193847D2D /* libRNDeviceInfo.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo.a"; path = "libRNDeviceInfo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
83554850969D48C684F45F7F /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; 83554850969D48C684F45F7F /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
BE6C1D88183E4F098BBEED33 /* SplashScreen.xcodeproj */ = {isa = PBXFileReference; name = "SplashScreen.xcodeproj"; path = "../node_modules/react-native-splash-screen/ios/SplashScreen.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
78557CAE6D494E449ACA2E70 /* libSplashScreen.a */ = {isa = PBXFileReference; name = "libSplashScreen.a"; path = "libSplashScreen.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -298,6 +301,7 @@ ...@@ -298,6 +301,7 @@
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
07BDEFA20656470B88D48554 /* libRNDeviceInfo.a in Frameworks */, 07BDEFA20656470B88D48554 /* libRNDeviceInfo.a in Frameworks */,
53E9F8ADCC714D9693F0C068 /* libRNDeviceInfo-tvOS.a in Frameworks */, 53E9F8ADCC714D9693F0C068 /* libRNDeviceInfo-tvOS.a in Frameworks */,
3FB191FD84A84EE59701A8DA /* libSplashScreen.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -467,6 +471,7 @@ ...@@ -467,6 +471,7 @@
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
20C53C1323F44CCBB35F0247 /* RNDeviceInfo.xcodeproj */, 20C53C1323F44CCBB35F0247 /* RNDeviceInfo.xcodeproj */,
BE6C1D88183E4F098BBEED33 /* SplashScreen.xcodeproj */,
); );
name = Libraries; name = Libraries;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1016,10 +1021,12 @@ ...@@ -1016,10 +1021,12 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
); );
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo", "$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
); );
}; };
name = Debug; name = Debug;
...@@ -1042,10 +1049,12 @@ ...@@ -1042,10 +1049,12 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
); );
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo", "$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
); );
}; };
name = Release; name = Release;
...@@ -1068,6 +1077,7 @@ ...@@ -1068,6 +1077,7 @@
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo", "$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
); );
}; };
name = Debug; name = Debug;
...@@ -1089,6 +1099,7 @@ ...@@ -1089,6 +1099,7 @@
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo", "$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
); );
}; };
name = Release; name = Release;
...@@ -1120,10 +1131,12 @@ ...@@ -1120,10 +1131,12 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
); );
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo", "$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
); );
}; };
name = Debug; name = Debug;
...@@ -1155,10 +1168,12 @@ ...@@ -1155,10 +1168,12 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
); );
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo", "$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
); );
}; };
name = Release; name = Release;
...@@ -1185,6 +1200,7 @@ ...@@ -1185,6 +1200,7 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
); );
}; };
name = Debug; name = Debug;
...@@ -1211,6 +1227,7 @@ ...@@ -1211,6 +1227,7 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
); );
}; };
name = Release; name = Release;
......
package-lock.json
浏览文件 @ 0b96188c
...@@ -7023,6 +7023,11 @@ ...@@ -7023,6 +7023,11 @@
"react-timer-mixin": "0.13.3" "react-timer-mixin": "0.13.3"
} }
}, },
"react-native-splash-screen": {
"version": "3.0.6",
"resolved": "http://registry.npm.taobao.org/react-native-splash-screen/download/react-native-splash-screen-3.0.6.tgz",
"integrity": "sha1-wLvyyK5AoxPExwRPVeVpQU/2gzI="
},
"react-native-swipeout": { "react-native-swipeout": {
"version": "2.3.1", "version": "2.3.1",
"resolved": "http://registry.npm.taobao.org/react-native-swipeout/download/react-native-swipeout-2.3.1.tgz", "resolved": "http://registry.npm.taobao.org/react-native-swipeout/download/react-native-swipeout-2.3.1.tgz",
......
package.json
浏览文件 @ 0b96188c
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
"react": "^16.0.0-beta.5", "react": "^16.0.0-beta.5",
"react-native": "^0.49.3", "react-native": "^0.49.3",
"react-native-device-info": "^0.12.1", "react-native-device-info": "^0.12.1",
"react-native-splash-screen": "^3.0.6",
"react-native-vector-icons": "^4.4.2", "react-native-vector-icons": "^4.4.2",
"react-navigation": "^1.0.0-beta.14", "react-navigation": "^1.0.0-beta.14",
"react-redux": "^5.0.6", "react-redux": "^5.0.6",
......
src/routes/welcome.js
浏览文件 @ 0b96188c
import React, { Component } from 'react'; import React, { Component } from 'react';
import { View, StyleSheet, Text } from 'react-native'; import { View, StyleSheet, Text } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import SplashScreen from 'react-native-splash-screen';
import { createAction } from '../utils/index'; import { createAction } from '../utils/index';
@connect(({ welcome }) => ({ welcome })) @connect(({ welcome }) => ({ welcome }))
...@@ -8,6 +9,7 @@ class WelcomeScreen extends Component { ...@@ -8,6 +9,7 @@ class WelcomeScreen extends Component {
componentDidMount() { componentDidMount() {
const { dispatch } = this.props; const { dispatch } = this.props;
dispatch(createAction('welcome/init')()); dispatch(createAction('welcome/init')());
SplashScreen.hide();// 隐藏启动平
} }
// 待改进，改成启动页，目前因为时间和技术的问题，搁置。wq write // 待改进，改成启动页，目前因为时间和技术的问题，搁置。wq write
render() { render() {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论