Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive

左丞
2 parents 9d367c56 aa722845
Showing 55 changed files with 1010 additions and 74 deletions Show diff stats
YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj
YouerLiveVideo/YouerLiveVideo.xcodeproj/project.xcworkspace/xcuserdata/Manger.xcuserdatad/UserInterfaceState.xcuserstate
YouerLiveVideo/YouerLiveVideo.xcodeproj/project.xcworkspace/xcuserdata/jun.xcuserdatad/UserInterfaceState.xcuserstate
YouerLiveVideo/YouerLiveVideo/AppDelegate.swift
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_courseList.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_courseList.imageset/资源.png
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_hotcourse.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_hotcourse.imageset/热门微课.png
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_ranking.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_ranking.imageset/排行.png
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_television.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/homepage_television.imageset/图标_28.png
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/icon_back.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/icon_back.imageset/返回.png
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/icon_courseList.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/icon_courseList.imageset/图标_24.png
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/icon_download.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/icon_download.imageset/下载数量.png
@@ -146,6 +146,10 @@
 		BF6977981E2DEC98006FA934 /* userId.png in Resources */ = {isa = PBXBuildFile; fileRef = BF6977951E2DEC98006FA934 /* userId.png */; };
 		BF6977991E2DEC98006FA934 /* userPassword.png in Resources */ = {isa = PBXBuildFile; fileRef = BF6977961E2DEC98006FA934 /* userPassword.png */; };
 		BF7722F31ED283D400226D44 /* FilterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7722F21ED283D400226D44 /* FilterViewController.swift */; };
+		BF7722F71ED3C3CD00226D44 /* FilterView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF7722F61ED3C3CD00226D44 /* FilterView.xib */; };
+		BF7722F91ED3C3E900226D44 /* FilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7722F81ED3C3E900226D44 /* FilterView.swift */; };
+		BF7722FC1ED3C54B00226D44 /* FilterCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7722FA1ED3C54B00226D44 /* FilterCollectionViewCell.swift */; };
+		BF7722FD1ED3C54B00226D44 /* FilterCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF7722FB1ED3C54B00226D44 /* FilterCollectionViewCell.xib */; };
 		BF7B75961E305A6D0011D5C7 /* MJRefreshAutoFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7B756A1E305A6D0011D5C7 /* MJRefreshAutoFooter.m */; };
 		BF7B75971E305A6D0011D5C7 /* MJRefreshBackFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7B756C1E305A6D0011D5C7 /* MJRefreshBackFooter.m */; };
 		BF7B75981E305A6D0011D5C7 /* MJRefreshComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7B756E1E305A6D0011D5C7 /* MJRefreshComponent.m */; };
@@ -472,6 +476,10 @@
 		BF6977951E2DEC98006FA934 /* userId.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = userId.png; sourceTree = "<group>"; };
 		BF6977961E2DEC98006FA934 /* userPassword.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = userPassword.png; sourceTree = "<group>"; };
 		BF7722F21ED283D400226D44 /* FilterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterViewController.swift; sourceTree = "<group>"; };
+		BF7722F61ED3C3CD00226D44 /* FilterView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterView.xib; sourceTree = "<group>"; };
+		BF7722F81ED3C3E900226D44 /* FilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterView.swift; sourceTree = "<group>"; };
+		BF7722FA1ED3C54B00226D44 /* FilterCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterCollectionViewCell.swift; sourceTree = "<group>"; };
+		BF7722FB1ED3C54B00226D44 /* FilterCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterCollectionViewCell.xib; sourceTree = "<group>"; };
 		BF7B75691E305A6D0011D5C7 /* MJRefreshAutoFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MJRefreshAutoFooter.h; sourceTree = "<group>"; };
 		BF7B756A1E305A6D0011D5C7 /* MJRefreshAutoFooter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MJRefreshAutoFooter.m; sourceTree = "<group>"; };
 		BF7B756B1E305A6D0011D5C7 /* MJRefreshBackFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MJRefreshBackFooter.h; sourceTree = "<group>"; };
@@ -638,6 +646,7 @@
 				59AE3DFA1ECECD7D003E2C62 /* LiveInforViewController.swift */,
 				59AE3DFC1ECED5B1003E2C62 /* MoivePlayerViewController.swift */,
 				597185B41ECA990C00D7F478 /* Resource.storyboard */,
+				BF7722F51ED3C3A500226D44 /* View */,
 			);
 			path = Resource;
 			sourceTree = "<group>";
@@ -1070,6 +1079,17 @@
 			path = SVProgressHUD;
 			sourceTree = "<group>";
 		};
