瀏覽代碼

Merge commit 'refs/tags/jenkins-front-end-screenad-147-v94^{}' into release

tags/jenkins-front-end-screenad-148-v19^0
hupeng 6 年之前
父節點
當前提交
03da5f1529
共有 6 個檔案被更改,包括 33 行新增5 行删除
  1. +5
    -4
      App.js
  2. +1
    -0
      android/app/build.gradle
  3. +2
    -0
      android/app/src/main/java/com/screenad/MainApplication.java
  4. +2
    -0
      android/settings.gradle
  5. +19
    -0
      ios/screenAd.xcodeproj/project.pbxproj
  6. +4
    -1
      package.json

+ 5
- 4
App.js 查看文件

@@ -17,9 +17,9 @@ import Package from './package.json'
import HttpUtils from './HttpUtils.js';
import CodePush from "react-native-code-push";
import DeviceInfo from "react-native-device-info";
import RNFetchBlob from 'react-native-fetch-blob';
import * as Animatable from 'react-native-animatable';
import {CachedImage,ImageCache} from "react-native-img-cache";
var testMac = 'FF:FF:FF:FF:FF:FF'

var contentItemDefault = {
@@ -248,6 +248,7 @@ codePushStatusDidChange(syncStatus) {
if (result.code != 200) {
this.showErrMsg(result.message+'\n'+this.state.macAddress);
} else if (result.data.list) {
ImageCache.get().clear();
adDataList = result.data.list;
if (this.updateContent()) {
this.setState({contentDisplayStatus: true})
@@ -407,7 +408,7 @@ getContentViewItem(contentItem, annomation) {
<ImageBackground source={require('./image/item-background.png')} resizeMode='center' style={styles.contentItemDownLayer} >
{/* 列表 */}
<View style={styles.contentItemTop}>
<Image source={{uri: contentItem.coverImg}} resizeMethod='auto' resizeMode='cover' style={styles.contentItemTopCoverImg} />
<CachedImage source={{uri: contentItem.coverImg}} resizeMethod='auto' resizeMode='cover' style={styles.contentItemTopCoverImg} />
<View style={styles.contentItemTopDetail}>
{/* 券的title */}
<Text style={styles.contentItemTopDetailTitle} numberOfLines={2} ellipsizeMode="tail">{contentItem.target.title}</Text>
@@ -424,7 +425,7 @@ getContentViewItem(contentItem, annomation) {
</View>
</View>
{/* <Image source={{uri:'data:image/png;base64,'+contentItem.qrcode}} resizeMode='contain' style={styles.contentItemTopQrcode} /> */}
<Image source={{uri:contentItem.target.qrCode}} resizeMode='contain' style={styles.contentItemTopQrcode} />
<CachedImage source={{uri:contentItem.target.qrCode}} resizeMode='contain' style={styles.contentItemTopQrcode} />
</View>
{/* 优惠券底部商户名称 */}
<View style={styles.contentItemBottom}>


+ 1
- 0
android/app/build.gradle 查看文件

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

dependencies {
implementation project(':react-native-fetch-blob')
implementation project(':react-native-camera')
implementation project(':react-native-device-info')
implementation project(':react-native-code-push')


+ 2
- 0
android/app/src/main/java/com/screenad/MainApplication.java 查看文件

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

import com.facebook.react.ReactApplication;
import com.RNFetchBlob.RNFetchBlobPackage;
import org.reactnative.camera.RNCameraPackage;

import com.facebook.react.bridge.ReactApplicationContext;
@@ -37,6 +38,7 @@ public class MainApplication extends Application implements ReactApplication {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new RNFetchBlobPackage(),
new RNCameraPackage(),
new RNBuildConfigPackage(),
new RNDeviceInfo(),


+ 2
- 0
android/settings.gradle 查看文件

@@ -1,4 +1,6 @@
rootProject.name = 'screenAd'
include ':react-native-fetch-blob'
project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fetch-blob/android')
include ':react-native-camera'
project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
include ':react-native-device-info'


+ 19
- 0
ios/screenAd.xcodeproj/project.pbxproj 查看文件

@@ -44,6 +44,7 @@
FEBB7F68D5534228A6A832AD /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C488E5D3FD5417DAAAA5C79 /* libRNDeviceInfo.a */; };
59D20E8E9CD64A01B87A3AC0 /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D705AD40EF415A95C31652 /* libRNDeviceInfo-tvOS.a */; };
D240C4819F1E4B80BB6D7BEE /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F8C0E0ED2BA401B9075C9F3 /* libRNCamera.a */; };
BA9EAC9D8E144D058AC73DD2 /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C586CF88164E08936AF0C0 /* libRNFetchBlob.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
@@ -359,6 +360,8 @@
22D705AD40EF415A95C31652 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
0F57B32024664223A7D6E682 /* 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; };
4F8C0E0ED2BA401B9075C9F3 /* libRNCamera.a */ = {isa = PBXFileReference; name = "libRNCamera.a"; path = "libRNCamera.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
BE5C3F5DA65B4EFC83BEC512 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; name = "RNFetchBlob.xcodeproj"; path = "../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
99C586CF88164E08936AF0C0 /* libRNFetchBlob.a */ = {isa = PBXFileReference; name = "libRNFetchBlob.a"; path = "libRNFetchBlob.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
@@ -391,6 +394,7 @@
C7220E8B42ED4C16A6C2AE14 /* libz.tbd in Frameworks */,
FEBB7F68D5534228A6A832AD /* libRNDeviceInfo.a in Frameworks */,
D240C4819F1E4B80BB6D7BEE /* libRNCamera.a in Frameworks */,
BA9EAC9D8E144D058AC73DD2 /* libRNFetchBlob.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -585,6 +589,7 @@
D256D2ADE9FF4E9782EBCA6D /* CodePush.xcodeproj */,
C6058A0BC9054E0394045AC4 /* RNDeviceInfo.xcodeproj */,
0F57B32024664223A7D6E682 /* RNCamera.xcodeproj */,
BE5C3F5DA65B4EFC83BEC512 /* RNFetchBlob.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
@@ -1213,12 +1218,14 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Debug;
@@ -1241,12 +1248,14 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Release;
@@ -1272,6 +1281,7 @@
"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Debug;
@@ -1296,6 +1306,7 @@
"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Release;
@@ -1326,12 +1337,14 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Debug;
@@ -1362,12 +1375,14 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Release;
@@ -1397,12 +1412,14 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Debug;
@@ -1432,12 +1449,14 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(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/**",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
);
};
name = Release;


+ 4
- 1
package.json 查看文件

@@ -13,7 +13,10 @@
"react-native-camera": "^1.12.0",
"react-native-code-push": "^5.6.0",
"react-native-device-info": "^2.1.2",
"react-native-swiper": "^1.5.14"
"react-native-fetch-blob": "^0.10.8",
"react-native-img-cache": "^1.6.0",
"react-native-swiper": "^1.5.14",
"rn-fetch-blob": "^0.10.15"
},
"devDependencies": {
"@babel/core": "^7.4.5",


Loading…
取消
儲存