diff --git a/App.js b/App.js
index 6b568c0..1b4bdc8 100644
--- a/App.js
+++ b/App.js
@@ -15,6 +15,7 @@ import Package from './package.json'
import Swiper from 'react-native-swiper';
import HttpUtils from './HttpUtils.js';
import CodePush from "react-native-code-push";
+import DeviceInfo from "react-native-device-info";
// 取得屏幕的宽高Dimensions
const { width, height } = Dimensions.get('window');
@@ -29,9 +30,12 @@ export default class MyPage extends Component {
qrcode:[],
restartAllowed: true ,
syncMessage: "我是小更新" ,
- progress: false
+ progress: false,
+ macAddress: "NULL"
};
-}
+ DeviceInfo.getMACAddress().then(mac=>{this.setState({macAddress:mac})})
+ DeviceInfo.getIPAddress().then(mac=>{this.setState({macAddress:mac})})
+ }
// 监听更新状态
codePushStatusDidChange(syncStatus) {
@@ -175,6 +179,13 @@ render() {
当前版本是:{Package.version}
+
+ Mac:{this.state.macAddress}
+
+
+ Name:{DeviceInfo.getApplicationName()}
+
+
Press for background sync
diff --git a/android/app/build.gradle b/android/app/build.gradle
index cdd1048..a04d81e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -158,6 +158,7 @@ android {
}
dependencies {
+ implementation project(':react-native-camera')
implementation project(':react-native-device-info')
implementation project(':react-native-code-push')
implementation fileTree(dir: "libs", include: ["*.jar"])
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 354036e..fffc697 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
+
getPackages() {
return Arrays.asList(
new MainReactPackage(),
+ new RNCameraPackage(),
new RNDeviceInfo(),
new CodePush(
BuildConfig.CODEPUSH_KEY,
diff --git a/android/settings.gradle b/android/settings.gradle
index c547ae8..24299e2 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,6 +1,8 @@
rootProject.name = 'screenAd'
+include ':react-native-camera'
+project(':react-native-camera').projectDir = new File(rootProject.projectDir, '..\node_modules\react-native-camera\android')
include ':react-native-device-info'
-project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '..\node_modules\react-native-device-info\android')
+project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '..\\node_modules\\react-native-device-info\\android')
include ':react-native-code-push'
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '..\\node_modules\\react-native-code-push\\android\\app')
diff --git a/ios/screenAd.xcodeproj/project.pbxproj b/ios/screenAd.xcodeproj/project.pbxproj
index 8f0c423..6de6d06 100644
--- a/ios/screenAd.xcodeproj/project.pbxproj
+++ b/ios/screenAd.xcodeproj/project.pbxproj
@@ -43,6 +43,7 @@
1D9B977EF02A4A4889A3DB8D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 66D0C7202A274329A44896AF /* libz.tbd */; };
87AC1C7FBD2D486A8496775D /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA1E60B1E4C4CF08017D6C7 /* libRNDeviceInfo.a */; };
603338A972BC497CB13A8E7E /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 145DB45C59D944B7BC067032 /* libRNDeviceInfo-tvOS.a */; };
+ 34AFC50E88444884839918E1 /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7847EE6DABE74D92BBD93F0A /* libRNCamera.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -356,6 +357,8 @@
D7C737D4F5674419B8D2A7F0 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; name = "RNDeviceInfo.xcodeproj"; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
DEA1E60B1E4C4CF08017D6C7 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo.a"; path = "libRNDeviceInfo.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
145DB45C59D944B7BC067032 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
+ 00A674D206BA447C9B2B9CBA /* RNCamera.xcodeproj */ = {isa = PBXFileReference; name = "RNCamera.xcodeproj"; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
+ 7847EE6DABE74D92BBD93F0A /* libRNCamera.a */ = {isa = PBXFileReference; name = "libRNCamera.a"; path = "libRNCamera.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -387,6 +390,7 @@
84325BCA939E4E4E8090435C /* libCodePush.a in Frameworks */,
1D9B977EF02A4A4889A3DB8D /* libz.tbd in Frameworks */,
87AC1C7FBD2D486A8496775D /* libRNDeviceInfo.a in Frameworks */,
+ 34AFC50E88444884839918E1 /* libRNCamera.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -580,6 +584,7 @@
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
0CB64B19BE27429888B0F5FA /* CodePush.xcodeproj */,
D7C737D4F5674419B8D2A7F0 /* RNDeviceInfo.xcodeproj */,
+ 00A674D206BA447C9B2B9CBA /* RNCamera.xcodeproj */,
);
name = Libraries;
sourceTree = "";
@@ -1210,11 +1215,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
+ "\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Debug;
@@ -1239,11 +1246,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
+ "\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Release;
@@ -1268,6 +1277,7 @@
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Debug;
@@ -1291,6 +1301,7 @@
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Release;
@@ -1323,11 +1334,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
+ "\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Debug;
@@ -1360,11 +1373,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
+ "\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Release;
@@ -1396,11 +1411,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
+ "\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Debug;
@@ -1432,11 +1449,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
+ "\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+ "$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
);
};
name = Release;
diff --git a/package.json b/package.json
index 34f9c7a..4ae85b4 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,8 @@
"dependencies": {
"react": "16.6.3",
"react-native": "0.58.4",
+ "react-native-animatable": "^1.3.1",
+ "react-native-camera": "^1.12.0",
"react-native-code-push": "^5.5.2",
"react-native-device-info": "^0.26.4",
"react-native-swiper": "^1.5.14"