+		BF7722F51ED3C3A500226D44 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				BF7722F81ED3C3E900226D44 /* FilterView.swift */,
+				BF7722F61ED3C3CD00226D44 /* FilterView.xib */,
+				BF7722FA1ED3C54B00226D44 /* FilterCollectionViewCell.swift */,
+				BF7722FB1ED3C54B00226D44 /* FilterCollectionViewCell.xib */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		BF7B75671E305A6D0011D5C7 /* MJRefresh */ = {
 			isa = PBXGroup;
 			children = (
@@ -1430,6 +1450,7 @@
 				599B2CDB1DE52F7E00B4F7FD /* read_me.txt in Resources */,
 				59BA13551E25D8DB00540DE0 /* video_brightness_bg@2x.png in Resources */,
 				59BA13491E25D8DB00540DE0 /* movieForward.png in Resources */,
+				BF7722FD1ED3C54B00226D44 /* FilterCollectionViewCell.xib in Resources */,
 				BFF5F4801DD5AA5C00D33B89 /* 竖屏.png in Resources */,
 				599B2CDC1DE52F7E00B4F7FD /* README.txt in Resources */,
 				BFF5F4811DD5AA5C00D33B89 /* 编辑.png in Resources */,
@@ -1446,6 +1467,7 @@
 				5904FC501ECA8B8C00E631FF /* TVStation.storyboard in Resources */,
 				BF3E4A771E2F30B700D90659 /* 观看人数.png in Resources */,
 				599B2CDF1DE52F7E00B4F7FD /* UMSocialSDKResources.bundle in Resources */,
+				BF7722F71ED3C3CD00226D44 /* FilterView.xib in Resources */,
 				BFF5F4901DD5B7CA00D33B89 /* Info-tvOS.plist in Resources */,
 				BFF5F4711DD5AA5C00D33B89 /* attach_file.png in Resources */,
 				599B2CD81DE52F7E00B4F7FD /* WeiboSDK.bundle in Resources */,
@@ -1496,6 +1518,7 @@
 				BF7B75A21E305A6D0011D5C7 /* MJRefreshNormalHeader.m in Sources */,
 				BF7B75991E305A6D0011D5C7 /* MJRefreshFooter.m in Sources */,
 				59F801571DD2C7AE000A78B0 /* YouerLiveVideo.xcdatamodeld in Sources */,
+				BF7722F91ED3C3E900226D44 /* FilterView.swift in Sources */,
 				595071031ED02C140056E078 /* ExcellentTVViewController.swift in Sources */,
 				59BA13311E25D1C000540DE0 /* Reachability.m in Sources */,
 				BFBB83EB1ECC445D008B404B /* UserViewController.swift in Sources */,
@@ -1592,6 +1615,7 @@
 				599B2CE31DE52F7E00B4F7FD /* UMSocialUIManager.m in Sources */,
 				BF25DFF91DDAA36A003EC0C1 /* NSImage+WebCache.m in Sources */,
 				BF8E52EE1ECFD16000E472E8 /* RankingTableViewController.swift in Sources */,
+				BF7722FC1ED3C54B00226D44 /* FilterCollectionViewCell.swift in Sources */,
 				59F8014F1DD2C7AD000A78B0 /* AppDelegate.swift in Sources */,
 				BF7722F31ED283D400226D44 /* FilterViewController.swift in Sources */,
 				BF25DFED1DDAA36A003EC0C1 /* ResponseSerialization.swift in Sources */,
@@ -40,20 +40,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate,NIMLoginManagerDelegate {
     }
     func applicationDidBecomeActive(_ application: UIApplication) {
-        let userId = AppDelegate.instance().accountManager.id()
-        let phone = AppDelegate.instance().accountManager.phone()
-        if userId != ""{
-            NIMSDK.shared().loginManager.autoLogin(phone, token: phone.md5().uppercased())
-        }
-        if let step = self.step {
-            if userId != "" && step == NIMLoginStep.loginFailed{//( step == NIMLoginStep.LinkFailed ||
-                XSTLiveManager.shareXSTLiveManager().login(userId: phone, completion: { (success) -> Void in
-                    if !success {
-                        self.accountManager.cleanUserInfoAndPoptoRootVC()
-                    }
-                })
-            }
-        }
+//        let userId = AppDelegate.instance().accountManager.id()
+//        let phone = AppDelegate.instance().accountManager.phone()
+//        if userId != ""{
+//            NIMSDK.shared().loginManager.autoLogin(phone, token: phone.md5().uppercased())
+//        }
+//        if let step = self.step {
+//            if userId != "" && step == NIMLoginStep.loginFailed{//( step == NIMLoginStep.LinkFailed ||
+//                XSTLiveManager.shareXSTLiveManager().login(userId: phone, completion: { (success) -> Void in
+//                    if !success {
+//                        self.accountManager.cleanUserInfoAndPoptoRootVC()
+//                    }
+//                })
+//            }
+//        }
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "资源.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "热门微课.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "排行.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图标_28.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "返回.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图标_24.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "下载数量.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "底栏1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图标_30.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "底栏3.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "更多.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "展开.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图标_22.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "底栏2.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "设置.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "底栏4.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "底栏5.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "观看数量.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -124,7 +124,7 @@
                                                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     </state>
                                                 </button>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="ds9-Gw-nOf">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_download" translatesAutoresizingMaskIntoConstraints="NO" id="ds9-Gw-nOf">
                                                     <rect key="frame" x="297" y="90.5" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" secondItem="ds9-Gw-nOf" secondAttribute="height" multiplier="1:1" id="Mto-fo-vVR"/>
@@ -273,16 +273,16 @@
                                                         <constraint firstAttribute="height" constant="15" id="mtL-aK-O9I"/>
                                                     </constraints>
                                                 </view>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="tc9-OD-L9x">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homepage_ranking" translatesAutoresizingMaskIntoConstraints="NO" id="tc9-OD-L9x">
                                                     <rect key="frame" x="15" y="30" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="20" id="dzU-2e-0A0"/>
                                                         <constraint firstAttribute="width" constant="20" id="jeW-Q1-Yqy"/>
                                                     </constraints>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="gpI-zw-6qq">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more" translatesAutoresizingMaskIntoConstraints="NO" id="gpI-zw-6qq">
                                                     <rect key="frame" x="352" y="32.5" width="8" height="15"/>
-                                                    <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="8" id="X2b-MK-4bQ"/>
                                                         <constraint firstAttribute="height" constant="15" id="ZkK-Yr-R26"/>
@@ -380,14 +380,14 @@
                                                         <constraint firstAttribute="height" constant="15" id="cu9-3U-16R"/>
                                                     </constraints>
                                                 </view>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="JfT-qO-w2b">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homepage_hotcourse" translatesAutoresizingMaskIntoConstraints="NO" id="JfT-qO-w2b">
                                                     <rect key="frame" x="15" y="30" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="gju-0Y-vbI"/>
                                                         <constraint firstAttribute="height" constant="20" id="upC-qc-OXv"/>
                                                     </constraints>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="QcE-wo-WjW">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more" translatesAutoresizingMaskIntoConstraints="NO" id="QcE-wo-WjW">
                                                     <rect key="frame" x="352" y="32.5" width="8" height="15"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="8" id="6rP-92-fox"/>
@@ -453,7 +453,7 @@
                                                                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="Ah6-9S-zUX">
+                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_watchcount" translatesAutoresizingMaskIntoConstraints="NO" id="Ah6-9S-zUX">
                                                                         <rect key="frame" x="154" y="167" width="12" height="8"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="12" id="Gst-KJ-hy2"/>
@@ -527,14 +527,14 @@
                                                         <constraint firstAttribute="height" constant="15" id="zk7-4f-Srd"/>
                                                     </constraints>
                                                 </view>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="UWk-5A-PEj">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homepage_courseList" translatesAutoresizingMaskIntoConstraints="NO" id="UWk-5A-PEj">
                                                     <rect key="frame" x="15" y="30" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="c35-8L-oxO"/>
                                                         <constraint firstAttribute="height" constant="20" id="iOy-11-gMR"/>
                                                     </constraints>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="Tib-Fm-A1U">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more" translatesAutoresizingMaskIntoConstraints="NO" id="Tib-Fm-A1U">
                                                     <rect key="frame" x="352" y="32.5" width="8" height="15"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="15" id="5ek-5S-7Cb"/>
@@ -600,7 +600,7 @@
                                                                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="j8z-Dm-5mL">
+                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_download" translatesAutoresizingMaskIntoConstraints="NO" id="j8z-Dm-5mL">
                                                                         <rect key="frame" x="100" y="220" width="8" height="8"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="8" id="f5p-Mv-Ylo"/>
@@ -684,14 +684,14 @@
                                                         <constraint firstAttribute="height" constant="15" id="8kZ-Qb-uv0"/>
                                                     </constraints>
                                                 </view>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="NyS-EO-TLP">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homepage_television" translatesAutoresizingMaskIntoConstraints="NO" id="NyS-EO-TLP">
                                                     <rect key="frame" x="15" y="30" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="3VH-BC-Dg6"/>
                                                         <constraint firstAttribute="height" constant="20" id="FB0-l5-0Jp"/>
                                                     </constraints>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="TE2-1P-sZs">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more" translatesAutoresizingMaskIntoConstraints="NO" id="TE2-1P-sZs">
                                                     <rect key="frame" x="352" y="32.5" width="8" height="15"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="15" id="EJo-or-6w8"/>
@@ -1206,7 +1206,7 @@
         <scene sceneID="Ztv-WN-7iK">
             <objects>
                 <navigationController title="资源" automaticallyAdjustsScrollViewInsets="NO" id="oPL-zE-5ud" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="资源" image="首页.png" id="H9f-Lc-mQs"/>
+                    <tabBarItem key="tabBarItem" title="资源" image="icon_resource" id="H9f-Lc-mQs"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Ca3-cq-bcD">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -1225,7 +1225,7 @@
         <scene sceneID="cuR-qn-3H2">
             <objects>
                 <navigationController title="微课" automaticallyAdjustsScrollViewInsets="NO" id="B6F-S8-zbX" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="微课" image="首页.png" id="6vI-fw-Oos"/>
+                    <tabBarItem key="tabBarItem" title="微课" image="icon_microcourse" id="6vI-fw-Oos"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="gzA-MB-3BR">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -1244,7 +1244,7 @@
         <scene sceneID="zf3-SG-nOb">
             <objects>
                 <navigationController title="电视台" automaticallyAdjustsScrollViewInsets="NO" id="eeQ-qi-Oqc" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="电视台" image="首页.png" id="Aq8-EP-9iB"/>
+                    <tabBarItem key="tabBarItem" title="电视台" image="icon_tvstation" id="Aq8-EP-9iB"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="zos-0a-mzB">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -1263,7 +1263,7 @@
         <scene sceneID="CWh-n7-nxi">
             <objects>
                 <navigationController title="用户" automaticallyAdjustsScrollViewInsets="NO" id="Lq6-19-raF" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="用户" image="首页.png" id="xsr-8R-tgo"/>
+                    <tabBarItem key="tabBarItem" title="用户" image="icon_user" id="xsr-8R-tgo"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="aYo-eQ-QLv">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -1390,7 +1390,7 @@
         <scene sceneID="axA-Q8-m9h">
             <objects>
                 <navigationController title="教育视频云" automaticallyAdjustsScrollViewInsets="NO" id="ZF0-NB-klP" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="首页" image="首页.png" id="JKA-ml-vLX"/>
+                    <tabBarItem key="tabBarItem" title="首页" image="icon_homepage" id="JKA-ml-vLX"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Xg7-jx-ngw">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -1518,7 +1518,7 @@
                                                         <action selector="pushDetailVC:" destination="IlC-3c-gI6" eventType="touchUpInside" id="3BZ-om-ppg"/>
                                                     </connections>
                                                 </button>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="anY-xC-gfl">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_watchcount" translatesAutoresizingMaskIntoConstraints="NO" id="anY-xC-gfl">
                                                     <rect key="frame" x="297" y="91" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="FKY-fi-PSd"/>
@@ -1639,10 +1639,21 @@
         <image name="default_userRoom" width="19" height="17"/>
         <image name="defphoto.png" width="256" height="256"/>
         <image name="divshadow.png" width="771" height="13"/>
+        <image name="homepage_courseList" width="20" height="20"/>
+        <image name="homepage_hotcourse" width="20" height="20"/>
+        <image name="homepage_ranking" width="20" height="20"/>
+        <image name="homepage_television" width="20" height="20"/>
         <image name="icon" width="512" height="512"/>
         <image name="icon.png" width="80" height="80"/>
+        <image name="icon_download" width="8" height="8"/>
+        <image name="icon_homepage" width="25" height="25"/>
+        <image name="icon_microcourse" width="25" height="25"/>
+        <image name="icon_more" width="8" height="14"/>
+        <image name="icon_resource" width="25" height="25"/>
+        <image name="icon_tvstation" width="25" height="25"/>
+        <image name="icon_user" width="25" height="25"/>
+        <image name="icon_watchcount" width="12" height="7"/>
         <image name="starLive" width="22" height="22"/>
         <image name="视窗.png" width="31" height="31"/>
-        <image name="首页.png" width="31" height="31"/>
     </resources>
 </document>
@@ -60,10 +60,6 @@ class MainHomeTableViewController: UITableViewController {
             }
         }
     }
-    //右上角搜索按钮点击方法
-    @IBAction func rightBarButtonAction(_ sender: UIBarButtonItem) {
-        
-    }
     override func didReceiveMemoryWarning() {
@@ -112,10 +108,10 @@ class MainHomeTableViewController: UITableViewController {
     }
     */
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        NSLog("点击了第\(indexPath.row)个cell")
         if indexPath.row==0{
             //排行
             let vc = UIStoryboard(name: "HomePage", bundle: nil).instantiateViewController(withIdentifier: "RankingTableViewController") as! RankingTableViewController
+            vc.openIndexAry=[0,4]
             self.navigationController?.pushViewController(vc, animated: true)
         }
     }
@@ -148,10 +144,18 @@ class InLineModel: NSObject {
 }
 class HomeFirstTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollectionViewDelegateFlowLayout,UICollectionViewDataSource {
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        if indexPath.row==0{
-            //点击进入学校 appRootViewController()
-        }else{
-            //点击进入教师
+        if appRootViewController().childViewControllers.count>0 {
+            if indexPath.row==0{
+                //点击进入学校
+                let vc = UIStoryboard(name: "HomePage", bundle: nil).instantiateViewController(withIdentifier: "RankingTableViewController") as! RankingTableViewController
+                vc.openIndexAry=[0]
+                ((appRootViewController().childViewControllers[0] as! MViewController).selectedViewController as! UINavigationController).pushViewController(vc, animated: true)
+            }else{
+                //点击进入教师
+                let vc = UIStoryboard(name: "HomePage", bundle: nil).instantiateViewController(withIdentifier: "RankingTableViewController") as! RankingTableViewController
+                vc.openIndexAry=[4]
+                ((appRootViewController().childViewControllers[0] as! MViewController).selectedViewController as! UINavigationController).pushViewController(vc, animated: true)
+            }
         }
     }
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
@@ -229,9 +229,9 @@ class RankingTableViewController: UITableViewController {
         }
         cell.titleLabel.text=ary[indexPath.row]
         if openIndexAry.contains(indexPath.row){
-            cell.titleImageView.image=UIImage(named: "botoom_image")
+            cell.titleImageView.image=UIImage(named: "icon_open")
         }else{
-            cell.titleImageView.image=UIImage(named: "top_image")
+            cell.titleImageView.image=UIImage(named: "icon_more")
         }
         cell.subTableView.reloadData()
         return cell
@@ -7,28 +7,224 @@
 //
 import UIKit
-
-class FilterViewController: UIViewController {
-
+class FilterViewController: UIViewController,FilterViewDelegate {
+    @IBOutlet var scrollContentView: UIStackView!
+    var nameAry:[String]=["学段","年级","学科","教材"]
+    var dataSchoolSection:[SchoolSection]=[]
+    var dataGrade:[Grade]=[]
+    var dataSubject:[Subject]=[]
+    
+    var type=FilterParameter()
     override func viewDidLoad() {
         super.viewDidLoad()
-//        AppDelegate.instance().httpServer.postResourceList(parameters: <#T##[String : AnyObject]?#>, completionHandler: <#T##(String?, NSError?) -> ()#>)
+        self.configTheme()
+        self.navigationItem.title="筛选"
+        getSchoolSection()
+//        NotificationCenter.default.addObserver(self, selector: #selector(RegisterVC.keyboardWIllChange), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil)
+//        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "loginOutSuccess"), object: nil)
     }
+    @IBAction func dismissAction(_ sender: UIBarButtonItem) {
+        self.dismiss(animated: true, completion: nil)
+    }
+    func setupFilterView(index:Int,arry:[filterModel]){
+        let filterView=scrollContentView.subviews[index] as! FilterView
+        if arry.count>0{
+            filterView.selected = 0
+            switch index {
+            case 2:
+                //年级
+                type.grade=arry[0].f_Id
+            case 3:
+                //学科
+                type.subject=arry[0].f_Id
+            default:
+                break
+            }
+        }else{
+            filterView.selected = -1
+            if index==2{
+                type.grade=nil
+            }
+        }
+        
+        filterView.isOpen=false
+        filterView.changeItems(array: arry)
+        filterView.constraints.last!.constant=60+(getScreenWidth()-80)/12
+        filterView.collectionView.reloadData()
+    }
+    @IBAction func determineAction(_ sender: UIButton) {
+        //        AppDelegate.instance().httpServer.postResourceList(parameters: <#T##[String : AnyObject]?#>, completionHandler: <#T##(String?, NSError?) -> ()#>)
+    }
+    //请求年级 并添加控件
+    func getSchoolSection(){
+        SVProgressHUD.show(withStatus: "获取学段...")
+        SVProgressHUD.setDefaultMaskType(.black)
+        AppDelegate.instance().httpServer.getSchoolTypes { (str, error) in
+            SVProgressHUD.dismiss()
+            if error==nil {
+                if JSON.fromString(jsonString: str)!["status"].intValue == 1{
+                    httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
+                        for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                            self.dataSchoolSection.append(SchoolSection(j: item))
+                        }
+                    }, failHandler: { (error) in
+                        self.view.makeToast("获取学段失败:\(error.localizedDescription)")
+                    })
+                }else{
+                    self.view.makeToast("获取学段失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
+                }
+            }else{
+                self.view.makeToast("获取学段失败:\(error!.description)")
+            }
+            let filterView=Bundle.main.loadNibNamed("FilterView", owner: nil, options: nil)![0] as! FilterView
+            filterView.frame.size=CGSize(width: getScreenWidth(), height: 60+(getScreenWidth()-80)/12)
+            filterView.delegate=self
+            filterView.tag=0
+            filterView.setUpWithItems(title: self.nameAry[0], array: self.dataSchoolSection)
+            if self.dataSchoolSection.count>0{
+                filterView.selected=0
+                self.type.schoolSection=self.dataSchoolSection[0].f_Id
+            }
+            self.scrollContentView.addArrangedSubview(filterView)
+            filterView.translatesAutoresizingMaskIntoConstraints=false
+            filterView.addConstraint(NSLayoutConstraint(item: filterView, attribute: NSLayoutAttribute.height, relatedBy: NSLayoutRelation.equal, toItem: nil, attribute: NSLayoutAttribute.notAnAttribute, multiplier: 1.0, constant: 60+(getScreenWidth()-80)/12))
+            for i in 1..<3{
+                let filterView=Bundle.main.loadNibNamed("FilterView", owner: nil, options: nil)![0] as! FilterView
+                filterView.frame.size=CGSize(width: getScreenWidth(), height: 60+(getScreenWidth()-80)/12)
+                filterView.delegate=self
+                filterView.tag=i
+                filterView.setUpWithItems(title: self.nameAry[i], array: [])
+                self.scrollContentView.addArrangedSubview(filterView)
+                filterView.translatesAutoresizingMaskIntoConstraints=false
+                filterView.addConstraint(NSLayoutConstraint(item: filterView, attribute: NSLayoutAttribute.height, relatedBy: NSLayoutRelation.equal, toItem: nil, attribute: NSLayoutAttribute.notAnAttribute, multiplier: 1.0, constant: 60+(getScreenWidth()-80)/12))
+            }
+            if self.dataSchoolSection.count>0{
+                self.getGradeWithSchoolSectionID(id: self.dataSchoolSection[0].f_Id, index: 2)
+            }
+            self.getSubjects(index: 3)
+        }
+    }
+    func selectCurrentCount(index: Int,tag:Int) {
+        switch tag {
+        case 0:
+            type.schoolSection=dataSchoolSection[index].f_Id
+            getGradeWithSchoolSectionID(id: dataSchoolSection[index].f_Id, index: 2)
+        case 1:
+            type.grade=dataGrade[index].f_Id
+        case 2:
+            type.subject=dataSubject[index].f_Id
+        case 3: break
+            
+        default: break
+            
+        }
+    }
+    //请求年级 并刷新
+    func getGradeWithSchoolSectionID(id:String,index:Int){
+        SVProgressHUD.show(withStatus: "获取年级...")
+        SVProgressHUD.setDefaultMaskType(.black)
+        AppDelegate.instance().httpServer.getGrades(parameters: ["schooltypeid":id as AnyObject]) { (str, error) in
+            SVProgressHUD.dismiss()
+            self.dataGrade.removeAll()
+            if error==nil {
+                if JSON.fromString(jsonString: str)!["status"].intValue == 1{
+                    httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
+                        for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                            self.dataGrade.append(Grade(j: item))
+                        }
+                    }, failHandler: { (error) in
+                        self.view.makeToast("获取年级失败:\(error.localizedDescription)")
+                    })
+                }else{
+                    self.view.makeToast("获取年级失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
+                }
+            }else{
+                self.view.makeToast("获取年级失败:\(error!.description)")
+            }
+            self.setupFilterView(index: index, arry: self.dataGrade)
+        }
+    }
+    //请求学科 并刷新
+    func getSubjects(index:Int){
+        SVProgressHUD.show(withStatus: "获取学科...")
+        SVProgressHUD.setDefaultMaskType(.black)
+        AppDelegate.instance().httpServer.getSubjects { (str, error) in
+            SVProgressHUD.dismiss()
+            self.dataSubject.removeAll()
+            if error==nil {
+                if JSON.fromString(jsonString: str)!["status"].intValue == 1{
+                    httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
+                        for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                            self.dataSubject.append(Subject(j: item))
+                        }
+                    }, failHandler: { (error) in
+                        self.view.makeToast("获取学科失败:\(error.localizedDescription)")
+                    })
+                }else{
+                    self.view.makeToast("获取学科失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
+                }
+            }else{
+                self.view.makeToast("获取学科失败:\(error!.description)")
+            }
+            self.setupFilterView(index: index, arry: self.dataSubject)
+        }
+    }
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
     }
