Merge branch 'shiyunjie'

# Conflicts: # ios/BasicApp.xcodeproj/project.xcworkspace/xcuserdata/shiyunjie.xcuserdatad/UserInterfaceState.xcuserstate

Merge branch 'shiyunjie'
2827e5a2 · shiyunjie · b93193d7 · fe40ad0f · 2827e5a2 · 2827e5a2
Commit 2827e5a2 authored Jun 14, 2019 by shiyunjie
19 changed files
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -138,6 +138,8 @@ android {
 }

 dependencies {
+    implementation project(':react-native-linear-gradient')
+    implementation project(':react-native-device-info')
    implementation project(':react-native-spring-scrollview')
    implementation project(':react-native-gesture-handler')
    implementation project(':react-native-vector-icons')

--- a/android/app/src/main/java/com/basicapp/MainApplication.java
+++ b/android/app/src/main/java/com/basicapp/MainApplication.java
@@ -3,6 +3,8 @@ package com.basicapp;
 import android.app.Application;

 import com.facebook.react.ReactApplication;
+import com.BV.LinearGradient.LinearGradientPackage;
+import com.learnium.RNDeviceInfo.RNDeviceInfo;
 import com.bolan9999.SpringScrollViewPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.facebook.react.ReactNativeHost;
@@ -25,6 +27,8 @@ public class MainApplication extends Application implements ReactApplication {
    protected List<ReactPackage> getPackages() {
      return Arrays.<ReactPackage>asList(
          new MainReactPackage(),
+            new LinearGradientPackage(),
+            new RNDeviceInfo(),
            new SpringScrollViewPackage(),
            new VectorIconsPackage()
      );

--- a/android/settings.gradle
+++ b/android/settings.gradle
 rootProject.name = 'BasicApp'
+include ':react-native-linear-gradient'
+project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
+include ':react-native-device-info'
+project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-spring-scrollview'
 project(':react-native-spring-scrollview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-spring-scrollview/android')
 include ':react-native-vector-icons'

--- a/ios/BasicApp.xcodeproj/project.pbxproj
+++ b/ios/BasicApp.xcodeproj/project.pbxproj
@@ -41,8 +41,10 @@
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* BasicAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* BasicAppTests.m */; };
 		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
+		465A4413D3ED482699A0A651 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E15869FA4AC41F5BE561452 /* libRNDeviceInfo.a */; };
 		5049979F956343A58ED88DD1 /* libRNSpringScrollView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CEC7D8652E4A80BB0A6D75 /* libRNSpringScrollView.a */; };
 		511877E333E24A6A9690DB3F /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A01206684554F25837ADFFE /* FontAwesome5_Regular.ttf */; };
+		538035DE777A4D39B3996895 /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1B28C3211724CC6A2563859 /* libRNDeviceInfo-tvOS.a */; };
 		5BBCBF7EE13243DDA5CC11FF /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 523991BB6CEE47A18F8A6B54 /* Octicons.ttf */; };
 		7D086754CFF647B296C82959 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8BEF1FB779D54460BAA6C75D /* FontAwesome5_Brands.ttf */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
@@ -56,6 +58,7 @@
 		E0269ADA5BBC44C2A2589A8D /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5F631E28FD6942C7A407CD4B /* Feather.ttf */; };
 		E517C346FD214ED9A0CD7115 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3920430863AE49D79A6F7399 /* Foundation.ttf */; };
 		E519D6535682463EAF906110 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F3B75ECB13EB477DBDF9F9E9 /* EvilIcons.ttf */; };
+		E7E9E85166CA4272AB0CF4FE /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32F441FA26294BCD892AAA99 /* libBVLinearGradient.a */; };
 		ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
 		ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; };
 		FA2C9359401649E0826A9E6E /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7913101660E946E686D0066E /* Zocial.ttf */; };
@@ -349,6 +352,20 @@
 			remoteGlobalIDString = A39873CE1EA65EE60051E01A;
 			remoteInfo = "RNVectorIcons-tvOS";
 		};
+		8372B80422B3C3BB00CD0763 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 280F628730954E9B898EE601 /* BVLinearGradient.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 134814201AA4EA6300B7C361;
+			remoteInfo = BVLinearGradient;
+		};
+		8372B80622B3C3BB00CD0763 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 280F628730954E9B898EE601 /* BVLinearGradient.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 64AA15081EF7F30100718508;
+			remoteInfo = "BVLinearGradient-tvOS";
+		};
 		83A28A9722A93EAA00BC7202 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83A28A9222A93EA900BC7202 /* RNGestureHandler.xcodeproj */;
@@ -363,6 +380,20 @@
 			remoteGlobalIDString = B5C32A36220C603B000FFB8D;
 			remoteInfo = "RNGestureHandler-tvOS";
 		};
+		83F2776D22B25E860066BA73 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = DC7A0D31E6A74DA6B87DABB7 /* RNDeviceInfo.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DA5891D81BA9A9FC002B4DB2;
+			remoteInfo = RNDeviceInfo;
+		};
+		83F2776F22B25E860066BA73 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = DC7A0D31E6A74DA6B87DABB7 /* RNDeviceInfo.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = E72EC1401F7ABB5A0001BC90;
+			remoteInfo = "RNDeviceInfo-tvOS";
+		};
 		ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
@@ -395,9 +426,11 @@
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = BasicApp/main.m; sourceTree = "<group>"; };
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
 		18EC90269FAE4C86A967E3D7 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
+		280F628730954E9B898EE601 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
 		2D02E47B1E0B4A5D006451C7 /* BasicApp-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BasicApp-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E4901E0B4A5D006451C7 /* BasicApp-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "BasicApp-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		32F441FA26294BCD892AAA99 /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = "<group>"; };
 		36D26F88173E4A3CBB54E3F0 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; };
 		3920430863AE49D79A6F7399 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
 		523991BB6CEE47A18F8A6B54 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
@@ -412,15 +445,18 @@
 		8BB06A9FC75847828D9E5BE1 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
 		8BEF1FB779D54460BAA6C75D /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; };
 		99E1BFFB629F466DAB4074DD /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
+		9E15869FA4AC41F5BE561452 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = "<group>"; };
 		A45B683174C84617B17BFEB8 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
 		B07B6BBF88EF441EB7E6EA69 /* RNSpringScrollView.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSpringScrollView.xcodeproj; path = "../node_modules/react-native-spring-scrollview/ios/RNSpringScrollView.xcodeproj"; sourceTree = "<group>"; };
 		B4CEC7D8652E4A80BB0A6D75 /* libRNSpringScrollView.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSpringScrollView.a; sourceTree = "<group>"; };
 		D9B6D714CCDB47ECBCB3505A /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; };
+		DC7A0D31E6A74DA6B87DABB7 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
 		E853E9B8BDDC4E8D80A38FC9 /* libRNVectorIcons-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNVectorIcons-tvOS.a"; sourceTree = "<group>"; };
 		EC55B197E6FE4578ABA9633D /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		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; };
+		F1B28C3211724CC6A2563859 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; };
 		F3B75ECB13EB477DBDF9F9E9 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

@@ -453,6 +489,8 @@
 				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
 				2D02EAF2008D44B9AC5CF4EE /* libRNVectorIcons.a in Frameworks */,
 				5049979F956343A58ED88DD1 /* libRNSpringScrollView.a in Frameworks */,
+				465A4413D3ED482699A0A651 /* libRNDeviceInfo.a in Frameworks */,
+				E7E9E85166CA4272AB0CF4FE /* libBVLinearGradient.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -470,6 +508,7 @@
 				2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */,
 				2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */,
 				CF98CD1B1EC547B295ABD30E /* libRNVectorIcons-tvOS.a in Frameworks */,
+				538035DE777A4D39B3996895 /* libRNDeviceInfo-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -654,6 +693,8 @@
 				139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
 				18EC90269FAE4C86A967E3D7 /* RNVectorIcons.xcodeproj */,
 				B07B6BBF88EF441EB7E6EA69 /* RNSpringScrollView.xcodeproj */,
