Skip to content

Commit b6f715c

Browse files
FTD-ZFFTD-ZF
committed
项目功能修复
1 parent 6da8bdf commit b6f715c

26 files changed

Lines changed: 1062 additions & 26 deletions

File tree

‎android/app/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ android {
138138
}
139139

140140
dependencies {
141+
implementation project(':react-native-orientation')
142+
implementation project(':react-native-video')
141143
implementation project(':react-native-linear-gradient')
142144
implementation project(':@react-native-community_slider')
143145
implementation project(':@react-native-community_viewpager')

‎android/app/src/main/java/com/reactnativemobxframe/MainApplication.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6+
import com.github.yamill.orientation.OrientationPackage;
7+
import com.brentvatne.react.ReactVideoPackage;
68
import com.BV.LinearGradient.LinearGradientPackage;
79
import com.reactnativecommunity.slider.ReactSliderPackage;
810
import com.reactnativecommunity.viewpager.RNCViewPagerPackage;
@@ -28,6 +30,8 @@ public boolean getUseDeveloperSupport() {
2830
protected List<ReactPackage> getPackages() {
2931
return Arrays.<ReactPackage>asList(
3032
new MainReactPackage(),
33+
new OrientationPackage(),
34+
new ReactVideoPackage(),
3135
new LinearGradientPackage(),
3236
new ReactSliderPackage(),
3337
new RNCViewPagerPackage(),

‎android/settings.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
rootProject.name = 'ReactNativeMobxFrame'
2+
include ':react-native-orientation'
3+
project(':react-native-orientation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation/android')
4+
include ':react-native-video'
5+
project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android-exoplayer')
26
include ':react-native-linear-gradient'
37
project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
48
include ':@react-native-community_slider'

‎ios/ReactNativeMobxFrame.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
4646
ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; };
4747
4AA22DACB5424979A9A6360D /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C48AAC89ACED419185EBBE99 /* libBVLinearGradient.a */; };
48+
20321750B759454AA8B1E16D /* libRCTVideo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A4C58BB318D46DBA588DBFB /* libRCTVideo.a */; };
49+
4DAC98C878F14FDFA246CB0A /* libRCTOrientation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0C8FD78227E451FACE24A67 /* libRCTOrientation.a */; };
4850
/* End PBXBuildFile section */
4951