-    
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destinationViewController.
-        // Pass the selected object to the new view controller.
+    // MARK: - 销毁通知
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+}
+class FilterParameter:NSObject {
+    var schoolSection:String?  //学段
+    var grade:String?          //年级
+    var subject:String?        //学科
+    var materials:String?      //教材
+    override init() {
+        
+    }
+}
+class filterModel:NSObject{
+    var f_Id:String=""
+    var f_DeleteMark:Bool=false
+    var f_CreatorTime:String=""
+    var f_CreatorUserId:String=""
+    var f_LastModifyTime:String=""
+    var f_LastModifyUserId:String=""
+    var f_DeleteTime:String=""
+    var f_DeleteUserId:String=""
+    init(j:JSON) {
+        f_Id=j["f_Id"].stringValue
+        f_DeleteMark=j["f_DeleteMark"].boolValue
+        f_CreatorTime=j["f_CreatorTime"].stringValue
+        f_CreatorUserId=j["f_CreatorUserId"].stringValue
+        f_LastModifyTime=j["f_LastModifyTime"].stringValue
+        f_LastModifyUserId=j["f_LastModifyUserId"].stringValue
+        f_DeleteTime=j["f_DeleteTime"].stringValue
+        f_DeleteUserId=j["f_DeleteUserId"].stringValue
+    }
+}
+class SchoolSection: filterModel {
+    var f_SchoolType:String=""
+    override init(j:JSON) {
+        super.init(j: j)
+        f_SchoolType=j["f_SchoolType"].stringValue
+    }
+}
+class Grade: filterModel {
+    var f_GradeName:String=""
+    override init(j:JSON) {
+        super.init(j: j)
+        f_GradeName=j["f_GradeName"].stringValue
+    }
+}
+class Subject: filterModel {
+    var f_SubjectName:String=""
+    override init(j:JSON) {
+        super.init(j: j)
+        f_SubjectName=j["f_SubjectName"].stringValue
     }
-    */
-
 }
@@ -9,10 +9,10 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Filter View Controller-->
+        <!--筛选-->
         <scene sceneID="Rmv-Eo-NBi">
             <objects>
-                <viewController storyboardIdentifier="FilterViewController" hidesBottomBarWhenPushed="YES" id="J51-bf-ysq" customClass="FilterViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="FilterViewController" title="筛选" automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="J51-bf-ysq" customClass="FilterViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="8Fm-xC-jSr"/>
                         <viewControllerLayoutGuide type="bottom" id="bXh-Wr-qy6"/>
@@ -20,13 +20,64 @@
                     <view key="view" contentMode="scaleToFill" id="ao2-Oa-iAS">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IYF-5b-c3m">
