Bläddra i källkod

[系统][新增]:相机插件和动画插件

tags/jenkins-front-end-screenad-49^0
hupeng 6 år sedan
förälder
incheckning
063f912b31
7 ändrade filer med 41 tillägg och 3 borttagningar
  1. +13
    -2
      App.js
  2. +1
    -0
      android/app/build.gradle
  3. +1
    -0
      android/app/src/main/AndroidManifest.xml
  4. +2
    -0
      android/app/src/main/java/com/screenad/MainApplication.java
  5. +3
    -1
      android/settings.gradle
  6. +19
    -0
      ios/screenAd.xcodeproj/project.pbxproj
  7. +2
    -0
      package.json

+ 13
- 2
App.js Visa fil

@@ -15,6 +15,7 @@ import Package from './package.json'
import Swiper from 'react-native-swiper'; import Swiper from 'react-native-swiper';
import HttpUtils from './HttpUtils.js'; import HttpUtils from './HttpUtils.js';
import CodePush from "react-native-code-push"; import CodePush from "react-native-code-push";
import DeviceInfo from "react-native-device-info";


// 取得屏幕的宽高Dimensions // 取得屏幕的宽高Dimensions
const { width, height } = Dimensions.get('window'); const { width, height } = Dimensions.get('window');
@@ -29,9 +30,12 @@ export default class MyPage extends Component {
qrcode:[], qrcode:[],
restartAllowed: true , restartAllowed: true ,
syncMessage: "我是小更新" , 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) { codePushStatusDidChange(syncStatus) {
@@ -175,6 +179,13 @@ render() {
当前版本是:{Package.version} 当前版本是:{Package.version}
</Text> </Text>


<Text style={styles.messages}>
Mac:{this.state.macAddress}
</Text>
<Text style={styles.messages}>
Name:{DeviceInfo.getApplicationName()}
</Text>
<TouchableOpacity onPress={this.sync.bind(this)}> <TouchableOpacity onPress={this.sync.bind(this)}>
<Text style={styles.syncButton}>Press for background sync</Text> <Text style={styles.syncButton}>Press for background sync</Text>
</TouchableOpacity> </TouchableOpacity>


+ 1
- 0
android/app/build.gradle Visa fil

@@ -158,6 +158,7 @@ android {
} }


dependencies { dependencies {
implementation project(':react-native-camera')
implementation project(':react-native-device-info') implementation project(':react-native-device-info')
implementation project(':react-native-code-push') implementation project(':react-native-code-push')
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation fileTree(dir: "libs", include: ["*.jar"])


+ 1
- 0
android/app/src/main/AndroidManifest.xml Visa fil

@@ -3,6 +3,7 @@


<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>


<application <application
android:name=".MainApplication" android:name=".MainApplication"


+ 2
- 0
android/app/src/main/java/com/screenad/MainApplication.java Visa fil

@@ -3,6 +3,7 @@ package com.screenad;
import android.app.Application; import android.app.Application;


import com.facebook.react.ReactApplication; import com.facebook.react.ReactApplication;
import org.reactnative.camera.RNCameraPackage;
import com.learnium.RNDeviceInfo.RNDeviceInfo; import com.learnium.RNDeviceInfo.RNDeviceInfo;
import com.microsoft.codepush.react.CodePush; import com.microsoft.codepush.react.CodePush;
import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactNativeHost;
@@ -31,6 +32,7 @@ public class MainApplication extends Application implements ReactApplication {
protected List<ReactPackage> getPackages() { protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList( return Arrays.<ReactPackage>asList(
new MainReactPackage(), new MainReactPackage(),
new RNCameraPackage(),
new RNDeviceInfo(), new RNDeviceInfo(),
new CodePush( new CodePush(
BuildConfig.CODEPUSH_KEY, BuildConfig.CODEPUSH_KEY,


+ 3
- 1
android/settings.gradle Visa fil

@@ -1,6 +1,8 @@
rootProject.name = 'screenAd' 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' 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' include ':react-native-code-push'
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '..\\node_modules\\react-native-code-push\\android\\app') project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '..\\node_modules\\react-native-code-push\\android\\app')




+ 19
- 0
ios/screenAd.xcodeproj/project.pbxproj Visa fil

@@ -43,6 +43,7 @@
1D9B977EF02A4A4889A3DB8D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 66D0C7202A274329A44896AF /* libz.tbd */; }; 1D9B977EF02A4A4889A3DB8D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 66D0C7202A274329A44896AF /* libz.tbd */; };
87AC1C7FBD2D486A8496775D /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA1E60B1E4C4CF08017D6C7 /* libRNDeviceInfo.a */; }; 87AC1C7FBD2D486A8496775D /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA1E60B1E4C4CF08017D6C7 /* libRNDeviceInfo.a */; };
603338A972BC497CB13A8E7E /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 145DB45C59D944B7BC067032 /* libRNDeviceInfo-tvOS.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 */ /* End PBXBuildFile section */


/* Begin PBXContainerItemProxy 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 = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; D7C737D4F5674419B8D2A7F0 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; name = "RNDeviceInfo.xcodeproj"; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
DEA1E60B1E4C4CF08017D6C7 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo.a"; path = "libRNDeviceInfo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; DEA1E60B1E4C4CF08017D6C7 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo.a"; path = "libRNDeviceInfo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
145DB45C59D944B7BC067032 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; 145DB45C59D944B7BC067032 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; 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 = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
7847EE6DABE74D92BBD93F0A /* libRNCamera.a */ = {isa = PBXFileReference; name = "libRNCamera.a"; path = "libRNCamera.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */ /* End PBXFileReference section */


/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@@ -387,6 +390,7 @@
84325BCA939E4E4E8090435C /* libCodePush.a in Frameworks */, 84325BCA939E4E4E8090435C /* libCodePush.a in Frameworks */,
1D9B977EF02A4A4889A3DB8D /* libz.tbd in Frameworks */, 1D9B977EF02A4A4889A3DB8D /* libz.tbd in Frameworks */,
87AC1C7FBD2D486A8496775D /* libRNDeviceInfo.a in Frameworks */, 87AC1C7FBD2D486A8496775D /* libRNDeviceInfo.a in Frameworks */,
34AFC50E88444884839918E1 /* libRNCamera.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -580,6 +584,7 @@
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
0CB64B19BE27429888B0F5FA /* CodePush.xcodeproj */, 0CB64B19BE27429888B0F5FA /* CodePush.xcodeproj */,
D7C737D4F5674419B8D2A7F0 /* RNDeviceInfo.xcodeproj */, D7C737D4F5674419B8D2A7F0 /* RNDeviceInfo.xcodeproj */,
00A674D206BA447C9B2B9CBA /* RNCamera.xcodeproj */,
); );
name = Libraries; name = Libraries;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -1210,11 +1215,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(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-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Debug; name = Debug;
@@ -1239,11 +1246,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(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-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Release; name = Release;
@@ -1268,6 +1277,7 @@
"$(inherited)", "$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Debug; name = Debug;
@@ -1291,6 +1301,7 @@
"$(inherited)", "$(inherited)",
"$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Release; name = Release;
@@ -1323,11 +1334,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(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-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Debug; name = Debug;
@@ -1360,11 +1373,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(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-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Release; name = Release;
@@ -1396,11 +1411,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(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-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Debug; name = Debug;
@@ -1432,11 +1449,13 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(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-code-push\ios\CodePush/**", "$(SRCROOT)\..\node_modules\react-native-code-push\ios\CodePush/**",
"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo", "$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
"$(SRCROOT)\..\node_modules\react-native-camera\ios/**",
); );
}; };
name = Release; name = Release;


+ 2
- 0
package.json Visa fil

@@ -9,6 +9,8 @@
"dependencies": { "dependencies": {
"react": "16.6.3", "react": "16.6.3",
"react-native": "0.58.4", "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-code-push": "^5.5.2",
"react-native-device-info": "^0.26.4", "react-native-device-info": "^0.26.4",
"react-native-swiper": "^1.5.14" "react-native-swiper": "^1.5.14"


Laddar…
Avbryt
Spara