From 5a14bbfa39bea699f23ddc982cdc5987e428b4ae Mon Sep 17 00:00:00 2001 From: caserKing Date: Fri, 30 Aug 2019 16:11:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A5=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 1 + 1 file changed, 1 insertion(+) diff --git a/App.js b/App.js index 5182939..893b2d0 100644 --- a/App.js +++ b/App.js @@ -12,6 +12,7 @@ import { } from 'react-native'; + //引用插件 import Package from './package.json' import HttpUtils from './HttpUtils.js'; From e07ce4801524c5f3a3b495c38a9378f6c6f9bc51 Mon Sep 17 00:00:00 2001 From: caserKing Date: Fri, 30 Aug 2019 18:05:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/.project | 17 ++++++++++++++ .../org.eclipse.buildship.core.prefs | 2 ++ android/app/.classpath | 6 +++++ android/app/.project | 23 +++++++++++++++++++ .../org.eclipse.buildship.core.prefs | 2 ++ 5 files changed, 50 insertions(+) create mode 100644 android/.project create mode 100644 android/.settings/org.eclipse.buildship.core.prefs create mode 100644 android/app/.classpath create mode 100644 android/app/.project create mode 100644 android/app/.settings/org.eclipse.buildship.core.prefs diff --git a/android/.project b/android/.project new file mode 100644 index 0000000..f031723 --- /dev/null +++ b/android/.project @@ -0,0 +1,17 @@ + + + screenAd + Project android created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..e889521 --- /dev/null +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/android/app/.classpath b/android/app/.classpath new file mode 100644 index 0000000..eb19361 --- /dev/null +++ b/android/app/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/android/app/.project b/android/app/.project new file mode 100644 index 0000000..ac485d7 --- /dev/null +++ b/android/app/.project @@ -0,0 +1,23 @@ + + + app + Project app created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/app/.settings/org.eclipse.buildship.core.prefs b/android/app/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..b1886ad --- /dev/null +++ b/android/app/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir=.. +eclipse.preferences.version=1 From 05305fefa0295ad20249841da78e05294e76f9d1 Mon Sep 17 00:00:00 2001 From: caserKing Date: Fri, 30 Aug 2019 18:36:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E5=88=B0=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E5=90=8E=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/App.js b/App.js index aec4712..752fe41 100644 --- a/App.js +++ b/App.js @@ -737,7 +737,6 @@ getAdView(){ 公众号 {this.state.versionInfo} -<<<<<<< Updated upstream */ @@ -755,28 +754,6 @@ getAdView(){ loop={true} autoplayInterval={5000} /> -======= - - - ); - } else if (this.state.adType == 1) { - return( - - - ->>>>>>> Stashed changes ) } } @@ -1350,22 +1327,11 @@ MyPage = CodePush(codePushOptions)(MyPage); height: '100%', }, -<<<<<<< Updated upstream carouselItemWrap: { flex: 1, width: '100%', backgroundColor: 'transparent', alignItems: 'center', -======= - onlyAdSwiperItem:{ - width: '100%', - height: '100%', - }, - - onlyAdTypeItemImg:{ - width: '100%', - height: '100%', ->>>>>>> Stashed changes } }); From 277c29dd30776577aeb49bdb561c78ed11fcea4e Mon Sep 17 00:00:00 2001 From: caserKing Date: Sat, 31 Aug 2019 19:05:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=89=93=E6=9C=80?= =?UTF-8?q?=E7=BB=88=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/App.js b/App.js index 752fe41..3bce1f8 100644 --- a/App.js +++ b/App.js @@ -711,7 +711,7 @@ getAdView(){ activeSlideOffset={0} autoplay={true} loop={true} - autoplayInterval={4500} + autoplayInterval={5000} />