+                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <subviews>
+                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="KvN-Pb-Nub">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="65A-no-dyJ">
+                                                <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="1" id="xkQ-5h-BMe"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" red="0.98431372549999996" green="0.53333333329999999" blue="0.16078431369999999" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="trailing" secondItem="65A-no-dyJ" secondAttribute="trailing" id="54Y-dd-gNq"/>
+                                            <constraint firstItem="65A-no-dyJ" firstAttribute="top" secondItem="KvN-Pb-Nub" secondAttribute="top" id="ATk-pq-QJJ"/>
+                                            <constraint firstItem="65A-no-dyJ" firstAttribute="leading" secondItem="KvN-Pb-Nub" secondAttribute="leading" id="l5s-Ax-axE"/>
+                                        </constraints>
+                                    </stackView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="KvN-Pb-Nub" firstAttribute="leading" secondItem="IYF-5b-c3m" secondAttribute="leading" id="09s-Vs-jBg"/>
+                                    <constraint firstItem="KvN-Pb-Nub" firstAttribute="width" secondItem="IYF-5b-c3m" secondAttribute="width" id="5wf-4c-5Xd"/>
+                                    <constraint firstItem="KvN-Pb-Nub" firstAttribute="top" secondItem="IYF-5b-c3m" secondAttribute="top" id="LQM-Ax-Q3o"/>
+                                    <constraint firstItem="KvN-Pb-Nub" firstAttribute="centerX" secondItem="IYF-5b-c3m" secondAttribute="centerX" id="QaL-zJ-Vej"/>
+                                    <constraint firstAttribute="trailing" secondItem="KvN-Pb-Nub" secondAttribute="trailing" id="sRO-Ai-dtq"/>
+                                    <constraint firstAttribute="bottom" secondItem="KvN-Pb-Nub" secondAttribute="bottom" id="ygU-WM-4eC"/>
+                                </constraints>
+                            </scrollView>
+                        </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="bXh-Wr-qy6" firstAttribute="top" secondItem="IYF-5b-c3m" secondAttribute="bottom" id="4Fj-ek-MrC"/>
+                            <constraint firstItem="IYF-5b-c3m" firstAttribute="leading" secondItem="ao2-Oa-iAS" secondAttribute="leading" id="Gw1-De-QXC"/>
+                            <constraint firstAttribute="trailing" secondItem="IYF-5b-c3m" secondAttribute="trailing" id="lOu-N7-px1"/>
+                            <constraint firstItem="IYF-5b-c3m" firstAttribute="top" secondItem="8Fm-xC-jSr" secondAttribute="bottom" id="r8a-fu-6SW"/>
+                        </constraints>
                     </view>
+                    <navigationItem key="navigationItem" title="筛选" id="XhF-gh-xmO">
+                        <barButtonItem key="rightBarButtonItem" title="取消" id="sh5-cw-Jab">
+                            <connections>
+                                <action selector="dismissAction:" destination="J51-bf-ysq" id="nh3-AE-6cX"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="scrollContentView" destination="KvN-Pb-Nub" id="NiI-XK-4DK"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-737" y="266"/>
+            <point key="canvasLocation" x="-738.39999999999998" y="265.81709145427288"/>
         </scene>
         <!--Live Infor View Controller-->
         <scene sceneID="QrF-a4-VNS">
@@ -107,7 +107,7 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
     // MARK: - 跳转到筛选
     @IBAction func jumpFilterVCAction(_ sender: UIButton) {
         let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "FilterViewController") as! FilterViewController