+				DC7A0D31E6A74DA6B87DABB7 /* RNDeviceInfo.xcodeproj */,
+				280F628730954E9B898EE601 /* BVLinearGradient.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -673,6 +714,9 @@
 				8BB06A9FC75847828D9E5BE1 /* libRNVectorIcons.a */,
 				E853E9B8BDDC4E8D80A38FC9 /* libRNVectorIcons-tvOS.a */,
 				B4CEC7D8652E4A80BB0A6D75 /* libRNSpringScrollView.a */,
+				9E15869FA4AC41F5BE561452 /* libRNDeviceInfo.a */,
+				F1B28C3211724CC6A2563859 /* libRNDeviceInfo-tvOS.a */,
+				32F441FA26294BCD892AAA99 /* libBVLinearGradient.a */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@@ -686,6 +730,15 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		8372B80022B3C3BB00CD0763 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8372B80522B3C3BB00CD0763 /* libBVLinearGradient.a */,
+				8372B80722B3C3BB00CD0763 /* libBVLinearGradient.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		83A28A9322A93EA900BC7202 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -722,6 +775,15 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		83F2776922B25E860066BA73 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				83F2776E22B25E860066BA73 /* libRNDeviceInfo.a */,
+				83F2777022B25E860066BA73 /* libRNDeviceInfo-tvOS.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		9BD2B364A6B64B698C46E170 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -865,6 +927,10 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
+					ProductGroup = 8372B80022B3C3BB00CD0763 /* Products */;
+					ProjectRef = 280F628730954E9B898EE601 /* BVLinearGradient.xcodeproj */;
+				},
+				{
 					ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
 					ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
 				},
@@ -913,6 +979,10 @@
 					ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
 				},
 				{
+					ProductGroup = 83F2776922B25E860066BA73 /* Products */;
+					ProjectRef = DC7A0D31E6A74DA6B87DABB7 /* RNDeviceInfo.xcodeproj */;
+				},
+				{
 					ProductGroup = 83A28A9322A93EA900BC7202 /* Products */;
 					ProjectRef = 83A28A9222A93EA900BC7202 /* RNGestureHandler.xcodeproj */;
 				},
@@ -1209,6 +1279,20 @@
 			remoteRef = 8355A88422A8ECCA00A4ECE5 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		8372B80522B3C3BB00CD0763 /* libBVLinearGradient.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libBVLinearGradient.a;
+			remoteRef = 8372B80422B3C3BB00CD0763 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		8372B80722B3C3BB00CD0763 /* libBVLinearGradient.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libBVLinearGradient.a;
+			remoteRef = 8372B80622B3C3BB00CD0763 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		83A28A9822A93EAA00BC7202 /* libRNGestureHandler.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1223,6 +1307,20 @@
 			remoteRef = 83A28A9922A93EAA00BC7202 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		83F2776E22B25E860066BA73 /* libRNDeviceInfo.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRNDeviceInfo.a;
+			remoteRef = 83F2776D22B25E860066BA73 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		83F2777022B25E860066BA73 /* libRNDeviceInfo-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libRNDeviceInfo-tvOS.a";
+			remoteRef = 83F2776F22B25E860066BA73 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1387,6 +1485,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = BasicAppTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -1396,6 +1496,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1416,6 +1519,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = BasicAppTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -1425,6 +1530,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1446,6 +1554,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = BasicApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1469,6 +1579,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = BasicApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1499,6 +1611,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = "BasicApp-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1507,6 +1621,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1536,6 +1653,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = "BasicApp-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1544,6 +1663,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1572,6 +1694,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = "BasicApp-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1580,6 +1704,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1608,6 +1735,8 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-spring-scrollview/ios/SpringScrollView",
+					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
+					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 				);
 				INFOPLIST_FILE = "BasicApp-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1616,6 +1745,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",

--- a/ios/BasicApp.xcodeproj/project.xcworkspace/xcuserdata/shiyunjie.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/ios/BasicApp.xcodeproj/project.xcworkspace/xcuserdata/shiyunjie.xcuserdatad/UserInterfaceState.xcuserstate
--- a/package.json
+++ b/package.json
@@ -15,9 +15,11 @@
    "moment": "^2.24.0",
    "react": "16.8.3",
    "react-native": "0.59.5",
+    "react-native-device-info": "^2.1.1",
    "react-native-elements": "^1.1.0",
    "react-native-gesture-handler": "^1.1.0",
    "react-native-largelist-v3": "^3.0.14",
+    "react-native-linear-gradient": "^2.5.4",
    "react-native-spring-scrollview": "^2.0.22",
    "react-native-update-mutlirn-hg": "^3.1.1",
    "react-native-vector-icons": "^6.4.2",

--- a/src/BasicNavigator/navigationStack.js
+++ b/src/BasicNavigator/navigationStack.js
@@ -8,7 +8,7 @@ import {
 } from 'react-navigation';
 import JSPage from '../jsComponent/JSPage';
 import FramePage from '../home/FramePage';
-import ThemePage from '../themePage';
+import ThemePage from '../changeThemePage';
 import NativeComponentList from '../home/NativeComponentList';
 import JSComponentList from '../home/JSComponentList';
 import NativePage from '../nativeComponent/NativePage';

--- a/src/themePage/index.js
+++ b/src/themePage/index.js
@@ -18,14 +18,14 @@ import { compose } from 'redux';
 import { push, tab } from '../BasicNavigator/actions';
 import themeType from '../theme';
 import themeAction from '../theme/action';
-
+import NavigationBar from '../components/NavigationBar';
+import BackButton from '../components/BackButton';
+import Button from '../components/ThemeButton';

 type Props = {};
 const styles = StyleSheet.create({
  container: {
    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
    backgroundColor: '#F5FCFF',
  },
  instructions: {
@@ -37,37 +37,42 @@ const styles = StyleSheet.create({


 class ThemePage extends Component<Props> {
-
  render() {
-    const { theme, setCurrentTheme } = this.props
+    const { theme, setCurrentTheme } = this.props;
    return (
      <View style={styles.container}>
-        <Text style={styles.instructions}>ThemeDemo</Text>
-        <TouchableOpacity onPress={() => {
-          setCurrentTheme(themeType.blackTheme);//Object.assign
-        }}
-        >
-          <Text style={styles.instructions, { color: theme.themeColor }}>启动黑色主题</Text>
-        </TouchableOpacity>
-        <TouchableOpacity onPress={() => {
-          setCurrentTheme(themeType.defaultTheme);//Object.assign
-        }}
-        >
-          <Text style={styles.instructions, { color: theme.themeColor }}>启动蓝色主题</Text>
-        </TouchableOpacity>
-        <TouchableOpacity onPress={() => {
-          setCurrentTheme(themeType.redTheme);//Object.assign
-        }}
-        >
-          <Text style={styles.instructions, { color: theme.themeColor }}>启动红色主题</Text>
-        </TouchableOpacity>
+        <NavigationBar
+          left={<BackButton />}
+          title="ThemeDemo"
+        />
+        <Button
+          containerStyle={{ height: 40, margin: 10 }}
+          onPress={() => {
+            setCurrentTheme(themeType.blackTheme);//Object.assign
+          }}
+          title="切换黑色主题"
+        />
+        <Button
+          containerStyle={{ height: 40, margin: 10 }}
+          onPress={() => {
+            setCurrentTheme(themeType.defaultTheme);//Object.assign
+          }}
+          title="切换蓝色主题"
+        />
+        <Button
+          containerStyle={{ height: 40, margin: 10 }}
+          onPress={() => {
+            setCurrentTheme(themeType.redTheme);//Object.assign
+          }}
+          title="切换红色主题"
+        />
      </View>
    );
  }
 }

 function propsMapping(props) {
-  const { nav, theme } = props
+  const { nav, theme } = props;
  return {
    nav,
    theme,

--- a/src/components/BackButton/index.js
+++ b/src/components/BackButton/index.js
+/**
+ * @flow
+ */
+
+import React from 'react';
+import { TouchableOpacity, View } from 'react-native';
+import { connect } from 'react-redux';
+import Index from '../BasicIcon';
+import { pop } from '../../BasicNavigator/actions';
+import StyleSheet from '../../utils/StyleSheet';
+
+
+const styles = StyleSheet.create({
+  backButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingLeft: 10,
+  },
+  buttonIOSAndroid: {
+    width: 90,
+    ios: {
+      paddingTop: 0,
+      height: 44,
+    },
+    android: {
+      paddingTop: 0,
+      height: 44,
+    },
+    justifyContent: 'center',
+  },
+})
+
+type BackButtonType = {
+  onBackPressed: ()=>void,
+  routes: Array,
+  imageUrl?: any,
+}
+
+function BackButton({ onBackPressed, imageUrl }: BackButtonType) {
+  return (
+    <TouchableOpacity
+      onPress={() => {
+        onBackPressed()
+      }}
+      style={styles.backButton}
+    >
+      <View
+        style={styles.buttonIOSAndroid}
+      >
+        <Index suite="Ionicons" name="ios-arrow-back" size={26} color="white" />
+      </View>
+    </TouchableOpacity>
+  );
+}
+
+const actionMapping = (dispatch, props) => ({
+  onBackPressed: props.onBackPressed || (() => {
+    console.log('BackButton:', props)
+    if (props.routes && props.routes.length === 1) {
+
+    } else {
+      dispatch(pop());
+    }
+  }),
+})
+export default connect(null, actionMapping)(BackButton);
--- a/src/components/BasicIcon.js
+++ b/src/components/BasicIcon.js
@@ -40,7 +40,7 @@ export type IconType = {
  size?: number,
 }