5052
/* Begin PBXContainerItemProxy section */
@@ -398,6 +400,10 @@
398400
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
399401
3A25F16E009540E88CEA4102 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; name = "BVLinearGradient.xcodeproj"; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
400402
C48AAC89ACED419185EBBE99 /* libBVLinearGradient.a */ = {isa = PBXFileReference; name = "libBVLinearGradient.a"; path = "libBVLinearGradient.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
403+
1838B734B9ED4E2EBC532429 /* RCTVideo.xcodeproj */ = {isa = PBXFileReference; name = "RCTVideo.xcodeproj"; path = "../node_modules/react-native-video/ios/RCTVideo.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
404+
1A4C58BB318D46DBA588DBFB /* libRCTVideo.a */ = {isa = PBXFileReference; name = "libRCTVideo.a"; path = "libRCTVideo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
405+
A130E5770F0E43F492CD55CC /* RCTOrientation.xcodeproj */ = {isa = PBXFileReference; name = "RCTOrientation.xcodeproj"; path = "../node_modules/react-native-orientation/iOS/RCTOrientation.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
406+
F0C8FD78227E451FACE24A67 /* libRCTOrientation.a */ = {isa = PBXFileReference; name = "libRCTOrientation.a"; path = "libRCTOrientation.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
401407
/* End PBXFileReference section */
402408

403409
/* Begin PBXFrameworksBuildPhase section */
@@ -431,6 +437,8 @@
431437
3FFF6C9DEC6E42C795F0A5E1 /* libRNCViewpager.a in Frameworks */,
432438
9610DDABA8AE479E8FA7BF2F /* libRNCSlider.a in Frameworks */,
433439
4AA22DACB5424979A9A6360D /* libBVLinearGradient.a in Frameworks */,
440+
20321750B759454AA8B1E16D /* libRCTVideo.a in Frameworks */,
441+
4DAC98C878F14FDFA246CB0A /* libRCTOrientation.a in Frameworks */,
434442
);
435443
runOnlyForDeploymentPostprocessing = 0;
436444
};
@@ -671,6 +679,8 @@
671679
13B0CAF343FE41E195F1D3FF /* RNCViewpager.xcodeproj */,
672680
D91C4800464649F2A18ACC58 /* RNCSlider.xcodeproj */,
673681
3A25F16E009540E88CEA4102 /* BVLinearGradient.xcodeproj */,
682+
1838B734B9ED4E2EBC532429 /* RCTVideo.xcodeproj */,
683+
A130E5770F0E43F492CD55CC /* RCTOrientation.xcodeproj */,
674684
);
675685
name = Libraries;
676686
sourceTree = "<group>";
@@ -1345,6 +1355,8 @@
13451355
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
13461356
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
13471357
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1358+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1359+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
13481360
);
13491361
INFOPLIST_FILE = ReactNativeMobxFrameTests/Info.plist;
13501362
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -1357,6 +1369,8 @@
13571369
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13581370
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13591371
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1372+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1373+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13601374
);
13611375
OTHER_LDFLAGS = (
13621376
"-ObjC",
@@ -1380,6 +1394,8 @@
13801394
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
13811395
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
13821396
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1397+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1398+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
13831399
);
13841400
INFOPLIST_FILE = ReactNativeMobxFrameTests/Info.plist;
13851401
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -1392,6 +1408,8 @@
13921408
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13931409
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13941410
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1411+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1412+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
13951413
);
13961414
OTHER_LDFLAGS = (
13971415
"-ObjC",
@@ -1416,6 +1434,8 @@
14161434
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
14171435
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
14181436
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1437+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1438+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
14191439
);
14201440
INFOPLIST_FILE = ReactNativeMobxFrame/Info.plist;
14211441
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1442,6 +1462,8 @@
14421462
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
14431463
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
14441464
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1465+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1466+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
14451467
);
14461468
INFOPLIST_FILE = ReactNativeMobxFrame/Info.plist;
14471469
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1475,6 +1497,8 @@
14751497
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
14761498
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
14771499
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1500+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1501+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
14781502
);
14791503
INFOPLIST_FILE = "ReactNativeMobxFrame-tvOS/Info.plist";
14801504
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1486,6 +1510,8 @@
14861510
"\"$(SRCROOT)/$(TARGET_NAME)\"",
14871511
"\"$(SRCROOT)/$(TARGET_NAME)\"",
14881512
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1513+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1514+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
14891515
);
14901516
OTHER_LDFLAGS = (
14911517
"-ObjC",
@@ -1518,6 +1544,8 @@
15181544
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
15191545
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
15201546
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1547+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1548+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
15211549
);
15221550
INFOPLIST_FILE = "ReactNativeMobxFrame-tvOS/Info.plist";
15231551
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1529,6 +1557,8 @@
15291557
"\"$(SRCROOT)/$(TARGET_NAME)\"",
15301558
"\"$(SRCROOT)/$(TARGET_NAME)\"",
15311559
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1560+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1561+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
15321562
);
15331563
OTHER_LDFLAGS = (
15341564
"-ObjC",
@@ -1560,6 +1590,8 @@
15601590
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
15611591
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
15621592
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1593+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1594+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
15631595
);
15641596
INFOPLIST_FILE = "ReactNativeMobxFrame-tvOSTests/Info.plist";
15651597
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1571,6 +1603,8 @@
15711603
"\"$(SRCROOT)/$(TARGET_NAME)\"",
15721604
"\"$(SRCROOT)/$(TARGET_NAME)\"",
15731605
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1606+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1607+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
15741608
);
15751609
OTHER_LDFLAGS = (
15761610
"-ObjC",
@@ -1602,6 +1636,8 @@
16021636
"$(SRCROOT)/../node_modules/@react-native-community/viewpager/ios",
16031637
"$(SRCROOT)/../node_modules/@react-native-community/slider/ios",
16041638
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
1639+
"$(SRCROOT)/../node_modules/react-native-video/ios/**",
1640+
"$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**",
16051641
);
16061642
INFOPLIST_FILE = "ReactNativeMobxFrame-tvOSTests/Info.plist";
16071643
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1613,6 +1649,8 @@
16131649
"\"$(SRCROOT)/$(TARGET_NAME)\"",
16141650
"\"$(SRCROOT)/$(TARGET_NAME)\"",
16151651
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1652+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1653+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
16161654
);
16171655
OTHER_LDFLAGS = (
16181656
"-ObjC",

‎package.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"bundle-ios": "node node_modules/react-native/local-cli/cli.js bundle --entry-file index.js --platform ios --dev false --bundle-output ./ios/bundle/index.ios.jsbundle --assets-dest ./ios/bundle",
1010
"ios-xsmax": "react-native run-ios --simulator 'iPhone XS Max'",
1111
"ios-x": "react-native run-ios --simulator 'iPhone X'",
12-
"ios-6": "react-native run-ios --simulator 'iPhone 6s'",
12+
"ios-6s": "react-native run-ios --simulator 'iPhone 6s'",
13+
"ios-6": "react-native run-ios --simulator 'iPhone 6'",
1314
"android": "react-native run-android"
1415
},
1516
"dependencies": {
@@ -21,25 +22,31 @@
2122
"moment": "^2.24.0",
2223
"prop-types": "^15.7.2",
2324
"react": "16.8.3",
25+
"react-content-loader": "^4.3.2",
2426
"react-native": "0.59.4",
2527
"react-native-action-button": "^2.8.5",
2628
"react-native-anchor-carousel": "^2.2.0",
2729
"react-native-animated-bar": "^0.2.0",
2830
"react-native-countdown-component": "^2.5.0",
31+
"react-native-datepicker": "^1.7.2",
2932
"react-native-drag-sort": "^1.3.3",
3033
"react-native-ezswiper": "^1.3.0",
3134
"react-native-gesture-handler": "^1.1.0",
3235
"react-native-iphone-x-helper": "^1.2.0",
3336
"react-native-linear-gradient": "^2.5.5",
37+
"react-native-orientation": "^3.1.3",
3438
"react-native-progress": "^3.6.0",
3539
"react-native-progress-bar": "^0.1.2",
3640
"react-native-progress-bar-animated": "^1.0.6",
3741
"react-native-reanimated": "^1.0.0",
3842
"react-native-scrollable-tab-view": "^0.10.0",
43+
"react-native-shimmer-placeholder": "^1.0.35",
3944
"react-native-snap-carousel": "^3.8.0",
4045
"react-native-svg": "^9.5.1",
46+
"react-native-video": "^4.4.4",
4147
"react-navigation": "^3.7.1",
4248
"react_native_countdowntimer": "^1.0.5",
49+
"rn-placeholder": "^3.0.0",
4350
"teaset": "^0.6.3"
4451
},
4552
"devDependencies": {

‎src/assets/imgs/icon_screen_a.png‎

3.44 KB
Loading

‎src/assets/imgs/icon_screen_b.png‎

3.51 KB
Loading

‎src/assets/imgs/icon_start.png‎

10.5 KB
Loading

‎src/assets/imgs/icon_stop.png‎

8.71 KB
Loading

‎src/assets/imgs/longpic.jpg‎

490 KB
Loading

0 commit comments

Comments
 (0)