-        self.navigationController?.pushViewController(vc, animated: true)
+        self.present(vc.wrapWithNavigationController(), animated: true, completion: nil)
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -0,0 +1,19 @@
+//
+//  FilterCollectionViewCell.swift
+//  YouerLiveVideo
+//
+//  Created by 葛建军 on 17/5/23.
+//  Copyright © 2017年 左丞. All rights reserved.
+//
+
+import UIKit
+
+class FilterCollectionViewCell: UICollectionViewCell {
+
+    @IBOutlet var titleLabel: UILabel!
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+}
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="identifier" id="gTV-IL-0wX" customClass="FilterCollectionViewCell" customModule="YouerLiveVideo" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="120" height="40"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="120" height="40"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小学" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F0D-46-jda">
+                        <rect key="frame" x="0.0" y="0.0" width="120" height="40"/>
+                        <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="5"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </label>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstItem="F0D-46-jda" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="33t-wF-LMs"/>
+                <constraint firstAttribute="trailing" secondItem="F0D-46-jda" secondAttribute="trailing" id="M5r-RT-2BD"/>
+                <constraint firstAttribute="bottom" secondItem="F0D-46-jda" secondAttribute="bottom" id="NdF-Eb-c7u"/>
+                <constraint firstItem="F0D-46-jda" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="TNg-FI-q5K"/>
+            </constraints>
+            <size key="customSize" width="122" height="38"/>
+            <connections>
+                <outlet property="titleLabel" destination="F0D-46-jda" id="CGy-n4-6ma"/>
+            </connections>
+            <point key="canvasLocation" x="-80" y="-77"/>
+        </collectionViewCell>
+    </objects>
+</document>
@@ -0,0 +1,93 @@
+//
+//  FilterView.swift
+//  YouerLiveVideo
+//
+//  Created by 葛建军 on 17/5/23.
+//  Copyright © 2017年 左丞. All rights reserved.
+//
+
+import UIKit
+
+class FilterView: UIView,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout {
+    @IBOutlet var titleLabel: UILabel!
+    @IBOutlet var collectionView: UICollectionView!
+    var isOpen:Bool=false
+    var dataAry:[filterModel]=[]
+    var delegate:FilterViewDelegate!
+    var selected:Int = -1
+    var numberLines:Int!
+    var cellWidth=(getScreenWidth()-80)/3
+    var cellHeight=(getScreenWidth()-80)/12
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        collectionView.register(UINib(nibName: "FilterCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "identifier")
+    }
+    func setUpWithItems(title:String,array:[filterModel]) {
+        titleLabel.text=title
+        dataAry=array
+        numberLines = array.count%3 > 0 ? array.count/3+1 : array.count/3
+        self.collectionView.reloadData()
+    }
+    func changeItems(array:[filterModel]){
+        dataAry=array
+        numberLines = array.count%3 > 0 ? array.count/3+1 : array.count/3
+        self.collectionView.reloadData()
+    }
+    @IBAction func openOrCloseAction(_ sender: UIButton) {
+        if isOpen {
+            isOpen=false
+            self.constraints.last!.constant=60+cellHeight
+        }else{
+            if dataAry.count>3{
+                isOpen=true
+                self.constraints.last!.constant=60+cellHeight+CGFloat(numberLines-1)*(cellHeight+10)
+                self.collectionView.reloadData()
+            }
+        }
+    }
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize(width: cellWidth, height: cellHeight)
+    }
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell=collectionView.dequeueReusableCell(withReuseIdentifier: "identifier", for: indexPath) as! FilterCollectionViewCell
+        switch self.tag {
+        case 0:
+            cell.titleLabel.text=(dataAry as! [SchoolSection])[indexPath.row].f_SchoolType
+        case 1:
+            cell.titleLabel.text=(dataAry as! [Grade])[indexPath.row].f_GradeName
+        case 2:
+            cell.titleLabel.text=(dataAry as! [Subject])[indexPath.row].f_SubjectName
+        default:
+            cell.titleLabel.text="未知"
+        }
+        if indexPath.row==selected {
+            cell.titleLabel.backgroundColor=Theme.topBarColor()
+            cell.titleLabel.textColor=UIColor.white
+        }else{
+            cell.titleLabel.backgroundColor=UIColor.groupTableViewBackground
+            cell.titleLabel.textColor=UIColor.black
+        }
+        return cell
+    }
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        if isOpen {
+            return dataAry.count
+        }else{
+            if dataAry.count<4 {
+                return dataAry.count
+            }else{
+                return 3
+            }
+        }
+    }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if selected != indexPath.row {
+            selected=indexPath.row
+            self.delegate.selectCurrentCount(index: indexPath.row, tag: self.tag)
+            self.collectionView.reloadData()
+        }
+    }
+}
+protocol FilterViewDelegate {
+    func selectCurrentCount(index:Int,tag:Int)
+}
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clipsSubviews="YES" contentMode="scaleToFill" id="iN0-l3-epB" customClass="FilterView" customModule="YouerLiveVideo" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="406" height="242"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="学段" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uQz-xV-iAD">
+                    <rect key="frame" x="20" y="10" width="33" height="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="PUk-bf-FTI">
+                    <rect key="frame" x="20" y="40" width="366" height="182"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="0.0" id="CMD-Fw-Sjo">
+                        <size key="itemSize" width="50" height="50"/>
+                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                    </collectionViewFlowLayout>
+                    <connections>
+                        <outlet property="dataSource" destination="iN0-l3-epB" id="ESV-a0-hCq"/>
+                        <outlet property="delegate" destination="iN0-l3-epB" id="RXH-fJ-Hll"/>
+                    </connections>
+                </collectionView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cif-Vg-cMI">
+                    <rect key="frame" x="336" y="0.0" width="50" height="34"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xgp-Yj-rju">
+                            <rect key="frame" x="0.0" y="0.0" width="42" height="34"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more" translatesAutoresizingMaskIntoConstraints="NO" id="Yi5-oE-p54">
+                            <rect key="frame" x="42" y="10" width="8" height="15"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="8" id="8pU-3b-hVL"/>
+                                <constraint firstAttribute="height" constant="15" id="YoR-To-kNi"/>
+                            </constraints>
+                        </imageView>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vFg-ez-6yB">
+                            <rect key="frame" x="0.0" y="0.0" width="50" height="34"/>
+                            <connections>
+                                <action selector="openOrCloseAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="enY-8P-rHR"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="Xgp-Yj-rju" secondAttribute="bottom" id="5pX-4I-aV1"/>
+                        <constraint firstAttribute="trailing" secondItem="vFg-ez-6yB" secondAttribute="trailing" id="8oA-tR-a9S"/>
+                        <constraint firstAttribute="bottom" secondItem="vFg-ez-6yB" secondAttribute="bottom" id="8pE-Nx-jdY"/>
+                        <constraint firstItem="Xgp-Yj-rju" firstAttribute="leading" secondItem="cif-Vg-cMI" secondAttribute="leading" id="Acg-vU-eDj"/>
+                        <constraint firstItem="vFg-ez-6yB" firstAttribute="top" secondItem="cif-Vg-cMI" secondAttribute="top" id="EGn-rn-FhX"/>
+                        <constraint firstItem="Yi5-oE-p54" firstAttribute="leading" secondItem="Xgp-Yj-rju" secondAttribute="trailing" id="EU8-pp-uj6"/>
+                        <constraint firstItem="Yi5-oE-p54" firstAttribute="centerY" secondItem="cif-Vg-cMI" secondAttribute="centerY" id="dI6-h0-ve2"/>
+                        <constraint firstAttribute="width" constant="50" id="gp7-jN-cTr"/>
+                        <constraint firstItem="Xgp-Yj-rju" firstAttribute="top" secondItem="cif-Vg-cMI" secondAttribute="top" id="mKd-KO-MU9"/>
+                        <constraint firstItem="vFg-ez-6yB" firstAttribute="leading" secondItem="cif-Vg-cMI" secondAttribute="leading" id="oQy-yz-nC5"/>
+                        <constraint firstAttribute="trailing" secondItem="Yi5-oE-p54" secondAttribute="trailing" id="qP2-LK-MJS"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="uQz-xV-iAD" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="5ZE-95-bk1"/>
+                <constraint firstAttribute="bottom" secondItem="PUk-bf-FTI" secondAttribute="bottom" constant="20" id="8xy-ni-fOt"/>
+                <constraint firstAttribute="trailing" secondItem="cif-Vg-cMI" secondAttribute="trailing" constant="20" id="DPa-oT-ZVi"/>
+                <constraint firstItem="PUk-bf-FTI" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="MAr-8E-ipy"/>
+                <constraint firstItem="PUk-bf-FTI" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="40" id="NkW-cH-ltZ"/>
+                <constraint firstAttribute="trailing" secondItem="PUk-bf-FTI" secondAttribute="trailing" constant="20" id="fwr-U1-zDh"/>
+                <constraint firstItem="uQz-xV-iAD" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="gNr-Pg-F54"/>
+                <constraint firstItem="cif-Vg-cMI" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="kKV-TT-4Ov"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="collectionView" destination="PUk-bf-FTI" id="lcH-DQ-bM9"/>
+                <outlet property="titleLabel" destination="uQz-xV-iAD" id="in8-lv-Coj"/>
+            </connections>
+            <point key="canvasLocation" x="4" y="-317"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="icon_more" width="8" height="14"/>
+    </resources>
+</document>
@@ -85,7 +85,7 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker
         if inputVerificationCode.text!.characters.count == 4{
             SVProgressHUD.show(withStatus: "注册...")
             SVProgressHUD.setDefaultMaskType(.black)
-            let parameters:Dictionary<String,AnyObject>=["account":phoneNumber.text! as AnyObject,"password":passwordTextField.text! as AnyObject,"vercode":inputVerificationCode.text! as AnyObject,"nickname": (nikeNameTextFiled.text!=="" ? phoneNumber.text! : nikeNameTextFiled.text!) as AnyObject]
+            let parameters:Dictionary<String,AnyObject>=["account":phoneNumber.text! as AnyObject,"password":passwordTextField.text!.md5() as AnyObject,"vercode":inputVerificationCode.text! as AnyObject,"nickname": (nikeNameTextFiled.text!=="" ? phoneNumber.text! : nikeNameTextFiled.text!) as AnyObject]
             AppDelegate.instance().httpServer.getCreateUser(parameters: parameters) { (str, error) in
                 SVProgressHUD.dismiss()
                 self.nikeNameTextFiled.isUserInteractionEnabled=true
@@ -95,7 +95,7 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker
                 if error==nil {
                     if JSON.fromString(jsonString: str)!["status"].intValue == 1{
                         httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
-                            self.navigationController!.popToRootViewController(animated: true)
+                            self.navigationController!.dismiss(animated: true, completion: nil)
                             AppDelegate.instance().window?.makeToast("注册成功")
                             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshLoginUser"), object: self.phoneNumber.text!)
                             //是否登录
@@ -78,7 +78,6 @@
                                                     </imageView>
                                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入账号" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IzH-dB-I9H">
                                                         <rect key="frame" x="36" y="18.5" width="339" height="19"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                                                         <connections>
@@ -121,7 +120,6 @@
                                                     </imageView>
                                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nVn-EA-yWM">
                                                         <rect key="frame" x="36" y="18.5" width="339" height="19"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
                                                         <connections>
@@ -551,7 +549,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号码   " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nVJ-81-bXY">
-                                                <rect key="frame" x="89" y="18.5" width="123.5" height="19"/>
+                                                <rect key="frame" x="89" y="19" width="177" height="19"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                 <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/>
                                                 <connections>
@@ -561,6 +559,9 @@
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hwv-0n-dsf">
                                                 <rect key="frame" x="274" y="13" width="93" height="30"/>
                                                 <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="93" id="tn3-0t-fnt"/>
+                                                </constraints>
                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                 <state key="normal" title="  发送验证码  ">
                                                     <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -586,6 +587,7 @@
                                             <constraint firstAttribute="trailing" secondItem="hwv-0n-dsf" secondAttribute="trailing" constant="8" id="jCe-9b-HiL"/>
                                             <constraint firstItem="hwv-0n-dsf" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="mgL-oA-0oG"/>
                                             <constraint firstAttribute="trailing" secondItem="MEf-rE-fBh" secondAttribute="trailing" id="nEG-6h-NXY"/>
+                                            <constraint firstItem="hwv-0n-dsf" firstAttribute="leading" secondItem="nVJ-81-bXY" secondAttribute="trailing" constant="8" id="u7R-Pm-UM9"/>
                                             <constraint firstAttribute="bottom" secondItem="MEf-rE-fBh" secondAttribute="bottom" id="y9Q-1X-3wy"/>
                                             <constraint firstItem="nVJ-81-bXY" firstAttribute="leading" secondItem="ae8-Wz-CYH" secondAttribute="trailing" constant="8" id="zxS-jB-eC8"/>
                                         </constraints>
@@ -738,7 +740,7 @@
                     </connections>
                 </tapGestureRecognizer>
             </objects>
-            <point key="canvasLocation" x="-1446" y="1533"/>
+            <point key="canvasLocation" x="-1447.2" y="1532.3838080959522"/>
         </scene>
         <!--注册-->
         <scene sceneID="fjB-PO-uzD">
@@ -228,12 +228,12 @@ final class HTTPServer{
         KHttp.GET(url: HTTPServer.URL_COMMONGETCOURSEWAREVERSIONS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
     }
     //获取学科
-    func getSubjects(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
-        KHttp.GET(url: HTTPServer.URL_COMMONGETSUBJECTS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    func getSubjects(completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETSUBJECTS, headers:["Authorization":token!], completionHandler: completionHandler)
     }
     //获取学段
-    func getSchoolTypes(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
-        KHttp.GET(url: HTTPServer.URL_COMMONGETSCHOOLTYPES, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    func getSchoolTypes(completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETSCHOOLTYPES, headers:["Authorization":token!], completionHandler: completionHandler)
     }
     //获取轮播图 type:0-视频云前端轮播图 1-校园电视台轮播图
     func getLunboList(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
	@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
		1	+{
		2	+ "info" : {
		3	+ "version" : 1,
		4	+ "author" : "xcode"
		5	+ }
		6	+}
0	\ No newline at end of file	7	\ No newline at end of file
	@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
		1	+{
		2	+ "images" : [
		3	+ {
		4	+ "idiom" : "universal",
		5	+ "scale" : "1x"
		6	+ },
		7	+ {
		8	+ "idiom" : "universal",
		9	+ "filename" : "资源.png",
		10	+ "scale" : "2x"
		11	+ },
		12	+ {
		13	+ "idiom" : "universal",
		14	+ "scale" : "3x"
		15	+ }
		16	+ ],
		17	+ "info" : {
		18	+ "version" : 1,
		19	+ "author" : "xcode"
		20	+ }
		21	+}
0	\ No newline at end of file	22	\ No newline at end of file
	@@ -229,9 +229,9 @@ class RankingTableViewController: UITableViewController {		@@ -229,9 +229,9 @@ class RankingTableViewController: UITableViewController {
229	}	229	}
230	cell.titleLabel.text=ary[indexPath.row]	230	cell.titleLabel.text=ary[indexPath.row]
231	if openIndexAry.contains(indexPath.row){	231	if openIndexAry.contains(indexPath.row){
232	- cell.titleImageView.image=UIImage(named: "botoom_image")	232	+ cell.titleImageView.image=UIImage(named: "icon_open")
233	}else{	233	}else{
234	- cell.titleImageView.image=UIImage(named: "top_image")	234	+ cell.titleImageView.image=UIImage(named: "icon_more")
235	}	235	}
236	cell.subTableView.reloadData()	236	cell.subTableView.reloadData()
237	return cell	237	return cell
	@@ -7,28 +7,224 @@		@@ -7,28 +7,224 @@
7	//	7	//
8		8
9	import UIKit	9	import UIKit
10	-
11	-class FilterViewController: UIViewController {
12	-	10	+class FilterViewController: UIViewController,FilterViewDelegate {
		11	+ @IBOutlet var scrollContentView: UIStackView!
		12	+ var nameAry:[String]=["学段","年级","学科","教材"]
		13	+ var dataSchoolSection:[SchoolSection]=[]
		14	+ var dataGrade:[Grade]=[]
		15	+ var dataSubject:[Subject]=[]
		16	+
		17	+ var type=FilterParameter()
13	override func viewDidLoad() {	18	override func viewDidLoad() {
14	super.viewDidLoad()	19	super.viewDidLoad()
15	-// AppDelegate.instance().httpServer.postResourceList(parameters: <#T##[String : AnyObject]?#>, completionHandler: <#T##(String?, NSError?) -> ()#>)	20	+ self.configTheme()
		21	+ self.navigationItem.title="筛选"
		22	+ getSchoolSection()
		23	+// NotificationCenter.default.addObserver(self, selector: #selector(RegisterVC.keyboardWIllChange), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil)
		24	+// NotificationCenter.default.post(name: NSNotification.Name(rawValue: "loginOutSuccess"), object: nil)
16	}	25	}
17		26
		27	+ @IBAction func dismissAction(_ sender: UIBarButtonItem) {
		28	+ self.dismiss(animated: true, completion: nil)
		29	+ }
		30	+ func setupFilterView(index:Int,arry:[filterModel]){
		31	+ let filterView=scrollContentView.subviews[index] as! FilterView
		32	+ if arry.count>0{
		33	+ filterView.selected = 0
		34	+ switch index {
		35	+ case 2:
		36	+ //年级
		37	+ type.grade=arry[0].f_Id
		38	+ case 3:
		39	+ //学科
		40	+ type.subject=arry[0].f_Id
		41	+ default:
		42	+ break
		43	+ }
		44	+ }else{
		45	+ filterView.selected = -1
		46	+ if index==2{
		47	+ type.grade=nil
		48	+ }
		49	+ }
		50	+
		51	+ filterView.isOpen=false
		52	+ filterView.changeItems(array: arry)
		53	+ filterView.constraints.last!.constant=60+(getScreenWidth()-80)/12
		54	+ filterView.collectionView.reloadData()
		55	+ }
		56	+ @IBAction func determineAction(_ sender: UIButton) {
		57	+ // AppDelegate.instance().httpServer.postResourceList(parameters: <#T##[String : AnyObject]?#>, completionHandler: <#T##(String?, NSError?) -> ()#>)
		58	+ }
		59	+ //请求年级并添加控件
		60	+ func getSchoolSection(){
		61	+ SVProgressHUD.show(withStatus: "获取学段...")
		62	+ SVProgressHUD.setDefaultMaskType(.black)
		63	+ AppDelegate.instance().httpServer.getSchoolTypes { (str, error) in
		64	+ SVProgressHUD.dismiss()
		65	+ if error==nil {
		66	+ if JSON.fromString(jsonString: str)!["status"].intValue == 1{
		67	+ httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
		68	+ for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
		69	+ self.dataSchoolSection.append(SchoolSection(j: item))
		70	+ }
		71	+ }, failHandler: { (error) in
		72	+ self.view.makeToast("获取学段失败:\(error.localizedDescription)")
		73	+ })
		74	+ }else{
		75	+ self.view.makeToast("获取学段失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
		76	+ }
		77	+ }else{
		78	+ self.view.makeToast("获取学段失败:\(error!.description)")
		79	+ }
		80	+ let filterView=Bundle.main.loadNibNamed("FilterView", owner: nil, options: nil)![0] as! FilterView
		81	+ filterView.frame.size=CGSize(width: getScreenWidth(), height: 60+(getScreenWidth()-80)/12)
		82	+ filterView.delegate=self
		83	+ filterView.tag=0
		84	+ filterView.setUpWithItems(title: self.nameAry[0], array: self.dataSchoolSection)
		85	+ if self.dataSchoolSection.count>0{
		86	+ filterView.selected=0
		87	+ self.type.schoolSection=self.dataSchoolSection[0].f_Id
		88	+ }
		89	+ self.scrollContentView.addArrangedSubview(filterView)
		90	+ filterView.translatesAutoresizingMaskIntoConstraints=false
		91	+ filterView.addConstraint(NSLayoutConstraint(item: filterView, attribute: NSLayoutAttribute.height, relatedBy: NSLayoutRelation.equal, toItem: nil, attribute: NSLayoutAttribute.notAnAttribute, multiplier: 1.0, constant: 60+(getScreenWidth()-80)/12))
		92	+ for i in 1..<3{
		93	+ let filterView=Bundle.main.loadNibNamed("FilterView", owner: nil, options: nil)![0] as! FilterView
		94	+ filterView.frame.size=CGSize(width: getScreenWidth(), height: 60+(getScreenWidth()-80)/12)
		95	+ filterView.delegate=self
		96	+ filterView.tag=i
		97	+ filterView.setUpWithItems(title: self.nameAry[i], array: [])
		98	+ self.scrollContentView.addArrangedSubview(filterView)
		99	+ filterView.translatesAutoresizingMaskIntoConstraints=false
		100	+ filterView.addConstraint(NSLayoutConstraint(item: filterView, attribute: NSLayoutAttribute.height, relatedBy: NSLayoutRelation.equal, toItem: nil, attribute: NSLayoutAttribute.notAnAttribute, multiplier: 1.0, constant: 60+(getScreenWidth()-80)/12))
		101	+ }
		102	+ if self.dataSchoolSection.count>0{
		103	+ self.getGradeWithSchoolSectionID(id: self.dataSchoolSection[0].f_Id, index: 2)
		104	+ }
		105	+ self.getSubjects(index: 3)
		106	+ }
		107	+ }
		108	+ func selectCurrentCount(index: Int,tag:Int) {
		109	+ switch tag {
		110	+ case 0:
		111	+ type.schoolSection=dataSchoolSection[index].f_Id
		112	+ getGradeWithSchoolSectionID(id: dataSchoolSection[index].f_Id, index: 2)
		113	+ case 1:
		114	+ type.grade=dataGrade[index].f_Id
		115	+ case 2:
		116	+ type.subject=dataSubject[index].f_Id
		117	+ case 3: break
		118	+
		119	+ default: break
		120	+
		121	+ }
		122	+ }
		123	+ //请求年级并刷新
		124	+ func getGradeWithSchoolSectionID(id:String,index:Int){
		125	+ SVProgressHUD.show(withStatus: "获取年级...")
		126	+ SVProgressHUD.setDefaultMaskType(.black)
		127	+ AppDelegate.instance().httpServer.getGrades(parameters: ["schooltypeid":id as AnyObject]) { (str, error) in
		128	+ SVProgressHUD.dismiss()
		129	+ self.dataGrade.removeAll()
		130	+ if error==nil {
		131	+ if JSON.fromString(jsonString: str)!["status"].intValue == 1{
		132	+ httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
		133	+ for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
		134	+ self.dataGrade.append(Grade(j: item))
		135	+ }
		136	+ }, failHandler: { (error) in
		137	+ self.view.makeToast("获取年级失败:\(error.localizedDescription)")
		138	+ })
		139	+ }else{
		140	+ self.view.makeToast("获取年级失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
		141	+ }
		142	+ }else{
		143	+ self.view.makeToast("获取年级失败:\(error!.description)")
		144	+ }
		145	+ self.setupFilterView(index: index, arry: self.dataGrade)
		146	+ }
		147	+ }
		148	+ //请求学科并刷新
		149	+ func getSubjects(index:Int){
		150	+ SVProgressHUD.show(withStatus: "获取学科...")
		151	+ SVProgressHUD.setDefaultMaskType(.black)
		152	+ AppDelegate.instance().httpServer.getSubjects { (str, error) in
		153	+ SVProgressHUD.dismiss()
		154	+ self.dataSubject.removeAll()
		155	+ if error==nil {
		156	+ if JSON.fromString(jsonString: str)!["status"].intValue == 1{
		157	+ httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
		158	+ for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
		159	+ self.dataSubject.append(Subject(j: item))
		160	+ }
		161	+ }, failHandler: { (error) in
		162	+ self.view.makeToast("获取学科失败:\(error.localizedDescription)")
		163	+ })
		164	+ }else{
		165	+ self.view.makeToast("获取学科失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
		166	+ }
		167	+ }else{
		168	+ self.view.makeToast("获取学科失败:\(error!.description)")
		169	+ }
		170	+ self.setupFilterView(index: index, arry: self.dataSubject)
		171	+ }
		172	+ }
18	override func didReceiveMemoryWarning() {	173	override func didReceiveMemoryWarning() {
19	super.didReceiveMemoryWarning()	174	super.didReceiveMemoryWarning()
20	- // Dispose of any resources that can be recreated.
21	}	175	}
22	-
23	-
24	- /*
25	- // MARK: - Navigation
26	-
27	- // In a storyboard-based application, you will often want to do a little preparation before navigation
28	- override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
29	- // Get the new view controller using segue.destinationViewController.
30	- // Pass the selected object to the new view controller.	176	+ // MARK: - 销毁通知
		177	+ deinit {
		178	+ NotificationCenter.default.removeObserver(self)
		179	+ }
		180	+}
		181	+class FilterParameter:NSObject {
		182	+ var schoolSection:String? //学段
		183	+ var grade:String? //年级
		184	+ var subject:String? //学科
		185	+ var materials:String? //教材
		186	+ override init() {
		187	+
		188	+ }
		189	+}
		190	+class filterModel:NSObject{
		191	+ var f_Id:String=""
		192	+ var f_DeleteMark:Bool=false
		193	+ var f_CreatorTime:String=""
		194	+ var f_CreatorUserId:String=""
		195	+ var f_LastModifyTime:String=""
		196	+ var f_LastModifyUserId:String=""
		197	+ var f_DeleteTime:String=""
		198	+ var f_DeleteUserId:String=""
		199	+ init(j:JSON) {
		200	+ f_Id=j["f_Id"].stringValue
		201	+ f_DeleteMark=j["f_DeleteMark"].boolValue
		202	+ f_CreatorTime=j["f_CreatorTime"].stringValue
		203	+ f_CreatorUserId=j["f_CreatorUserId"].stringValue
		204	+ f_LastModifyTime=j["f_LastModifyTime"].stringValue
		205	+ f_LastModifyUserId=j["f_LastModifyUserId"].stringValue
		206	+ f_DeleteTime=j["f_DeleteTime"].stringValue
		207	+ f_DeleteUserId=j["f_DeleteUserId"].stringValue
		208	+ }
		209	+}
		210	+class SchoolSection: filterModel {
		211	+ var f_SchoolType:String=""
		212	+ override init(j:JSON) {
		213	+ super.init(j: j)
		214	+ f_SchoolType=j["f_SchoolType"].stringValue
		215	+ }
		216	+}
		217	+class Grade: filterModel {
		218	+ var f_GradeName:String=""
		219	+ override init(j:JSON) {
		220	+ super.init(j: j)
		221	+ f_GradeName=j["f_GradeName"].stringValue
		222	+ }
		223	+}
		224	+class Subject: filterModel {
		225	+ var f_SubjectName:String=""
		226	+ override init(j:JSON) {
		227	+ super.init(j: j)
		228	+ f_SubjectName=j["f_SubjectName"].stringValue
31	}	229	}
32	- */
33	-
34	}	230	}
	@@ -9,10 +9,10 @@		@@ -9,10 +9,10 @@
9	<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>	9	<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10	</dependencies>	10	</dependencies>
11	<scenes>	11	<scenes>
12	- <!--Filter View Controller-->	12	+ <!--筛选-->
13	<scene sceneID="Rmv-Eo-NBi">	13	<scene sceneID="Rmv-Eo-NBi">
14	<objects>	14	<objects>
15	- <viewController storyboardIdentifier="FilterViewController" hidesBottomBarWhenPushed="YES" id="J51-bf-ysq" customClass="FilterViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">	15	+ <viewController storyboardIdentifier="FilterViewController" title="筛选" automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="J51-bf-ysq" customClass="FilterViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
16	<layoutGuides>	16	<layoutGuides>
17	<viewControllerLayoutGuide type="top" id="8Fm-xC-jSr"/>	17	<viewControllerLayoutGuide type="top" id="8Fm-xC-jSr"/>
18	<viewControllerLayoutGuide type="bottom" id="bXh-Wr-qy6"/>	18	<viewControllerLayoutGuide type="bottom" id="bXh-Wr-qy6"/>
	@@ -20,13 +20,64 @@		@@ -20,13 +20,64 @@
20	<view key="view" contentMode="scaleToFill" id="ao2-Oa-iAS">	20	<view key="view" contentMode="scaleToFill" id="ao2-Oa-iAS">
21	<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>	21	<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
22	<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>	22	<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
		23	+ <subviews>
		24	+ <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IYF-5b-c3m">
		25	+ <rect key="frame" x="0.0" y="64" width="375" height="603"/>
		26	+ <subviews>
		27	+ <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="KvN-Pb-Nub">
		28	+ <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
		29	+ <subviews>
		30	+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="65A-no-dyJ">
		31	+ <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
		32	+ <constraints>
		33	+ <constraint firstAttribute="height" constant="1" id="xkQ-5h-BMe"/>
		34	+ </constraints>
		35	+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
		36	+ <nil key="textColor"/>
		37	+ <nil key="highlightedColor"/>
		38	+ </label>
		39	+ </subviews>
		40	+ <color key="backgroundColor" red="0.98431372549999996" green="0.53333333329999999" blue="0.16078431369999999" alpha="1" colorSpace="calibratedRGB"/>
		41	+ <constraints>
		42	+ <constraint firstAttribute="trailing" secondItem="65A-no-dyJ" secondAttribute="trailing" id="54Y-dd-gNq"/>
		43	+ <constraint firstItem="65A-no-dyJ" firstAttribute="top" secondItem="KvN-Pb-Nub" secondAttribute="top" id="ATk-pq-QJJ"/>
		44	+ <constraint firstItem="65A-no-dyJ" firstAttribute="leading" secondItem="KvN-Pb-Nub" secondAttribute="leading" id="l5s-Ax-axE"/>
		45	+ </constraints>
		46	+ </stackView>
		47	+ </subviews>
		48	+ <constraints>
		49	+ <constraint firstItem="KvN-Pb-Nub" firstAttribute="leading" secondItem="IYF-5b-c3m" secondAttribute="leading" id="09s-Vs-jBg"/>
		50	+ <constraint firstItem="KvN-Pb-Nub" firstAttribute="width" secondItem="IYF-5b-c3m" secondAttribute="width" id="5wf-4c-5Xd"/>
		51	+ <constraint firstItem="KvN-Pb-Nub" firstAttribute="top" secondItem="IYF-5b-c3m" secondAttribute="top" id="LQM-Ax-Q3o"/>
		52	+ <constraint firstItem="KvN-Pb-Nub" firstAttribute="centerX" secondItem="IYF-5b-c3m" secondAttribute="centerX" id="QaL-zJ-Vej"/>
		53	+ <constraint firstAttribute="trailing" secondItem="KvN-Pb-Nub" secondAttribute="trailing" id="sRO-Ai-dtq"/>
		54	+ <constraint firstAttribute="bottom" secondItem="KvN-Pb-Nub" secondAttribute="bottom" id="ygU-WM-4eC"/>
		55	+ </constraints>
		56	+ </scrollView>
		57	+ </subviews>
23	<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>	58	<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
		59	+ <constraints>
		60	+ <constraint firstItem="bXh-Wr-qy6" firstAttribute="top" secondItem="IYF-5b-c3m" secondAttribute="bottom" id="4Fj-ek-MrC"/>
		61	+ <constraint firstItem="IYF-5b-c3m" firstAttribute="leading" secondItem="ao2-Oa-iAS" secondAttribute="leading" id="Gw1-De-QXC"/>
		62	+ <constraint firstAttribute="trailing" secondItem="IYF-5b-c3m" secondAttribute="trailing" id="lOu-N7-px1"/>
		63	+ <constraint firstItem="IYF-5b-c3m" firstAttribute="top" secondItem="8Fm-xC-jSr" secondAttribute="bottom" id="r8a-fu-6SW"/>
		64	+ </constraints>
24	</view>	65	</view>
		66	+ <navigationItem key="navigationItem" title="筛选" id="XhF-gh-xmO">
		67	+ <barButtonItem key="rightBarButtonItem" title="取消" id="sh5-cw-Jab">
		68	+ <connections>
		69	+ <action selector="dismissAction:" destination="J51-bf-ysq" id="nh3-AE-6cX"/>
		70	+ </connections>
		71	+ </barButtonItem>
		72	+ </navigationItem>
25	<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>	73	<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
		74	+ <connections>
		75	+ <outlet property="scrollContentView" destination="KvN-Pb-Nub" id="NiI-XK-4DK"/>
		76	+ </connections>
26	</viewController>	77	</viewController>
27	<placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/>	78	<placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/>
28	</objects>	79	</objects>
29	- <point key="canvasLocation" x="-737" y="266"/>	80	+ <point key="canvasLocation" x="-738.39999999999998" y="265.81709145427288"/>
30	</scene>	81	</scene>
31	<!--Live Infor View Controller-->	82	<!--Live Infor View Controller-->
32	<scene sceneID="QrF-a4-VNS">	83	<scene sceneID="QrF-a4-VNS">
	@@ -107,7 +107,7 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa		@@ -107,7 +107,7 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
107	// MARK: - 跳转到筛选	107	// MARK: - 跳转到筛选
108	@IBAction func jumpFilterVCAction(_ sender: UIButton) {	108	@IBAction func jumpFilterVCAction(_ sender: UIButton) {
109	let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "FilterViewController") as! FilterViewController	109	let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "FilterViewController") as! FilterViewController
110	- self.navigationController?.pushViewController(vc, animated: true)	110	+ self.present(vc.wrapWithNavigationController(), animated: true, completion: nil)
111	}	111	}
112		112
113	func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {	113	func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+//
	2	+// FilterCollectionViewCell.swift
	3	+// YouerLiveVideo
	4	+//
	5	+// Created by 葛建军 on 17/5/23.
	6	+// Copyright © 2017年左丞. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class FilterCollectionViewCell: UICollectionViewCell {
	12	+
	13	+ @IBOutlet var titleLabel: UILabel!
	14	+ override func awakeFromNib() {
	15	+ super.awakeFromNib()
	16	+ // Initialization code
	17	+ }
	18	+
	19	+}
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
	2	+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
	3	+ <device id="retina4_7" orientation="portrait">
	4	+ <adaptation id="fullscreen"/>
	5	+ </device>
	6	+ <dependencies>
	7	+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
	8	+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
	9	+ </dependencies>
	10	+ <objects>
	11	+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
	12	+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
	13	+ <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="identifier" id="gTV-IL-0wX" customClass="FilterCollectionViewCell" customModule="YouerLiveVideo" customModuleProvider="target">
	14	+ <rect key="frame" x="0.0" y="0.0" width="120" height="40"/>
	15	+ <autoresizingMask key="autoresizingMask"/>
	16	+ <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
	17	+ <rect key="frame" x="0.0" y="0.0" width="120" height="40"/>
	18	+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
	19	+ <subviews>
	20	+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小学" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F0D-46-jda">
	21	+ <rect key="frame" x="0.0" y="0.0" width="120" height="40"/>
	22	+ <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
	23	+ <fontDescription key="fontDescription" type="system" pointSize="15"/>
	24	+ <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
	25	+ <nil key="highlightedColor"/>
	26	+ <userDefinedRuntimeAttributes>
	27	+ <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
	28	+ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
	29	+ <integer key="value" value="5"/>
	30	+ </userDefinedRuntimeAttribute>
	31	+ </userDefinedRuntimeAttributes>
	32	+ </label>
	33	+ </subviews>
	34	+ </view>
	35	+ <constraints>
	36	+ <constraint firstItem="F0D-46-jda" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="33t-wF-LMs"/>
	37	+ <constraint firstAttribute="trailing" secondItem="F0D-46-jda" secondAttribute="trailing" id="M5r-RT-2BD"/>
	38	+ <constraint firstAttribute="bottom" secondItem="F0D-46-jda" secondAttribute="bottom" id="NdF-Eb-c7u"/>
	39	+ <constraint firstItem="F0D-46-jda" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="TNg-FI-q5K"/>
	40	+ </constraints>
	41	+ <size key="customSize" width="122" height="38"/>
	42	+ <connections>
	43	+ <outlet property="titleLabel" destination="F0D-46-jda" id="CGy-n4-6ma"/>
	44	+ </connections>
	45	+ <point key="canvasLocation" x="-80" y="-77"/>
	46	+ </collectionViewCell>
	47	+ </objects>
	48	+</document>