-export default function BasicIcon(props: IconType) {
+export default function Index(props: IconType) {
  const { suite, ...extraProps } = {
    color: 'white',
    size: 30,

--- a/src/components/NavigationBar/index.js
+++ b/src/components/NavigationBar/index.js
+/**
+ * @flow
+ */
+
+import React, { Element } from 'react';
+import { connect } from 'react-redux';
+import {
+  View,
+  Text,
+  Platform,
+  TouchableOpacity,
+} from 'react-native';
+import DeviceInfo from 'react-native-device-info';
+import LinearGradient from 'react-native-linear-gradient';
+import StyleSheet from '../../utils/StyleSheet';
+
+export const isLessKitKat = Platform.OS === 'android' && Platform.Version > 19;
+
+export const androidTop = isLessKitKat ? 0 : 24;
+
+const systemVersion = DeviceInfo.getSystemVersion();
+
+const styles = StyleSheet.create({
+  navBarContainer: {
+    ios: {
+      marginTop: parseInt(systemVersion, 10) < 11 ? 20 : 0,
+      height: 64,
+    },
+    android: {
+      paddingTop: androidTop,
+      height: 44 + androidTop,
+    },
+    iPad: {
+      height: 98,
+    },
+    androidPad: {
+      height: 88,
+    },
+    backgroundColor: '#0074E1',
+    // backgroundColor: 'rgb(42,85,161)',
+    flexDirection: 'row',
+  },
+  left: {
+    flex: 1,
+    flexDirection: 'row',
+  },
+  right: {
+    flex: 1,
+    flexDirection: 'row-reverse',
+  },
+  navStyle: {
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  title: {
+    textAlign: 'center',
+    phone: {
+      fontSize: 18,
+    },
+    pad: {
+      fontSize: 24,
+    },
+    color: 'white',
+    alignSelf: 'center',
+  },
+});
+
+export type NavBarPropsType = {
+  left?: Element<*>,
+  title?: string,
+  titleStyle?: Object,
+  right?: Element<*>,
+  style?: Object,
+  fontStyle?: Object,
+  onPress?: ()=>void,
+  textStyle?:Object,
+  theme:Object,
+}
+
+function NavigationBar(props: NavBarPropsType) {
+  const {
+    style, titleStyle, left, onPress, textStyle, fontStyle, title, right, theme,
+  } = props;
+  if (theme.navEndColor) {
+    return (
+      <LinearGradient
+        start={{ x: 0.0, y: 0.25 }}
+        end={{ x: 0.5, y: 1.0 }}
+        locations={[0, 1]}
+        colors={[theme.themeColor, theme.navEndColor]}
+        style={[styles.navBarContainer, { backgroundColor: theme.themeColor }, style]}
+      >
+        <View style={[styles.left, titleStyle]}>{left}</View>
+        <TouchableOpacity style={styles.navStyle} activeOpacity={1} onLongPress={onPress}>
+          <Text style={[styles.title, textStyle, fontStyle]}>{title}</Text>
+        </TouchableOpacity>
+        <View style={styles.right}>{right}</View>
+      </LinearGradient>
+    );
+  }
+  return (
+    <View style={[styles.navBarContainer, { backgroundColor: theme.themeColor }, style]}>
+      <View style={[styles.left, titleStyle]}>{left}</View>
+      <TouchableOpacity style={styles.navStyle} activeOpacity={1} onLongPress={onPress}>
+        <Text style={[styles.title, textStyle, fontStyle]}>{title}</Text>
+      </TouchableOpacity>
+      <View style={styles.right}>{right}</View>
+    </View>
+  );
+}
+
+function propsMapping({ theme }) {
+  return {
+    theme,
+  };
+}
+
+export default connect(propsMapping, null)(NavigationBar);
--- a/src/components/TabOptions/TabButton.js
+++ b/src/components/TabOptions/TabButton.js
@@ -6,7 +6,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';

 import { View, Text } from 'react-native';
-import BasicIcon from '../BasicIcon';
+import Index from '../BasicIcon';

 type Props = {}

@@ -16,7 +16,7 @@ class TabButton extends Component<Props> {
    const color = focused ? theme.themeColor : theme.Colors.charcoal;
    return (
      <View style={{ alignItems: 'center' }}>
-        <BasicIcon
+        <Index
          style={{ margin: 0, padding: 0 }}
          suite={iconSuite}
          name={tabBarIconName}

--- a/src/components/ThemeButton/index.js
+++ b/src/components/ThemeButton/index.js
+/**
+ * @flow
+ * Created by Rabbit on 2019-04-30.
+ */
+import React from 'react';
+import { connect } from 'react-redux';
+import { Button } from 'react-native-elements';
+import LinearGradient from 'react-native-linear-gradient';
+
+function ThemeButton(props) {
+  const { theme, buttonStyle } = props;
+  if (theme.navEndColor) {
+    return (
+      <Button
+        {...props}
+        ViewComponent={LinearGradient} // Don't forget this!
+        buttonStyle={[buttonStyle, { backgroundColor: theme.themeColor }]}
+        linearGradientProps={{
+          colors: [theme.themeColor, theme.navEndColor],
+          start: { x: 0, y: 0.5 },
+          end: { x: 1, y: 0.5 },
+        }}
+      />
+
+    );
+  }
+  return (
+    <Button
+      {...props}
+      buttonStyle={[buttonStyle, { backgroundColor: theme.themeColor }]}
+    />
+  );
+}
+
+function propsMapping({ theme }) {
+  return {
+    theme,
+  };
+}
+
+export default connect(propsMapping, null)(ThemeButton);
--- a/src/home/FramePage.js
+++ b/src/home/FramePage.js
@@ -13,10 +13,11 @@ import { LargeList } from 'react-native-largelist-v3';
 import {
  StyleSheet,
  Text,
-  TouchableOpacity,
  View,
 } from 'react-native';
+import Button from '../components/ThemeButton';
 import { push } from '../BasicNavigator/actions';
+import NavigationBar from '../components/NavigationBar';


 type
@@ -87,14 +88,17 @@ Row
        sContent.items.push(row);
      }
      data.push(sContent);
-
    }
    return (
      <View style={styles.container}>
-
-        <TouchableOpacity onPress={() => { this.props.push('ThemePage'); }}>
-          <Text style={styles.instructions}>Frame</Text>
-        </TouchableOpacity>
+        <NavigationBar
+          title="Frame"
+        />
+        <Button
+          containerStyle={{ height: 40, margin: 10 }}
+          onPress={() => { this.props.push('ThemePage'); }}
+          title="Frame"
+        />
        <LargeList
          style={styles.container}
          data={data}
@@ -114,6 +118,10 @@ function actionMapping(dispatch) {
    push: compose(dispatch, push),
  };
 }
-//const mapDispatchToProps = dispatch => (bindActionCreators({goNext}, dispatch))
+function propsMapping({ theme }) {
+  return {
+    theme,
+  };
+}

-export default connect(null, actionMapping)(FramePage);
+export default connect(propsMapping, actionMapping)(FramePage);
--- a/src/home/NativeComponentList.js
+++ b/src/home/NativeComponentList.js
@@ -9,21 +9,21 @@
 import React, { Component } from 'react';
 import {
  StyleSheet,
-  Text,
+  Image,
  View,
 } from 'react-native';
-
+import { WaterfallList } from 'react-native-largelist-v3';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { push } from '../BasicNavigator/actions';
+import NavigationBar from '../components/NavigationBar';

+const cookData = require('./data.json').data.list;

 type Props = {};
 const styles = StyleSheet.create({
  container: {
    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
    backgroundColor: '#F5FCFF',
  },
  instructions: {
@@ -34,11 +34,24 @@ const styles = StyleSheet.create({
 });

 class NativeComponentList extends Component<Props> {
+  state = { data: [...cookData, ...cookData, ...cookData, ...cookData, ...cookData] };
+
+  _renderItem = item => <Image source={{ uri: item.showimg }} style={{ flex: 1, margin: 5 }} />;
+
  render() {
-    console.log('ServicePage', this.props);
    return (
      <View style={styles.container}>
-          <Text style={styles.instructions}>NativeComponentList</Text>
+        <NavigationBar
+          title="NativeComponentList"
+        />
+        <WaterfallList
+          data={this.state.data}
+          heightForItem={item => SCREEN_WIDTH / Math.floor(SCREEN_HEIGHT / 150)
+            * +item.showimg_height / +item.showimg_width}
+          numColumns={2}
+          // preferColumnWidth={150}
+          renderItem={this._renderItem}
+        />
      </View>
    );
  }

--- a/src/home/data.json
+++ b/src/home/data.json
+{
+  "code": "100",
+  "sucerr": "100",
+  "msg": "\u6570\u636e\u83b7\u53d6\u6210\u529f",
+  "data": {
+    "pagemsg": {
+      "nowpage": "1",
+      "sumpage": "15",
+      "pagesize": "20",
+      "allcount": "286",
+      "sum_count": "286"
+    },
+    "list": [
+      {
+        "id": "451",
+        "vid": "451",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901241236261857428487.gif?imageView2/1/w/800/h/800&sign=c2c057b425fe293d4c4b700637b989e8&t=5c6e1959",
+        "biaoti": "\u661f\u7a7a\u6dcb\u9762\u86cb\u7cd5",
+        "jieshao": "\u989c\u503c\u4e0e\u7f8e\u5473\u7684\u7ed3\u5408\u3010\u661f\u7a7a\u6dcb\u9762\u86cb\u7cd5\u3011\u9ad8\u989c\u503c\u7684\u5b83\u8ba9\u4f60\u820d\u4e0d\u5f97\u4e0b\u53e3\uff0c\u4f46\u53ea\u8981\u4e00\u5c0f\u53e3\uff0c\u5c31\u505c\u4e0d\u4e0b\u6765\uff01\u5feb\u5feb\u8bb2\u7f8e\u4e3d\u7684\u661f\u7a7a\u5316\u4f5c\u7f8e\u5473\u7684\u86cb\u7cd5\uff0c\u732e\u7ed9\u4f60\u6700\u7231\u7684\u4eba\u5427\uff01",
+        "showimg_type": "3",
+        "maketime": "30MIN",
+        "biaotichild": "\u201c\u661f\u7a7a\u6dcb\u9762\u86cb\u7cd5\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u86cb\u7cd5\u80da\u3001\u6253\u53d1\u5976\u6cb9\u3001\u5de7\u514b\u529b\u9171\u3001\u8292\u679c\u3001\u84dd\u8393\u3001\u84dd\u8272\u98df\u7528\u8272\u7d20\u3001\u51b0\u6dc7\u6dcb\u7b52",
+        "create_datetime": "2019-01-22 15:24:18",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "450",
+        "vid": "450",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190124122529971071502.jpg?imageView2/1/w/800/h/800&sign=5964eeeacadd07b3f9b6d098d7205e76&t=5c6e1959",
+        "biaoti": "\u4e07\u5723\u8282\u8718\u86db\u82b1\u751f\u9171\u66f2\u5947",
+        "jieshao": "\u867d\u7136\u4e07\u5723\u8282\u662f\u897f\u65b9\u7684\uff0c\u4f46\u7231\u73a9\u4e4b\u5fc3\u4eba\u7686\u6709\u4e4b\uff0c\u8ba9\u6211\u4eec\u628a\u70d8\u7119\u73a9\u8d77\u6765\u5427\uff01\u65e2\u7136\u6709\u5357\u74dc\u706f\uff0c\u6709\u5973\u5deb\u624b\u6307\uff0c\u6709\u6728\u4e43\u8863\uff0c\u53c8\u600e\u80fd\u5c11\u4e86\u8718\u86db\u5462\uff0c\u5c0f\u5fc3\u5b83\u5df2\u7ecf\u5077\u5077\u722c\u5230\u4f60\u8116\u5b50\u540e\u9762\u5594(\u256c\u207d\u207d \u2070 \u207e\u207e \u0414 \u207d\u207d \u2070 \u207e\u207e)",
+        "showimg_type": "2",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u4e07\u5723\u8282\u8718\u86db\u82b1\u751f\u9171\u66f2\u5947\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9ec4\u6cb9\u3001\u7ec6\u7802\u7cd6\u3001\u9e21\u86cb\u3001\u82b1\u751f\u9171\u3001\u4f4e\u7b4b\u9762\u7c89\u3001\u6ce1\u6253\u7c89\u3001\u5c0f\u82cf\u6253\u3001\u9ea6\u4e3d\u7d20\u3001\u767d\u5de7\u514b\u529b\u3001\u9ed1\u5de7\u514b\u529b",
+        "create_datetime": "2019-01-22 15:06:33",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "449",
+        "vid": "449",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901241233011060793805.jpg?imageView2/1/w/800/h/800&sign=e56e540a93ee0c291069d0660d2027fc&t=5c6e1959",
+        "biaoti": "\u5723\u8bde\u82b1\u73af\u5708\u5708\u5305",
+        "jieshao": "\u5723\u8bde\u6811\u548c\u5723\u8bde\u82b1\u73af\u662f\u897f\u65b9\u4eba\u8fc7\u5723\u8bde\u8282\u5fc5\u4e0d\u53ef\u5c11\u7684\u4e1c\u897f\u3002\u5723\u8bde\u82b1\u73af\u9762\u5305\uff0c\u4e5f\u662f\u5723\u8bde\u8282\u5fc5\u5907\u7684\u4e00\u79cd\u4e3b\u98df\uff0c\u5145\u6ee1\u6d53\u6d53\u8282\u65e5\u6c14\u6c1b\u7684\u82b1\u73af\u9762\u5305\uff0c\u589e\u52a0\u4e86\u5723\u8bde\u8282\u7684\u8282\u65e5\u6c14\u606f\u3002",
+        "showimg_type": "2",
+        "maketime": "25MIN",
+        "biaotichild": "\u201c\u5723\u8bde\u82b1\u73af\u5708\u5708\u5305\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9ad8\u7b4b\u7c89\u3001\u7ec6\u7802\u7cd6\u3001\u76d0\u3001\u5e72\u9175\u6bcd\u3001\u725b\u5976\u3001\u9ec4\u6cb9\u3001\u62b9\u8336\u7c89\u3001\u7ea2\u4e1d\u7ed2\u6eb6\u6db2",
+        "create_datetime": "2019-01-21 14:29:21",
+        "showimg_width": "4",
+        "showimg_height": "3",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "447",
+        "vid": "447",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190124103617351053961.jpg?imageView2/1/w/800/h/800&sign=ffeb5a111c195cb92f54709694cd5721&t=5c6e1959",
+        "biaoti": "\u62b9\u8336\u767d\u5de7\u514b\u529b\u5939\u5fc3\u7403\u997c\u5e72",
+        "jieshao": "\u4e00\u6b3e\u65e0\u9ec4\u6cb9\u4f4e\u7cd6\u7684\u5c0f\u70b9\u5fc3\uff0c\u81ea\u5e26\u840c\u611f\u62db\u4eba\u559c\u6b22\uff01",
+        "showimg_type": "2",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u62b9\u8336\u767d\u5de7\u514b\u529b\u5939\u5fc3\u7403\u997c\u5e72\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u4f4e\u7b4b\u9762\u7c89\u3001\u76d0\u3001\u7ec6\u7802\u7cd6\u3001\u674f\u4ec1\u7c89\u3001\u62b9\u8336\u7c89\u3001\u7389\u7c73\u6cb9\u3001\u725b\u5976\u3001\u767d\u5de7\u514b\u529b",
+        "create_datetime": "2019-01-21 13:54:12",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "446",
+        "vid": "446",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190121134823194727132.gif?imageView2/1/w/800/h/800&sign=5fd8497d3770aa804be4153bf8a27aed&t=5c6e1959",
+        "biaoti": "\u514d\u70e4\u7206\u7c73\u82b1\u86cb\u7cd5",
+        "jieshao": "\u7a7f\u516c\u4e3b\u88d9\u7684\u5c0f\u751c\u99a8\uff0c\u7c89\u5ae9\u7cfb\u7684\u514d\u70e4\u86cb\u7cd5\uff0c\u4eca\u65e5\u4efd\u5c11\u5973\u5fc3\u6709\u70b9\u591a\u54df\uff01",
+        "showimg_type": "3",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u514d\u70e4\u7206\u7c73\u82b1\u86cb\u7cd5\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u767d\u8272\u3001\u65e0\u76d0\u9ec4\u6cb9\u3001\u54b8\u7206\u7c73\u82b1\u3001\u54b8\u7206\u7c73\u82b1\u3001\u767d\u8272\u68c9\u82b1\u7cd6\u3001\u65e0\u76d0\u9ec4\u6cb9\u3001\u5929\u84dd\u8272\u98df\u7528\u8272\u7d20\u3001\u9ed1\u5de7\u514b\u529b\u3001\u6405\u6253\u5976\u6cb9\u3001\u4f60\u6700\u559c\u6b22\u7684\u7cd6\u679c",
+        "create_datetime": "2019-01-21 10:49:01",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "438",
+        "vid": "438",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901181722421096983675.jpg?imageView2/1/w/800/h/800&sign=f9a4ba9e717f448d13d8fe0cd2330792&t=5c6e1959",
+        "biaoti": "\u5723\u8bde\u70e4\u9e21",
+        "jieshao": "\u5982\u679c\u60f3\u8981\u8fc7\u4e00\u6b21\u7eaf\u6b63\u7684\u897f\u5f0f\u5723\u8bde\u8282\uff0c\u90a3\u4e48\u6765\u4e00\u987f\u5723\u8bde\u5927\u9910\u662f\u6700\u597d\u7684\u9009\u62e9\uff0c\u800c\u5723\u8bde\u70e4\u9e21\u53c8\u662f\u5fc5\u4e0d\u53ef\u5c11\u7684\u3002\u4f20\u7edf\u7684\u5723\u8bde\u8282\u662f\u5403\u706b\u9e21\uff0c\u706b\u9e21\u5728\u6211\u4eec\u8fd9\u91cc\u4e0d\u5bb9\u6613\u4e70\u5230\uff0c\u90a3\u4e48\u5c31\u7528\u4e09\u9ec4\u9e21\u66ff\u4ee3\u5427\uff01\u4e00\u6837\u80fd\u5145\u6ee1\u8282\u65e5\u7684\u559c\u5e86\u6c14\u6c1b\u3002",
+        "showimg_type": "2",
+        "maketime": "40MIN",
+        "biaotichild": "\u201c\u5723\u8bde\u70e4\u9e21\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u6574\u9e21\u3001\u80e1\u841d\u535c\u3001\u6d0b\u8471\u3001\u571f\u8c46\u3001\u9ec4\u6cb9\u3001\u610f\u5f0f\u7efc\u5408\u9999\u6599\u3001\u5c0f\u756a\u8304\u3001\u8ff7\u8fed\u9999\u3001\u767e\u91cc\u9999\u3001\u6a44\u6984\u6cb9",
+        "create_datetime": "2019-01-16 17:18:54",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "437",
+        "vid": "437",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190123135058100581623.gif?imageView2/1/w/800/h/800&sign=c9688912ebd6cbc590b617ed5a3c3de9&t=5c6e1959",
+        "biaoti": "\u725b\u6cb9\u679c\u7c73\u996d\u5854",
+        "jieshao": "\u6625\u5929\u79bb\u4e0d\u5f00\u5ae9\u7eff\u7684\u8272\u5f69\uff0c\u770b\u7740\u5c31\u8ba9\u4eba\u8212\u670d\uff0c\u4e00\u4e2a\u725b\u6cb9\u679c\uff0c\u4e00\u5c0f\u7897\u7cd9\u7c73\u996d\uff0c\u52a0\u4e0a\u4e9b\u4e9b\u575a\u679c\uff0c\u7b80\u5355\u53c8\u4e0d\u5931\u8425\u517b\u7684\u4e00\u9910\u3002",
+        "showimg_type": "3",
+        "maketime": "23MIN",
+        "biaotichild": "\u201c\u725b\u6cb9\u679c\u7c73\u996d\u5854\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u725b\u6cb9\u679c\u3001\u6a44\u6984\u6cb9\u3001\u9ed1\u80e1\u6912\u7c89\u3001\u76d0\u3001\u7cd9\u7c73\u996d\u3001\u9ed1\u767d\u829d\u9ebb\u3001\u674f\u4ec1\u788e\u3001\u6838\u6843\u7247\u3001\u8584\u8377\u53f6",
+        "create_datetime": "2019-01-16 16:22:50",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "436",
+        "vid": "436",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190121103322669581969.jpg?imageView2/1/w/800/h/800&sign=6f664bc1452a835c65b6ea333531c526&t=5c6e1959",
+        "biaoti": "\u9e1f\u5de2\u86cb",
+        "jieshao": "\u9e4c\u9e51\u86cb\u7a0d\u70b8\u540e\uff0c\u8868\u76ae\u8d77\u76b1\u6210\u864e\u76ae\uff0c\u9762\u6761\u70b8\u5236\u540e\u53e3\u611f\u8ddf\u5e72\u8106\u9762\u4e00\u6837\uff0c\u6dcb\u4e0a\u559c\u6b22\u7684\u5176\u4ed6\u9171\u6c41\u6216\u8005\u9ad8\u6c64\u852c\u83dc\u6c41\uff0c\u4e0d\u4ec5\u751f\u52a8\u6709\u8da3\uff0c\u5473\u9053\u4e00\u5b9a\u4e5f\u4e0d\u4f1a\u8ba9\u4f60\u5931\u671b\u3002",
+        "showimg_type": "2",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u9e1f\u5de2\u86cb\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9e4c\u9e51\u86cb\u3001\u9f99\u987b\u9762\u3001\u6cb9",
+        "create_datetime": "2019-01-16 16:11:36",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "435",
+        "vid": "435",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190118172329159033335.jpg?imageView2/1/w/800/h/800&sign=e2d5c226d95576fe5bf03148f0af380a&t=5c6e1959",
+        "biaoti": "\u8001\u5317\u4eac\u829d\u9ebb\u706b\u70e7",
+        "jieshao": "\u81ea\u5236\u8001\u5317\u4eac\u829d\u9ebb\u706b\u70e7\uff0c\u54ac\u4e00\u53e3\u9165\u8106\u6389\u6e23\uff0c\u91cc\u9762\u5f88\u591a\u5c42\uff0c\u6912\u76d0\u3001\u829d\u9ebb\u9171\uff0c\u9762\u9999\u6251\u9f3b\u3002\u8fd9\u6837\u7684\u70e7\u997c\uff0c\u518d\u5939\u5165\u5bc6\u5236\u7684\u7096\u8089\uff0c\u51fa\u53bb\u652f\u4e2a\u5c0f\u644a\u80af\u5b9a\u8d5a\u5927\u94b1\uff01\u4f60\u6210\u4e3a\u5bb6\u5ead\u53a8\u795e\u7684\u6807\u5fd7\u6027\u4f5c\u54c1\uff0c\u505a\u8d77\u6765\u5374\u5e76\u4e0d\u90a3\u4e48\u96be\uff0c\u5b66\u8d77\u6765\u5427\uff01",
+        "showimg_type": "2",
+        "maketime": "30MIN",
+        "biaotichild": "\u201c\u8001\u5317\u4eac\u829d\u9ebb\u706b\u70e7\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9762\u7c89\u3001\u829d\u9ebb\u9171\u3001\u5364\u8089\u3001\u9175\u6bcd\u3001\u6c34\u3001\u6912\u76d0\u3001\u9171\u6cb9\u3001\u676d\u6912\u3001\u9999\u83dc\u3001\u767d\u829d\u9ebb",
+        "create_datetime": "2019-01-09 16:59:44",
+        "showimg_width": "4",
+        "showimg_height": "3",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "434",
+        "vid": "434",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190109163723319290727.jpg?imageView2/1/w/800/h/800&sign=3727caa94e0c937165b425bdb90b448f&t=5c6e1959",
+        "biaoti": "\u5377\u53d1\u5a03\u5a03\u521b\u610f\u87ba\u4e1d\u610f\u9762",
+        "jieshao": "\u53ef\u7231\u7684\u201c\u5377\u53d1\u5a03\u5a03\u521b\u610f\u87ba\u4e1d\u610f\u9762\u201d\uff0c\u5b9d\u5b9d\u770b\u5230\u5927\u547c\u53ef\u7231\u3002\u5de7\u624b\u5988\u5988\u4eec\u8fd8\u53ef\u4ee5\u6539\u53d8\u98df\u6750\u7684\u7684\u79cd\u7c7b\uff0c\u548c\u5b9d\u5b9d\u4eec\u4e00\u8d77\u5e2e\u5a03\u5a03\u6362\u53d1\u578b\u3002",
+        "showimg_type": "1",
+        "maketime": "30MIN",
+        "biaotichild": "\u201c\u5377\u53d1\u5a03\u5a03\u521b\u610f\u87ba\u4e1d\u610f\u9762\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u87ba\u4e1d\u610f\u9762\u3001\u9e21\u80f8\u8089\u3001\u6599\u9152\u3001\u751f\u62bd\u3001\u9ed1\u80e1\u6912\u3001\u6dc0\u7c89\u3001\u8c4c\u8c46\u3001\u7389\u7c73\u7c92\u3001\u756a\u8304\u3001\u80e1\u841d\u535c",
+        "create_datetime": "2019-01-09 16:36:59",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "433",
+        "vid": "433",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901221202451092510794.gif?imageView2/1/w/800/h/800&sign=419c244dddc2ed5905407191e4dfa75f&t=5c6e1959",
+        "biaoti": "\u6c99\u62c9\u9e21\u80f8\u5854",
+        "jieshao": "\u8fd9\u6b21\u7ed9\u5927\u5bb6\u5e26\u6765\u6709\u4e3b\u98df\u3001\u6709\u852c\u83dc\u4e5f\u6709\u8089\u7684\u6c99\u62c9\u5854\uff0c\u9002\u5408\u4e00\u4e2a\u5973\u751f\u7684\u996d\u91cf\u3002\u505a\u6cd5\u7b80\u5355\uff0c\u989c\u503c\u591f\u7528\uff0c\u975e\u5e38\u9002\u5408\u670b\u53cb\u5708\u7684\u53a8\u827a\u79c0\u3002",
+        "showimg_type": "3",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u6c99\u62c9\u9e21\u80f8\u5854\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u5c71\u836f\u6ce5\u3001\u6d0b\u8471\u3001\u9e21\u80f8\u8089\u3001\u5c0f\u756a\u8304\u3001\u756a\u8304\u9171\u3001\u869d\u6cb9\u3001\u6c34\u3001\u70e7\u70e4\u9171",
+        "create_datetime": "2019-01-09 16:18:40",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "432",
+        "vid": "432",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901181735581569397352.jpg?imageView2/1/w/800/h/800&sign=31d3622ae4327e4c7fd3d1681e5da881&t=5c6e1959",
+        "biaoti": "\u6b22\u4e50\u5c0f\u72ee\u5b50\u610f\u9762",
+        "jieshao": "\u4e3a\u5b69\u5b50\u4e13\u95e8\u8bbe\u8ba1\u7684\u8425\u517b\u9910\uff0c\u9e21\u86cb\u548c\u610f\u9762\u7684\u7ec4\u5408\uff0c\u989c\u503c\u7206\u8868\uff0c\u8425\u517b\u4e30\u5bcc\uff0c\u8ba9\u5b69\u5b50\u7231\u4e0a\u5403\u996d\u3002",
+        "showimg_type": "2",
+        "maketime": "25MIN",
+        "biaotichild": "\u201c\u6b22\u4e50\u5c0f\u72ee\u5b50\u610f\u9762\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9e21\u86cb\u3001\u87ba\u72b6\u610f\u9762\u3001\u6cb9\u3001\u756a\u8304\u9171\u3001\u5c0f\u756a\u8304\u3001\u6d77\u82d4\u3001\u5976\u916a\u3001\u9ec4\u74dc",
+        "create_datetime": "2019-01-09 15:57:48",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "431",
+        "vid": "431",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190121103953406824794.jpg?imageView2/1/w/800/h/800&sign=b11b0c177062679a5475bcd3e1b1a71f&t=5c6e1959",
+        "biaoti": "\u86cb\u62b1\u867e\u997a",
+        "jieshao": "\u4eca\u5929\u7684\u3010\u86cb\u62b1\u867e\u997a\u3011\uff0c\u6837\u5b50\u53ef\u7231\u957f\u7740\u4e2a\u5c0f\u5c3e\u5df4\uff0c\u5473\u9053\u4e5f\u8ddf\u666e\u901a\u7684\u84b8\u997a\u4e0d\u80fd\u540c\u65e5\u800c\u8bed\u3002\u997a\u5b50\u91cc\u5305\u7740\u8089\u9985\u548c\u4e00\u6574\u53ea\u867e\uff0c\u54ac\u4e0b\u53bb\u53e3\u611f\u4e30\u5bcc\uff0c\u867e\u5f39\u5f39\u7684\uff0c\u8089\u9985\u8fd8\u80fd\u8e66\u51fa\u6c41\u513f\u3002 \u5176\u5b9e\u6211\u66f4\u4eab\u53d7\u505a\u84b8\u997a\u7684\u8fc7\u7a0b\uff0c\u628a\u867e\u7801\u8fdb\u8089\u9985\u91cc\u518d\u5305\u6210\u997a\u5b50\u4e22\u8fdb\u9505\u91cc\uff0c\u770b\u7740\u867e\u5c3e\u6162\u6162\u53d8\u6210\u597d\u770b\u7684\u7ea2\uff0c\u95fb\u7740\u6251\u9f3b\u800c\u6765\u7684\u9999\u6c14\uff0c\u5012\u5165\u86cb\u6db2\uff0c\u7b49\u5b83\u6162\u6162\u51dd\u56fa\u3002 \u8fd9\u65f6\u8c03\u4e00\u5c0f\u7897\u8638\u6599\uff0c\u522b\u4eba\u90fd\u7231\u5728\u918b\u91cc\u52a0\u70b9\u8fa3\u5b50\uff0c\u800c\u6211\u76f8\u53cd\uff0c\u6211\u6bd4\u8f83\u559c\u6b22\u8fa3\u5b50\u91cc\u52a0\u4e00\u70b9\u918b\uff0c\u8fd9\u6837\u624d\u591f\u5473\u3002",
+        "showimg_type": "2",
+        "maketime": "25MIN",
+        "biaotichild": "\u201c\u86cb\u62b1\u867e\u997a\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9e21\u86cb\u3001\u867e\u3001\u732a\u8089\u9985\u3001\u997a\u5b50\u76ae\u3001\u80e1\u841d\u535c\u4e01\u3001\u9e21\u7cbe\u3001\u6cb9\u3001\u6c34",
+        "create_datetime": "2019-01-09 15:30:11",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "430",
+        "vid": "430",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/2019011817405134987031.jpg?imageView2/1/w/800/h/800&sign=0c416d8971266282c1147d9847a6f6cc&t=5c6e1959",
+        "biaoti": "\u5b9d\u5b9d\u4e94\u5f69\u7092\u996d",
+        "jieshao": "\u201c\u5b9d\u5b9d\u4e94\u5f69\u7092\u996d\u201c\uff0c\u201d\u4e00\u4e2a\u80fd\u628a\u5f69\u8679\u88c5\u8fdb\u76d8\u5b50\u7684\u7092\u996d\uff0c\u5c0f\u5b69\u5b50\u559c\u6b22\uff0c\u5927\u5b69\u5b50\u66f4\u7231\u3002",
+        "showimg_type": "1",
+        "maketime": "25MIN",
+        "biaotichild": "\u201c\u5b9d\u5b9d\u4e94\u5f69\u7092\u996d\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u7d2b\u7518\u84dd\u3001\u57f9\u6839\u3001\u7389\u7c73\u8c4c\u8c46\u3001\u9e21\u86cb\u3001\u6d0b\u8471\u3001\u76d0\u3001\u9ec4\u6cb9\u3001\u7c73\u996d\u3001\u6cb9",
+        "create_datetime": "2019-01-09 15:11:31",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "429",
+        "vid": "429",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190109111546192570000.jpg?imageView2/1/w/800/h/800&sign=299ea4f41fb8bef54d1a012d92998f85&t=5c6e1959",
+        "biaoti": "\u7d2b\u85af\u9178\u5976\u71d5\u9ea6\u5854",
+        "jieshao": "\u7d2b\u85af\u4e2d\u542b\u6709\u4e30\u5bcc\u7684\u82b1\u9752\u7d20\u548c\u7852\u5143\u7d20\uff0c\u6709\u5229\u4e8e\u5b9d\u5b9d\u7684\u89c6\u529b\u53d1\u80b2\u548c\u667a\u529b\u53d1\u80b2\uff0c\u9178\u5976\u542b\u670920\u591a\u79cd\u8425\u517b\u7d20\uff0c\u5176\u4e2d\u9499\u8d28\u548c\u4e73\u9178\u7684\u642d\u914d\uff0c\u80fd\u4fc3\u8fdb\u9499\u7684\u5438\u6536\uff1b\u9178\u5976\u4e2d\u7684\u534a\u4e73\u7cd6\u80fd\u4fc3\u8fdb\u5b9d\u5b9d\u5927\u8111\u53d1\u80b2\uff1b\u4e73\u9178\u83cc\u80fd\u63d0\u9ad8\u5b9d\u5b9d\u514d\u75ab\u529b\uff0c\u8fd8\u80fd\u9884\u9632\u4fbf\u79d8\uff0c\u518d\u52a0\u4e0a\u6c34\u679c\u8c37\u7269\u5373\u98df\u71d5\u9ea6\uff0c\u8425\u517b\u5c31\u66f4\u4e30\u5bcc\u5566\uff01",
+        "showimg_type": "1",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u7d2b\u85af\u9178\u5976\u71d5\u9ea6\u5854\u201d\u7684",
+        "shicaititle": "\u7d2b\u85af\u3001\u9178\u5976\u3001\u71d5\u9ea6\u3001\u8513\u8d8a\u8393\u5e72\u3001\u7315\u7334\u6843",
+        "create_datetime": "2019-01-09 11:08:49",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "428",
+        "vid": "428",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901141755231844579794.gif?imageView2/1/w/800/h/800&sign=fdad07299493801f2b0df7cf59a30366&t=5c6e1959",
+        "biaoti": "\u4e07\u5723\u8282\u641e\u602a\u6ce1\u8299",
+        "jieshao": "\u4e07\u5723\u8282\u9664\u4e86\u72c2\u6b22\u805a\u4f1a\u5916\uff0c\u662f\u4e0d\u662f\u8fd8\u5e94\u8be5\u6765\u70b9\u5e26\u5976\u6cb9\u9985\u7684\u5c0f\u70b9\u5fc3\u6765\u70d8\u6258\u4e00\u4e0b\u8282\u65e5\u7684\u6c14\u6c1b\uff1f\u4e0b\u9762\u6211\u6765\u4ecb\u7ecd\u4e0b\u8fd9\u6b3e\u5e94\u666f\u7684\u201c\u201d\u4e07\u5723\u8282\u641e\u602a\u6ce1\u8299\u201c\u201d\u3002",
+        "showimg_type": "3",
+        "maketime": "30MIN",
+        "biaotichild": "\u201c\u4e07\u5723\u8282\u641e\u602a\u6ce1\u8299\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u4f4e\u7b4b\u7c89\u3001\u9e21\u86cb\u3001\u9ec4\u6cb9\u3001\u725b\u5976\u3001\u6c34\u3001\u7ec6\u7802\u7cd6\u3001\u76d0\u3001\u6811\u8393\u6d46\u679c\u3001\u53d1\u6ce1\u5976\u6cb9\u3001\u9ed1\u5de7\u514b\u529b",
+        "create_datetime": "2019-01-09 10:46:05",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "427",
+        "vid": "427",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901181155511586109963.jpg?imageView2/1/w/800/h/800&sign=dba4fc161530459cf83ad4f264479453&t=5c6e1959",
+        "biaoti": "\u6c99\u742a\u739b",
+        "jieshao": "\u6559\u7ed9\u5927\u5bb6\u4e00\u4e2a\u4e0d\u7528\u70e4\u7bb1\u4e5f\u4e0d\u7528\u5176\u4ed6\u7535\u5668\u7684\u751c\u70b9\uff0c\u8ba9\u8fd8\u5728\u89c2\u671b\u8981\u4e0d\u8981\u51fa\u624b\u7684\u7119\u53cb\u4eec\u5148\u8bd5\u8bd5\u6c34\u3002 \u8fd9\u4e2a\u751c\u70b9\u5c31\u662f\u5927\u5bb6\u6700\u5e38\u89c1\u7684\u6c99\u742a\u739b\uff0c\u6211\u5bb6\u7684\u8001\u4eba\u548c\u5c0f\u670b\u53cb\u90fd\u559c\u6b22\u5403\u3002 \u4e0d\u77e5\u9053\u5927\u5bb6\u8fd8\u8bb0\u4e0d\u8bb0\u5f97\u5f53\u5e74\u6709\u4e2a\u6c99\u742a\u739b\u7684\u5e7f\u544a\uff0c\u5c31\u662f\u7279\u5199\u4e24\u9897\u9e21\u86cb\u6253\u5230\u9762\u7c89\u91cc\u7684\u573a\u666f\uff0c\u76f4\u63a5\u8ba9\u6211\u8bb0\u4f4f\u4e86\u8fd9\u79cd\u5f88\u751c\u871c\u7684\u98df\u7269\u3002 \u67e5\u4e86\u4e0b\u8d44\u6599\uff0c\u6c99\u742a\u739b\u6700\u65e9\u8fd8\u662f\u6e90\u81ea\u6ee1\u65cf\u7684\u4e00\u79cd\u98df\u7269\uff0c\u5e94\u8be5\u53eb\u8428\u742a\u739b\u624d\u5bf9\uff0c\u662f\u5317\u4eac\u8457\u540d\u4eac\u5f0f\u56db\u5b63\u7cd5\u70b9\u4e4b\u4e00\u3002",
+        "showimg_type": "2",
+        "maketime": "25MIN",
+        "biaotichild": "\u201c\u6c99\u742a\u739b\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9762\u7c89\u3001\u9e21\u86cb\u3001\u76d0\u3001\u6ce1\u6253\u7c89\u3001\u6c34\u3001\u7ec6\u7802\u7cd6\u3001\u8702\u871c\u3001\u767d\u829d\u9ebb\u3001\u9ed1\u829d\u9ebb\u3001\u5404\u79cd\u575a\u679c\u4ec1",
+        "create_datetime": "2019-01-09 09:55:17",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "426",
+        "vid": "426",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/20190114191646263101152.jpg?imageView2/1/w/800/h/800&sign=cedd5071c63b900462817a3e194a1f55&t=5c6e1959",
+        "biaoti": "\u5c71\u836f\u7ea2\u67a3\u6842\u5706\u7cd6\u6c34",
+        "jieshao": "\u51ac\u5929\u5230\u4e86\uff0c\u4e5f\u5c31\u5230\u4e86\u8eab\u4f53\u4e0d\u8865\u4e0d\u884c\u7684\u65f6\u5019\uff0c\u4e0d\u7136\u600e\u4e48\u62b5\u5fa1\u5bd2\u51b7\u7684\u51ac\u5b63\u3002\u8d76\u7d27\u8ddf\u6211\u4e00\u8d77\u6765\u505a\u4e00\u6b3e\u975e\u5e38\u6ecb\u8865\u7684\u9753\u6c64\uff0c\u505a\u6cd5\u8d85\u7ea7\u7b80\u5355\u54e6\uff01\u6b64\u6c64\u4e0d\u4f46\u53ef\u4ee5\u517b\u8840\u5b89\u795e\u3001\u76ca\u667a\u5b81\u5fc3\u3001\u5ef6\u7f13\u8870\u8001\u3001\u5065\u813e\u517b\u80c3\u8865\u80be\uff0c\u8fd8\u662f\u62b5\u5fa1\u4e25\u5bd2\u3001\u6696\u8eab\u7684\u7f8e\u5473\u7ca5\u54c1\u3002",
+        "showimg_type": "2",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u5c71\u836f\u7ea2\u67a3\u6842\u5706\u7cd6\u6c34\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u5c71\u836f\u3001\u7ea2\u67a3\u3001\u51b0\u7cd6\u3001\u67b8\u675e\u3001\u6842\u5706",
+        "create_datetime": "2019-01-08 17:39:10",
+        "showimg_width": "4",
+        "showimg_height": "3",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "425",
+        "vid": "425",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901241646551940369452.jpg?imageView2/1/w/800/h/800&sign=ca209179c1e7e685cc5bb7c07145b5f9&t=5c6e1959",
+        "biaoti": "\u718a\u5b69\u5b50",
+        "jieshao": "\u516d\u4e00\u513f\u7ae5\u8282\uff0c\u4e70\u793c\u7269\u4e0d\u5982\u7ed9\u5b69\u5b50\u4eb2\u624b\u505a\u4e00\u4efd\u7b80\u5355\u6709\u521b\u610f\u7684\u513f\u7ae5\u8282\u5927\u9910\uff0c\u8ba9\u4ed6\u4eec\u8fc7\u4e00\u4e2a\u96be\u5fd8\u7684\u8282\u65e5\u3002",
+        "showimg_type": "2",
+        "maketime": "25MIN",
+        "biaotichild": "\u201c\u718a\u5b69\u5b50\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u9e21\u80f8\u8089\u3001\u80e1\u841d\u535c\u3001\u571f\u8c46\u3001\u674f\u9c8d\u83c7\u3001\u82b9\u83dc\u3001\u5496\u55b1\u5757\u3001\u76d0\u3001\u756a\u8304\u6c41\u3001\u767d\u7802\u7cd6",
+        "create_datetime": "2019-01-08 17:08:12",
+        "showimg_width": "1",
+        "showimg_height": "1",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      },
+      {
+        "id": "424",
+        "vid": "424",
+        "flag": "1",
+        "showimg": "http://cdn.sixtyvideoimg.60video.net/201901241145481235626316.jpg?imageView2/1/w/800/h/800&sign=9eb010f7af125d2191fdb172abfe4dcf&t=5c6e1959",
+        "biaoti": "\u897f\u74dc\u98ce\u996d\u56e2",
+        "jieshao": "\u4e0d\u77e5\u9053\u4e3a\u4ec0\u4e48\u603b\u60f3\u5403\u897f\u74dc\uff0c\u4f46\u662f\u897f\u74dc\u5403\u591a\u4e86\u5bb9\u6613\u62c9\u809a\u5b50\uff0c\u8fd9\u4e0d\u628a\u7c73\u996d\u505a\u6210\u897f\u74dc\uff0c\u4e0d\u5149\u989c\u8272\u6f02\u4eae\uff0c\u8425\u517b\u8fd8\u4e30\u5bcc\u7740\u5462\uff0c\u54b1\u5bb6\u7684\u897f\u74dc\u80fd\u5f53\u4e3b\u98df\u5403\uff0c\u518d\u4e5f\u4e0d\u6015\u5403\u4e86\u62c9\u809a\u5b50\u4e86\u3002",
+        "showimg_type": "2",
+        "maketime": "20MIN",
+        "biaotichild": "\u201c\u897f\u74dc\u98ce\u996d\u56e2\u201d\u7684\u7b80\u5355\u505a\u6cd5",
+        "shicaititle": "\u7c73\u996d\u3001\u7d2b\u82cf\u53f6\u3001\u7ea2\u59dc\u4e1d\u3001\u8513\u8d8a\u8393\u5e72\u3001\u76d0",
+        "create_datetime": "2019-01-08 16:51:59",
+        "showimg_width": "3",
+        "showimg_height": "4",
+        "coll": "2",
+        "vtype": "1",
+        "classify": "",
+        "adv": 0
+      }
+    ]
+  }
+}
--- a/src/theme/default/index.js
+++ b/src/theme/default/index.js
@@ -7,8 +7,9 @@ import Metrics from '../Metrics';
 import Images from '../Images';
 import ApplicationStyles from '../ApplicationStyles';

-const themeColor = Colors.facebook
+const themeColor = '#0091FF';
+const navEndColor = '#00C7FD';

 export default {
-  Colors, Fonts, Images, Metrics, ApplicationStyles, themeColor,
+  Colors, Fonts, Images, Metrics, ApplicationStyles, themeColor, navEndColor,
 };
--- a/src/theme/red/index.js
+++ b/src/theme/red/index.js
@@ -7,8 +7,9 @@ import Metrics from '../Metrics';
 import Images from '../Images';
 import ApplicationStyles from '../ApplicationStyles';

-const themeColor = Colors.fire
+const themeColor = '#F52F52';
+const navEndColor = '#F65542';

 export default {
-  Colors, Fonts, Images, Metrics, ApplicationStyles, themeColor
+  Colors, Fonts, Images, Metrics, ApplicationStyles, themeColor, navEndColor,
 };
--- a/yarn.lock
+++ b/yarn.lock
@@ -6280,6 +6280,11 @@ react-native-debugger-open@^0.3.19:
    minimist "^1.2.0"
    semver "^5.4.1"

+react-native-device-info@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-2.1.1.tgz#c6ddc022033756a5e4c5899eb83e390b5a18cc17"
+  integrity sha512-H0qq9UdP3zGESYH4HMPuv2A/FwOMszVbktj0JWuT/eVhW97PyRkYcobhFd1ggW0U+ksVSewSyX+JenQejGp7+w==
+
 react-native-elements@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/react-native-elements/-/react-native-elements-1.1.0.tgz#f99bcda4459a886f3ab4591c684c099d37aedf2b"
@@ -6307,6 +6312,11 @@ react-native-largelist-v3@^3.0.14:
  resolved "https://registry.yarnpkg.com/react-native-largelist-v3/-/react-native-largelist-v3-3.0.14.tgz#0b03dc588ed90f90432361f91ffa26d8e529e7c0"
  integrity sha512-eom9InjkKCGjFESft3/BmkNttV3EFOhSisd4DKDe/dAaj0+ySt+ukUTSv9AVnLim6HW3MiUkfNgMBxckoVyDqg==

+react-native-linear-gradient@^2.5.4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/react-native-linear-gradient/-/react-native-linear-gradient-2.5.4.tgz#dce133526f5a5510a639af94544f1ed0c984bd1e"
+  integrity sha512-FF1NhlerA4uBiS0gFIHa4FBp8/aftv4vPj14Y47lGNkYjSI94tnI6oYO3EfUxXjEyCUPiOVNKZOB9kScyjc5Ew==
+
 react-native-ratings@^6.3.0:
  version "6.3.1"
  resolved "https://registry.yarnpkg.com/react-native-ratings/-/react-native-ratings-6.3.1.tgz#4e4bd87f376423dc62c933f570fc1932c78adaa4"