@@ -0,0 +1,93 @@		@@ -0,0 +1,93 @@
	1	+//
	2	+// FilterView.swift
	3	+// YouerLiveVideo
	4	+//
	5	+// Created by 葛建军 on 17/5/23.
	6	+// Copyright © 2017年左丞. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class FilterView: UIView,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout {
	12	+ @IBOutlet var titleLabel: UILabel!
	13	+ @IBOutlet var collectionView: UICollectionView!
	14	+ var isOpen:Bool=false
	15	+ var dataAry:[filterModel]=[]
	16	+ var delegate:FilterViewDelegate!
	17	+ var selected:Int = -1
	18	+ var numberLines:Int!
	19	+ var cellWidth=(getScreenWidth()-80)/3
	20	+ var cellHeight=(getScreenWidth()-80)/12
	21	+ override func awakeFromNib() {
	22	+ super.awakeFromNib()
	23	+ collectionView.register(UINib(nibName: "FilterCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "identifier")
	24	+ }
	25	+ func setUpWithItems(title:String,array:[filterModel]) {
	26	+ titleLabel.text=title
	27	+ dataAry=array
	28	+ numberLines = array.count%3 > 0 ? array.count/3+1 : array.count/3
	29	+ self.collectionView.reloadData()
	30	+ }
	31	+ func changeItems(array:[filterModel]){
	32	+ dataAry=array
	33	+ numberLines = array.count%3 > 0 ? array.count/3+1 : array.count/3
	34	+ self.collectionView.reloadData()
	35	+ }
	36	+ @IBAction func openOrCloseAction(_ sender: UIButton) {
	37	+ if isOpen {
	38	+ isOpen=false
	39	+ self.constraints.last!.constant=60+cellHeight
	40	+ }else{
	41	+ if dataAry.count>3{
	42	+ isOpen=true
	43	+ self.constraints.last!.constant=60+cellHeight+CGFloat(numberLines-1)*(cellHeight+10)
	44	+ self.collectionView.reloadData()
	45	+ }
	46	+ }
	47	+ }
	48	+ func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
	49	+ return CGSize(width: cellWidth, height: cellHeight)
	50	+ }
	51	+ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
	52	+ let cell=collectionView.dequeueReusableCell(withReuseIdentifier: "identifier", for: indexPath) as! FilterCollectionViewCell
	53	+ switch self.tag {
	54	+ case 0:
	55	+ cell.titleLabel.text=(dataAry as! [SchoolSection])[indexPath.row].f_SchoolType
	56	+ case 1:
	57	+ cell.titleLabel.text=(dataAry as! [Grade])[indexPath.row].f_GradeName
	58	+ case 2:
	59	+ cell.titleLabel.text=(dataAry as! [Subject])[indexPath.row].f_SubjectName
	60	+ default:
	61	+ cell.titleLabel.text="未知"
	62	+ }
	63	+ if indexPath.row==selected {
	64	+ cell.titleLabel.backgroundColor=Theme.topBarColor()
	65	+ cell.titleLabel.textColor=UIColor.white
	66	+ }else{
	67	+ cell.titleLabel.backgroundColor=UIColor.groupTableViewBackground
	68	+ cell.titleLabel.textColor=UIColor.black
	69	+ }
	70	+ return cell
	71	+ }
	72	+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
	73	+ if isOpen {
	74	+ return dataAry.count
	75	+ }else{
	76	+ if dataAry.count<4 {
	77	+ return dataAry.count
	78	+ }else{
	79	+ return 3
	80	+ }
	81	+ }
	82	+ }
	83	+ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
	84	+ if selected != indexPath.row {
	85	+ selected=indexPath.row
	86	+ self.delegate.selectCurrentCount(index: indexPath.row, tag: self.tag)
	87	+ self.collectionView.reloadData()
	88	+ }
	89	+ }
	90	+}
	91	+protocol FilterViewDelegate {
	92	+ func selectCurrentCount(index:Int,tag:Int)
	93	+}
@@ -0,0 +1,98 @@		@@ -0,0 +1,98 @@
	1	+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
	2	+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
	3	+ <device id="retina4_7" orientation="portrait">
	4	+ <adaptation id="fullscreen"/>
	5	+ </device>
	6	+ <dependencies>
	7	+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
	8	+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
	9	+ </dependencies>
	10	+ <objects>
	11	+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
	12	+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
	13	+ <view clipsSubviews="YES" contentMode="scaleToFill" id="iN0-l3-epB" customClass="FilterView" customModule="YouerLiveVideo" customModuleProvider="target">
	14	+ <rect key="frame" x="0.0" y="0.0" width="406" height="242"/>
	15	+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
	16	+ <subviews>
	17	+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="学段" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uQz-xV-iAD">
	18	+ <rect key="frame" x="20" y="10" width="33" height="20"/>
	19	+ <fontDescription key="fontDescription" type="system" pointSize="16"/>
	20	+ <nil key="textColor"/>
	21	+ <nil key="highlightedColor"/>
	22	+ </label>
	23	+ <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="PUk-bf-FTI">
	24	+ <rect key="frame" x="20" y="40" width="366" height="182"/>
	25	+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
	26	+ <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="0.0" id="CMD-Fw-Sjo">
	27	+ <size key="itemSize" width="50" height="50"/>
	28	+ <size key="headerReferenceSize" width="0.0" height="0.0"/>
	29	+ <size key="footerReferenceSize" width="0.0" height="0.0"/>
	30	+ <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
	31	+ </collectionViewFlowLayout>
	32	+ <connections>
	33	+ <outlet property="dataSource" destination="iN0-l3-epB" id="ESV-a0-hCq"/>
	34	+ <outlet property="delegate" destination="iN0-l3-epB" id="RXH-fJ-Hll"/>
	35	+ </connections>
	36	+ </collectionView>
	37	+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cif-Vg-cMI">
	38	+ <rect key="frame" x="336" y="0.0" width="50" height="34"/>
	39	+ <subviews>
	40	+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xgp-Yj-rju">
	41	+ <rect key="frame" x="0.0" y="0.0" width="42" height="34"/>
	42	+ <fontDescription key="fontDescription" type="system" pointSize="13"/>
	43	+ <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
	44	+ <nil key="highlightedColor"/>
	45	+ </label>
	46	+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more" translatesAutoresizingMaskIntoConstraints="NO" id="Yi5-oE-p54">
	47	+ <rect key="frame" x="42" y="10" width="8" height="15"/>
	48	+ <constraints>
	49	+ <constraint firstAttribute="width" constant="8" id="8pU-3b-hVL"/>
	50	+ <constraint firstAttribute="height" constant="15" id="YoR-To-kNi"/>
	51	+ </constraints>
	52	+ </imageView>
	53	+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vFg-ez-6yB">
	54	+ <rect key="frame" x="0.0" y="0.0" width="50" height="34"/>
	55	+ <connections>
	56	+ <action selector="openOrCloseAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="enY-8P-rHR"/>
	57	+ </connections>
	58	+ </button>
	59	+ </subviews>
	60	+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
	61	+ <constraints>
	62	+ <constraint firstAttribute="bottom" secondItem="Xgp-Yj-rju" secondAttribute="bottom" id="5pX-4I-aV1"/>
	63	+ <constraint firstAttribute="trailing" secondItem="vFg-ez-6yB" secondAttribute="trailing" id="8oA-tR-a9S"/>
	64	+ <constraint firstAttribute="bottom" secondItem="vFg-ez-6yB" secondAttribute="bottom" id="8pE-Nx-jdY"/>
	65	+ <constraint firstItem="Xgp-Yj-rju" firstAttribute="leading" secondItem="cif-Vg-cMI" secondAttribute="leading" id="Acg-vU-eDj"/>
	66	+ <constraint firstItem="vFg-ez-6yB" firstAttribute="top" secondItem="cif-Vg-cMI" secondAttribute="top" id="EGn-rn-FhX"/>
	67	+ <constraint firstItem="Yi5-oE-p54" firstAttribute="leading" secondItem="Xgp-Yj-rju" secondAttribute="trailing" id="EU8-pp-uj6"/>
	68	+ <constraint firstItem="Yi5-oE-p54" firstAttribute="centerY" secondItem="cif-Vg-cMI" secondAttribute="centerY" id="dI6-h0-ve2"/>
	69	+ <constraint firstAttribute="width" constant="50" id="gp7-jN-cTr"/>
	70	+ <constraint firstItem="Xgp-Yj-rju" firstAttribute="top" secondItem="cif-Vg-cMI" secondAttribute="top" id="mKd-KO-MU9"/>
	71	+ <constraint firstItem="vFg-ez-6yB" firstAttribute="leading" secondItem="cif-Vg-cMI" secondAttribute="leading" id="oQy-yz-nC5"/>
	72	+ <constraint firstAttribute="trailing" secondItem="Yi5-oE-p54" secondAttribute="trailing" id="qP2-LK-MJS"/>
	73	+ </constraints>
	74	+ </view>
	75	+ </subviews>
	76	+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
	77	+ <constraints>
	78	+ <constraint firstItem="uQz-xV-iAD" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="5ZE-95-bk1"/>
	79	+ <constraint firstAttribute="bottom" secondItem="PUk-bf-FTI" secondAttribute="bottom" constant="20" id="8xy-ni-fOt"/>
	80	+ <constraint firstAttribute="trailing" secondItem="cif-Vg-cMI" secondAttribute="trailing" constant="20" id="DPa-oT-ZVi"/>
	81	+ <constraint firstItem="PUk-bf-FTI" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="MAr-8E-ipy"/>
	82	+ <constraint firstItem="PUk-bf-FTI" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="40" id="NkW-cH-ltZ"/>
	83	+ <constraint firstAttribute="trailing" secondItem="PUk-bf-FTI" secondAttribute="trailing" constant="20" id="fwr-U1-zDh"/>
	84	+ <constraint firstItem="uQz-xV-iAD" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="gNr-Pg-F54"/>
	85	+ <constraint firstItem="cif-Vg-cMI" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="kKV-TT-4Ov"/>
	86	+ </constraints>
	87	+ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
	88	+ <connections>
	89	+ <outlet property="collectionView" destination="PUk-bf-FTI" id="lcH-DQ-bM9"/>
	90	+ <outlet property="titleLabel" destination="uQz-xV-iAD" id="in8-lv-Coj"/>
	91	+ </connections>
	92	+ <point key="canvasLocation" x="4" y="-317"/>
	93	+ </view>
	94	+ </objects>
	95	+ <resources>
	96	+ <image name="icon_more" width="8" height="14"/>
	97	+ </resources>
	98	+</document>