首页UI改版

BuguLive.xcodeproj/project.pbxproj

@@ -576,7 +576,6 @@
 		284153B71F38521C00CC6CAE /* PluginToolsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 284153B61F38521C00CC6CAE /* PluginToolsModel.m */; };
 		2A9B3716325B6F001D373333 /* libPods-BuguLive.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F38F5F6C99E03182F7AF7276 /* libPods-BuguLive.a */; };
 		347DDCD32E41F8A700EAE3C0 /* IAPManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 347DDCD22E41F8A700EAE3C0 /* IAPManager.m */; };
-		34B9C0152E5F133000D85249 /* CustomTabbarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B9C0142E5F133000D85249 /* CustomTabbarView.m */; };
 		380034E328F6B365007C0FFC /* BGReadPackTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 380034CB28F6B365007C0FFC /* BGReadPackTableViewCell.xib */; };
 		380034E428F6B365007C0FFC /* BGRedPackResultList.m in Sources */ = {isa = PBXBuildFile; fileRef = 380034CC28F6B365007C0FFC /* BGRedPackResultList.m */; };
 		380034E528F6B365007C0FFC /* BGReadPackResultTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 380034CD28F6B365007C0FFC /* BGReadPackResultTableViewCell.xib */; };
@@ -1996,7 +1995,6 @@
 		C15194DD230FC51F008E8EA6 /* MGLoginView.m in Sources */ = {isa = PBXBuildFile; fileRef = C15194DB230FC51E008E8EA6 /* MGLoginView.m */; };
 		C15194E0231123C2008E8EA6 /* MGAlertIncodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = C15194DF231123C2008E8EA6 /* MGAlertIncodeView.m */; };
 		C153892C23F7DFF700861756 /* BGTLiveScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = C153892A23F7DFF600861756 /* BGTLiveScrollView.m */; };
-		C156A42C26032B9E000465AE /* BogoHomeTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = C156A42B26032B9E000465AE /* BogoHomeTopView.m */; };
 		C156A4382603573E000465AE /* BogoHomeSubTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C156A4372603573E000465AE /* BogoHomeSubTitleView.m */; };
 		C15A628F264558240075EA96 /* BogoNewsLikesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C15A628E264558240075EA96 /* BogoNewsLikesViewController.m */; };
 		C15A629626455EE20075EA96 /* BogoNewsLikesCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C15A629426455EE20075EA96 /* BogoNewsLikesCell.m */; };
@@ -2389,7 +2387,6 @@
 		CBE6BF2B21EC817000D8D4CE /* HMVideoPlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE6BF2A21EC817000D8D4CE /* HMVideoPlayerViewController.m */; };
 		CBE6BF3A21EC818200D8D4CE /* HMCommentView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE6BF3021EC818000D8D4CE /* HMCommentView.m */; };
 		CBE6BF3B21EC818200D8D4CE /* HMVideoControlView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE6BF3121EC818000D8D4CE /* HMVideoControlView.m */; };
-		CBE6BF3C21EC818200D8D4CE /* HMVideoSliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE6BF3221EC818100D8D4CE /* HMVideoSliderView.m */; };
 		CBE6BF3D21EC818200D8D4CE /* HMVideoPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE6BF3421EC818100D8D4CE /* HMVideoPlayer.m */; };
 		CBE6BF3E21EC818200D8D4CE /* HMCommentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE6BF3521EC818100D8D4CE /* HMCommentViewCell.m */; };
 		CBE6BF3F21EC818200D8D4CE /* HMShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE6BF3721EC818200D8D4CE /* HMShareView.m */; };
@@ -3463,8 +3460,6 @@
 		284153B61F38521C00CC6CAE /* PluginToolsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginToolsModel.m; sourceTree = "<group>"; };
 		347DDCD12E41F8A700EAE3C0 /* IAPManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IAPManager.h; sourceTree = "<group>"; };
 		347DDCD22E41F8A700EAE3C0 /* IAPManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IAPManager.m; sourceTree = "<group>"; };
-		34B9C0132E5F133000D85249 /* CustomTabbarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomTabbarView.h; sourceTree = "<group>"; };
-		34B9C0142E5F133000D85249 /* CustomTabbarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomTabbarView.m; sourceTree = "<group>"; };
 		380034CB28F6B365007C0FFC /* BGReadPackTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BGReadPackTableViewCell.xib; sourceTree = "<group>"; };
 		380034CC28F6B365007C0FFC /* BGRedPackResultList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BGRedPackResultList.m; sourceTree = "<group>"; };
 		380034CD28F6B365007C0FFC /* BGReadPackResultTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BGReadPackResultTableViewCell.xib; sourceTree = "<group>"; };
@@ -5935,8 +5930,6 @@
 		C15194DF231123C2008E8EA6 /* MGAlertIncodeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGAlertIncodeView.m; sourceTree = "<group>"; };
 		C153892A23F7DFF600861756 /* BGTLiveScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BGTLiveScrollView.m; sourceTree = "<group>"; };
 		C153892B23F7DFF700861756 /* BGTLiveScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BGTLiveScrollView.h; sourceTree = "<group>"; };
-		C156A42A26032B9E000465AE /* BogoHomeTopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BogoHomeTopView.h; sourceTree = "<group>"; };
-		C156A42B26032B9E000465AE /* BogoHomeTopView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BogoHomeTopView.m; sourceTree = "<group>"; };
 		C156A4362603573E000465AE /* BogoHomeSubTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BogoHomeSubTitleView.h; sourceTree = "<group>"; };
 		C156A4372603573E000465AE /* BogoHomeSubTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BogoHomeSubTitleView.m; sourceTree = "<group>"; };
 		C15A628D264558240075EA96 /* BogoNewsLikesViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BogoNewsLikesViewController.h; sourceTree = "<group>"; };
@@ -6504,10 +6497,8 @@
 		CBE6BF2C21EC817F00D8D4CE /* HMShareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMShareView.h; sourceTree = "<group>"; };
 		CBE6BF2D21EC818000D8D4CE /* HMCommentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCommentView.h; sourceTree = "<group>"; };
 		CBE6BF2E21EC818000D8D4CE /* HMVideoControlView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMVideoControlView.h; sourceTree = "<group>"; };
-		CBE6BF2F21EC818000D8D4CE /* HMVideoSliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMVideoSliderView.h; sourceTree = "<group>"; };
 		CBE6BF3021EC818000D8D4CE /* HMCommentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCommentView.m; sourceTree = "<group>"; };
 		CBE6BF3121EC818000D8D4CE /* HMVideoControlView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMVideoControlView.m; sourceTree = "<group>"; };
-		CBE6BF3221EC818100D8D4CE /* HMVideoSliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMVideoSliderView.m; sourceTree = "<group>"; };
 		CBE6BF3321EC818100D8D4CE /* HMVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMVideoPlayer.h; sourceTree = "<group>"; };
 		CBE6BF3421EC818100D8D4CE /* HMVideoPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMVideoPlayer.m; sourceTree = "<group>"; };
 		CBE6BF3521EC818100D8D4CE /* HMCommentViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCommentViewCell.m; sourceTree = "<group>"; };
@@ -7512,8 +7503,6 @@
 				CBE6BF3121EC818000D8D4CE /* HMVideoControlView.m */,
 				CBE6BF3321EC818100D8D4CE /* HMVideoPlayer.h */,
 				CBE6BF3421EC818100D8D4CE /* HMVideoPlayer.m */,
-				CBE6BF2F21EC818000D8D4CE /* HMVideoSliderView.h */,
-				CBE6BF3221EC818100D8D4CE /* HMVideoSliderView.m */,
 				CBE6BF3621EC818200D8D4CE /* HMVideoView.h */,
 				CBE6BF3821EC818200D8D4CE /* HMVideoView.m */,
 				9750FCF81F5E44EF002F03AC /* SSelectAreaCell.h */,
@@ -8763,8 +8752,6 @@
 				C19F462921E9CCE600146F02 /* BGTabBarCenterView.m */,
 				C15194DE231123C2008E8EA6 /* MGAlertIncodeView.h */,
 				C15194DF231123C2008E8EA6 /* MGAlertIncodeView.m */,
-				34B9C0132E5F133000D85249 /* CustomTabbarView.h */,
-				34B9C0142E5F133000D85249 /* CustomTabbarView.m */,
 			);
 			path = AppBar;
 			sourceTree = "<group>";
@@ -14254,8 +14241,6 @@
 		C156A42826032B58000465AE /* View */ = {
 			isa = PBXGroup;
 			children = (
-				C156A42A26032B9E000465AE /* BogoHomeTopView.h */,
-				C156A42B26032B9E000465AE /* BogoHomeTopView.m */,
 				C156A4362603573E000465AE /* BogoHomeSubTitleView.h */,
 				C156A4372603573E000465AE /* BogoHomeSubTitleView.m */,
 			);
@@ -16451,7 +16436,6 @@
 				3860D99628AF788D001B4FE2 /* BogoCategoryHeaderView.m in Sources */,
 				C1722089261C2D5D003E4E71 /* BogoSearchTableHeadView.m in Sources */,
 				047E1F321EC1538C001B874D /* NSObject+myobj.m in Sources */,
-				C156A42C26032B9E000465AE /* BogoHomeTopView.m in Sources */,
 				0446A1CB1EC165C0003C8B02 /* NetworkUtility.m in Sources */,
 				971B66151F7FA0AC00E54E55 /* BGLivePayManager.m in Sources */,
 				04E8A1241E77911F0072C471 /* IMAPlatform+FriendShip.m in Sources */,
@@ -16613,7 +16597,6 @@
 				3860D93A28AF788C001B4FE2 /* BogoOrderManageViewController.m in Sources */,
 				3860D98E28AF788D001B4FE2 /* BogoGoodDetailCell.m in Sources */,
 				047E20091EC1538D001B874D /* PushManageViewController.m in Sources */,
-				CBE6BF3C21EC818200D8D4CE /* HMVideoSliderView.m in Sources */,
 				3860D70228AF7107001B4FE2 /* BogoNetworkResponseModel.m in Sources */,
 				3860D97F28AF788C001B4FE2 /* TYCyclePagerViewCell.m in Sources */,
 				3803E07C21B26809006E74B5 /* CarItem.m in Sources */,
@@ -17496,7 +17479,6 @@
 				047E21EE1EC153BA001B874D /* SuctionDetailContactWayCell.m in Sources */,
 				C1354AF223017AC40011DBE5 /* TCUserInfoViewController.m in Sources */,
 				38649D9E28F29ADE00DB3C98 /* RoomMicUserListView.m in Sources */,
-				34B9C0152E5F133000D85249 /* CustomTabbarView.m in Sources */,
 				91F5B75F239DF61D003EA122 /* BGSignModel.m in Sources */,
 				91E4093923A71AEC0078B18B /* BGSystemMsgModel.m in Sources */,
 				047E1F361EC1538C001B874D /* RechargeWayView.m in Sources */,

BuguLive/Assets.xcassets/Player/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/me（个人中心 前缀：me）/me_icon_comment.imageset/Contents.json → BuguLive/Assets.xcassets/Player/emoji.imageset/Contents.json

@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "评论.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "评论@2x.png",
+      "filename" : "emoji@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "评论@3x.png",
+      "filename" : "emoji@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BuguLive/Assets.xcassets/me（个人中心 前缀：me）/me_icon_focus.imageset/Contents.json → BuguLive/Assets.xcassets/Player/icon-search.imageset/Contents.json

@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "添加.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "添加@2x.png",
+      "filename" : "icon-search@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "添加@3x.png",
+      "filename" : "icon-search@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BuguLive/Assets.xcassets/me（个人中心 前缀：me）/me_icon_share.imageset/Contents.json → BuguLive/Assets.xcassets/Player/icon22x22-2.imageset/Contents.json

@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "分享.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "分享@2x.png",
+      "filename" : "icon22x22-2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "分享@3x.png",
+      "filename" : "icon22x22-2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BuguLive/Assets.xcassets/me（个人中心 前缀：me）/me_icon_star_normal.imageset/Contents.json → BuguLive/Assets.xcassets/Player/icon22x22-3.imageset/Contents.json

@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "心 (2).png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "心 (2)@2x.png",
+      "filename" : "icon22x22-3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "心 (2)@3x.png",
+      "filename" : "icon22x22-3@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BuguLive/Assets.xcassets/Player/icon22x22.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon22x22@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon22x22@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/Player/icon_.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/Player/send.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "send@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "send@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/Player/容器 2580.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "容器 2580@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "容器 2580@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/Player/容器 2584.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "容器 2584@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "容器 2584@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/Player/容器 2590.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "容器 2590@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "容器 2590@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/Player/容器.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "容器@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "容器@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/common（公共 前缀：com）/bg_top.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "bg_top@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "bg_top@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/me（个人中心 前缀：me）/me_icon_like.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "me_icon_like@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "me_icon_like@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BuguLive/Assets.xcassets/me（个人中心 前缀：me）/me_icon_star_selected.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "已点赞.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "已点赞@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "已点赞@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Class/AppOhters/AppBar/BGTabBarController.m

@@ -71,10 +71,8 @@
 #import "GKAllRefreshViewController.h"
 
 #import "AudioChatTool.h"
-#import "CustomTabbarView.h"
 
-@interface BGTabBarController ()<UITabBarControllerDelegate,UIActionSheetDelegate,BogoHomeTopViewDelegate, CustomTabbarViewDelegate>
-@property (nonatomic, strong) CustomTabbarView *customTabBar;
+@interface BGTabBarController ()<UITabBarControllerDelegate,UIActionSheetDelegate>
 
 @property (nonatomic, strong) HMCenterPopView *popView;
 @property (nonatomic, strong) VideoDynamicViewC *videoDynamicViewC;
@@ -112,7 +110,7 @@ BogoSingletonM(Instance);
 
     
     self.delegate = self;
-    [self setupCustomTabBar];
+//    [self setupCustomTabBar];
     
     [self setUpChildViewControllers];
     self.view.backgroundColor = kWhiteColor;
@@ -361,7 +359,6 @@ BogoSingletonM(Instance);
     
     // 首页
     BogoHomeViewController *home = [[BogoHomeViewController alloc] init];
-    home.topViewdelegate = self;
     home.clickSquareBtnBlock = ^(NSInteger index) {
         [self showDynamicVC];
     };
@@ -376,8 +373,6 @@ BogoSingletonM(Instance);
     
     GKAllRefreshViewController *voiceRoom2 = [GKAllRefreshViewController new];
     voiceRoom2.types = @"1";
-    voiceRoom2.delegate = home;
-    voiceRoom2.topViewdelegate = self;
     [self addChildViewController:voiceRoom2 image:@"ic_tab_party_normal" seletedImage:@"ic_tab_party_sel" title:ASLocalizedString(@"派对")];
     
     
@@ -404,60 +399,23 @@ BogoSingletonM(Instance);
     // 我的
     [self addChildViewController:[[MineViewController alloc] initWithNibName:@"MineViewController" bundle:[NSBundle mainBundle]] image:@"ic_tab_me_normal"  seletedImage:@"ic_tab_me_sel"  title:ASLocalizedString(@"我的")];
     
-}
-
-- (void)setupCustomTabBar {
-    self.tabBar.hidden = YES;
-    // 创建自定义TabBar，高度为80
-    CGFloat tabBarHeight = 80;
-    CGFloat safeAreaBottom = 0;
-    
-    if (@available(iOS 11.0, *)) {
-        safeAreaBottom = self.view.safeAreaInsets.bottom;
-    }
-    
-    self.customTabBar = [[CustomTabbarView alloc] initWithFrame:CGRectMake(0,
-                                                                          self.view.frame.size.height - tabBarHeight - safeAreaBottom,
-                                                                          self.view.frame.size.width,
-                                                                          tabBarHeight + safeAreaBottom)];
-    self.customTabBar.delegate = self;
-    
-    // 根据BGTabBarController中setUpChildViewControllers方法添加TabBar项
-    // 注意：这里使用的图片名称需要与原项目中的图片资源匹配
-    
-    // 首页
-    [self.customTabBar addTabBarItemWithTitle:@"首页"
-                                  normalImage:@"ic_tab_live_normal"
-                                selectedImage:@"ic_tab_live_selected"];
     
-    // 派对
-    [self.customTabBar addTabBarItemWithTitle:@"派对"
-                                  normalImage:@"ic_tab_party_normal"
-                                selectedImage:@"ic_tab_party_sel"];
-    
-    // 动态
-    [self.customTabBar addTabBarItemWithTitle:@"动态"
-                                  normalImage:@"ic_tab_moment_normal"
-                                selectedImage:@"ic_tab_moment_sel"];
-    
-    // 消息
-    [self.customTabBar addTabBarItemWithTitle:@"消息"
-                                  normalImage:@"ic_tab_message_normal"
-                                selectedImage:@"ic_tab_message_sel"];
-    
-    // 我的
-    [self.customTabBar addTabBarItemWithTitle:@"我的"
-                                  normalImage:@"ic_tab_me_normal"
-                                selectedImage:@"ic_tab_me_sel"];
-    
-    [self.view addSubview:self.customTabBar];
-}
-
-#pragma mark - CustomTabbarViewDelegate
-
-- (void)customTabbarView:(CustomTabbarView *)tabbarView didSelectItemAtIndex:(NSInteger)index {
-    NSLog(@"选中了第%ld个TabBar项", (long)index);
-    self.selectedIndex = index;
+    // 配置TabBar样式
+    self.tabBar.backgroundColor = [UIColor whiteColor];
+    self.tabBar.barTintColor = UIColor.whiteColor;
+    self.tabBar.shadowImage = [UIImage new];
+    [self.tabBar setBackgroundImage:[UIImage imageWithColor:[UIColor whiteColor]]];
+    self.tabBar.tintColor = [UIColor colorWithHexString:@"#5C1CF7"];
+    self.tabBar.unselectedItemTintColor = [UIColor colorWithHexString:@"#606060"];
+    
+    // 设置TabBar字体大小
+    [[UITabBarItem appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName: [UIColor colorWithHexString:@"#606060"]}
+                                             forState:UIControlStateNormal];
+    [[UITabBarItem appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName: [UIColor colorWithHexString:@"#5C1CF7"]}
+                                             forState:UIControlStateSelected];
+    [[UINavigationBar appearance] setTitleTextAttributes:@{
+        NSForegroundColorAttributeName: UIColor.whiteColor
+    }];
 }
 
 //-(void)showNesBarRedNum{
@@ -524,51 +482,18 @@ BogoSingletonM(Instance);
 #pragma mark - 添加子控制器
 - (UIViewController *)addChildViewController:(UIViewController *)childController image:(NSString *)image seletedImage:(NSString *)selectedImage title:(NSString *)title
 {
-//    if (![BGUtils isBlankString:title])
-//    {
-        childController.title = title;
-        
-//        NSMutableDictionary *normalAttrs = [NSMutableDictionary dictionary];
-//        normalAttrs[NSForegroundColorAttributeName] = kAppGrayColor3;
-//        [childController.tabBarItem setTitleTextAttributes:normalAttrs forState:UIControlStateNormal];
-//        
-//        NSMutableDictionary *selectedAtrrs = [NSMutableDictionary dictionary];
-//        selectedAtrrs[NSForegroundColorAttributeName] = UIColorFromRGB(0x4BC8FC);
-//        [childController.tabBarItem setTitleTextAttributes:selectedAtrrs forState:UIControlStateSelected];
-    
-        //        childController.tabBarItem.imageInsets = UIEdgeInsetsMake(12, 12, 12, 12);
-//        childController.tabBarItem.imageInsets = UIEdgeInsetsMake(-10, 0, -5, 0);
-        
-//        childController.tabBarItem.imageInsets = UIEdgeInsetsMake(-10, 0, -5, 0);
-//    }
-//    else
-//    {
-//        childController.tabBarItem.imageInsets = UIEdgeInsetsMake(-16, 0, -5, 0);
-//    }
-    
-    // 设置图片
-//    if ([title isEqualToString:@""]) {
-////        UIImage *imageS = [[self imageResize:[UIImage imageNamed:image] andResizeTo:CGSizeMake(50, 50)] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-////        [childController.tabBarItem setImage:imageS];
-////        [imageS drawInRect:CGRectMake(-10,0,50,50)];
-//        [childController.tabBarItem setImage:[[self imageResize:[UIImage imageNamed:image] andResizeTo:CGSizeMake(kRealValue(45), kRealValue(45)) withTop:0] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
-//    }else{
         
-//        UITabBarItem* itm= [[UITabBarItem alloc] initWithTitle:title image:[UIImage imageNamed:image] selectedImage:[UIImage imageNamed:selectedImage]];
+    childController.title = title;
+    UITabBarItem* itm= [[UITabBarItem alloc] initWithTitle:title
+                                                     image:[[UIImage imageNamed:image] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+                                             selectedImage:[[UIImage imageNamed:selectedImage] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
 
-//        childController.tabBarItem = itm;
-        
-//        [childController.tabBarItem setImage:[[self imageResize:[UIImage imageNamed:image] andResizeTo:CGSizeMake(20, 20)  withTop:0] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
-//        [childController.tabBarItem setSelectedImage:[[self imageResize:[UIImage imageNamed:selectedImage] andResizeTo:CGSizeMake(20, 20) withTop:0] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
-    
-//    }
-    
+    childController.tabBarItem = itm;
     
     // 导航条
     BGNavigationController *nav = [[BGNavigationController alloc] initWithRootViewController:childController];
     [self addChildViewController:nav];
     
-    nav.view.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-80-SafeAreaBottomHeight);
     return childController;
 }
 

BuguLive/Class/AppOhters/AppBar/CustomTabbarView.h

@@ -1,36 +0,0 @@
-//
-//  CustomTabbarView.h
-//  BuguLive
-//
-//  Created by qitewei on 2025/8/27.
-//  Copyright © 2025 xfg. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class CustomTabbarView;
-
-@protocol CustomTabbarViewDelegate <NSObject>
-@optional
-- (void)customTabbarView:(CustomTabbarView *)tabbarView didSelectItemAtIndex:(NSInteger)index;
-@end
-
-@interface CustomTabbarView : UIView
-
-@property (nonatomic, strong) UIStackView *stackView;
-@property (nonatomic, weak) id<CustomTabbarViewDelegate> delegate;
-@property (nonatomic, assign) NSInteger selectedIndex;
-
-// 添加TabBar项
-- (void)addTabBarItemWithTitle:(NSString *)title 
-                   normalImage:(NSString *)normalImage 
-                 selectedImage:(NSString *)selectedImage;
-
-// 设置选中状态
-- (void)setSelectedIndex:(NSInteger)selectedIndex animated:(BOOL)animated;
-
-@end
-
-NS_ASSUME_NONNULL_END

BuguLive/Class/AppOhters/AppBar/CustomTabbarView.m

@@ -1,152 +0,0 @@
-//
-//  CustomTabbarView.m
-//  BuguLive
-//
-//  Created by qitewei on 2025/8/27.
-//  Copyright © 2025 xfg. All rights reserved.
-//
-
-#import "CustomTabbarView.h"
-
-@interface CustomTabbarView()
-@property (nonatomic, strong) NSMutableArray<UIButton *> *tabBarButtons;
-@end
-
-@implementation CustomTabbarView
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self setupView];
-    }
-    return self;
-}
-
-- (void)setupView {
-    self.backgroundColor = [UIColor whiteColor];
-    
-    [self addSubview:self.stackView];
-    self.stackView.translatesAutoresizingMaskIntoConstraints = NO;
-    [NSLayoutConstraint activateConstraints:@[
-        [self.stackView.topAnchor constraintEqualToAnchor:self.topAnchor constant:0],
-        [self.stackView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
-        [self.stackView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor],
-        [self.stackView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor constant:0]
-    ]];
-}
-
-- (UIStackView *)stackView {
-    if (!_stackView) {
-        _stackView = [[UIStackView alloc] initWithArrangedSubviews:@[]];
-        _stackView.axis = UILayoutConstraintAxisHorizontal;
-        _stackView.distribution = UIStackViewDistributionFillEqually;
-        _stackView.spacing = 0;
-        _stackView.alignment = UIStackViewAlignmentCenter;
-    }
-    return _stackView;
-}
-
-- (NSMutableArray<UIButton *> *)tabBarButtons {
-    if (!_tabBarButtons) {
-        _tabBarButtons = [NSMutableArray array];
-    }
-    return _tabBarButtons;
-}
-
-- (void)addTabBarItemWithTitle:(NSString *)title 
-                   normalImage:(NSString *)normalImage 
-                 selectedImage:(NSString *)selectedImage {
-    
-    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH/4, self.height)];
-    container.translatesAutoresizingMaskIntoConstraints = NO;
-    
-    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-    button.tag = self.tabBarButtons.count;
-    
-    // 设置图片
-    UIImage *normalImg = [UIImage imageNamed:normalImage];
-    UIImage *selectedImg = [UIImage imageNamed:selectedImage];
-    
-    if (normalImg) {
-        [button setImage:normalImg forState:UIControlStateNormal];
-    }
-    if (selectedImg) {
-        [button setImage:selectedImg forState:UIControlStateSelected];
-    }
-    
-    // 添加点击事件
-    [button addTarget:self action:@selector(tabBarButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-    
-    UIButton *titleButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    titleButton.titleLabel.font = [UIFont systemFontOfSize:10];
-    // 设置标题
-    [titleButton setTitle:title forState:UIControlStateNormal];
-    [titleButton setTitleColor:[UIColor colorWithRed:0.6 green:0.6 blue:0.6 alpha:1.0] forState:UIControlStateNormal];
-    [titleButton setTitleColor:[UIColor colorWithRed:75.0/255.0 green:200.0/255.0 blue:252.0/255.0 alpha:1.0] forState:UIControlStateSelected];
-    
-    [container addSubview:button];
-    [container addSubview:titleButton];
-    
-    // 添加到数组和stackView
-    [self.tabBarButtons addObject:button];
-    [self.stackView addArrangedSubview:container];
-    
-    [container.widthAnchor constraintEqualToConstant:container.size.width].active = YES;
-    [container.heightAnchor constraintEqualToConstant:container.size.height].active = YES;
-    
-    
-    BOOL isFirst = self.tabBarButtons.count == 1;
-    
-    [button mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.size.mas_equalTo(28);
-        make.top.mas_offset(isFirst ? 10 : 16);
-        make.centerX.mas_offset(0);
-    }];
-    
-    [titleButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(button.mas_bottom).mas_offset(6);
-        make.centerX.mas_offset(0);
-    }];
-    
-    // 如果是第一个按钮，设置为选中状态
-    if (isFirst) {
-        [self setSelectedIndex:0 animated:NO];
-    }
-}
-
-- (void)tabBarButtonClicked:(UIButton *)sender {
-    if (sender.isSelected) {
-        return;
-    }
-    NSInteger index = sender.tag;
-    [self setSelectedIndex:index animated:YES];
-    
-    if (self.delegate && [self.delegate respondsToSelector:@selector(customTabbarView:didSelectItemAtIndex:)]) {
-        [self.delegate customTabbarView:self didSelectItemAtIndex:index];
-    }
-}
-
-- (void)setSelectedIndex:(NSInteger)selectedIndex {
-    [self setSelectedIndex:selectedIndex animated:NO];
-}
-
-- (void)setSelectedIndex:(NSInteger)selectedIndex animated:(BOOL)animated {
-    if (selectedIndex < 0 || selectedIndex >= self.tabBarButtons.count) {
-        return;
-    }
-    
-    _selectedIndex = selectedIndex;
-    
-    // 更新按钮状态
-    for (NSInteger i = 0; i < self.tabBarButtons.count; i++) {
-        UIButton *button = self.tabBarButtons[i];
-        button.selected = (i == selectedIndex);
-        [button mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.size.mas_equalTo(button.isSelected ? 60 : 28);
-            make.top.mas_offset(button.isSelected ? 10 : 16);
-        }];
-    }
-}
-
-@end

BuguLive/Class/AppOhters/AppDelegate.m

@@ -142,6 +142,7 @@ static SystemSoundID shake_sound_male_id = 0;
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    /*
     self.alllaunchOptions = launchOptions;
     [self switchLanguage];
     
@@ -275,7 +276,11 @@ static SystemSoundID shake_sound_male_id = 0;
     [self textfieldResponderRemove];
     
     [[IAPManager sharedManager] checkUnfinishedTransactions];
+    */
     
+    self.window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
+    self.window.rootViewController = [BGTabBarController sharedInstance];
+    [self.window makeKeyAndVisible];
     return YES;
 }
 ////配置离线消息推送
@@ -780,6 +785,7 @@ static SystemSoundID shake_sound_male_id = 0;
 - (void)enterLoginUI
 //ShowVC:(BOOL)showVC
 {
+    return;
     if (self.isAlreadyPushLoginVC) {
         return;
     }

BuguLive/Class/General/Base/GKDemo/GKBasePageViewController.h

@@ -12,7 +12,6 @@
 #import "JXCategoryView.h"
 #import "BGNoContentView.h"
 #import "NewestViewController.h"
-#import "BogoHomeTopView.h"
 #import "BogoJXCategoryView.h"
 @class LivingModel;
 @class cuserModel;
@@ -32,7 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 @property (nonatomic, weak) id<PushToLiveControllerDelegate>delegate;
-@property(nonatomic, weak) id<BogoHomeTopViewDelegate> topViewdelegate;
 
 @property (nonatomic, assign) CGRect collectionViewFrame;
 

BuguLive/Class/General/Base/GKDemo/GKBasePageViewController.m

@@ -154,8 +154,8 @@ static NSString *secondHeaderViewIdentifier = @"secondHederview";
 //    titleLabel.textColor = [UIColor colorWithHexString:@"#1A1A1A"];
 //    titleLabel.font = [UIFont boldSystemFontOfSize:20];
 
-    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, SCREEN_HEIGHT)];
-    topImgView.image = [UIImage imageNamed:@"lg_bg"];
+    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kScreenW)];
+    topImgView.image = [UIImage imageNamed:@"bg_top"];
     [self.view addSubview:topImgView];
     
     _dataArray = [[NSMutableArray alloc]init];
@@ -958,9 +958,7 @@ static NSString *secondHeaderViewIdentifier = @"secondHederview";
 }
 
 - (void)handleLiveEvent {
-    if(self.topViewdelegate && [self.topViewdelegate respondsToSelector:@selector(clickLiveBtn)]) {
-        [self.topViewdelegate clickLiveBtn];
-    }
+    
 }
 
 @end

BuguLive/Class/General/Macro/BGSystemMacro.h

@@ -77,13 +77,15 @@ static __inline__ CGFloat MainScreenHeight()
 #define MG_BOTTOM_MARGIN 22
 #define MG_BOTTOM_SAFE_HEIGHT (CGFloat)(isIPhoneX()  ? 34 : 0)
 #define kTopHeight (kStatusBarHeight + kNavigationBarHeight)
-#define TABBAR_HEIGHT (80+MG_BOTTOM_SAFE_HEIGHT)
+#define TABBAR_HEIGHT (49+MG_BOTTOM_SAFE_HEIGHT)
 #define scale_hight1            kScreenH < 600 ? 50 : 55
 #define scale_hight             kScreenH > 667 ? 60 : scale_hight1
 
 // 当前所在window
 #define kCurrentWindow          [AppDelegate sharedAppDelegate].sus_window.rootViewController ? [AppDelegate sharedAppDelegate].sus_window : [AppDelegate sharedAppDelegate].window
 
+#define KMainBgColor [UIColor colorWithHexString:@"#F9F7FC"]
+
 //// 当前系统版本号
 //#define kCurrentVersionNum      [UIDevice currentDevice].systemVersion.doubleValue
 

BuguLive/Class/Sections/DT_Controller(动态)/ViewController/DetailsLineViewController.m

@@ -64,8 +64,8 @@ static CGFloat const kBottomHeight = 44;
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, SCREEN_HEIGHT)];
-    topImgView.image = [UIImage imageNamed:@"lg_bg"];
+    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kScreenW)];
+    topImgView.image = [UIImage imageNamed:@"bg_top"];
     [self.view addSubview:topImgView];
     
     UIView * navView = [[UIView alloc] initWithFrame:CGRectMake(0, StatusBarHeight, SCREEN_WIDTH, NavigationHeight)];

BuguLive/Class/Sections/DT_Controller(动态)/发布/XWPublish/ReleaseDynamicVC.m

@@ -126,8 +126,8 @@ typedef NS_ENUM(NSInteger, BGMediaType)
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, SCREEN_HEIGHT)];
-    topImgView.image = [UIImage imageNamed:@"lg_bg"];
+    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kScreenW)];
+    topImgView.image = [UIImage imageNamed:@"bg_top"];
     [self.view addSubview:topImgView];
     
     [self initNavView];

BuguLive/Class/Sections/FWFreshMeat/MenuCenter/Dynamic/VideoDynamic/VideoDynamicViewC/VideoDynamicViewC.m

@@ -58,8 +58,8 @@
     [self.navigationController setNavigationBarHidden:YES animated:NO];
     self.navigationController.navigationBarHidden = YES;
     
-    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, SCREEN_HEIGHT)];
-    topImgView.image = [UIImage imageNamed:@"lg_bg"];
+    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kScreenW)];
+    topImgView.image = [UIImage imageNamed:@"bg_top"];
     [self.view addSubview:topImgView];
     
     UIView * navView = [[UIView alloc] initWithFrame:CGRectMake(0, StatusBarHeight, SCREEN_WIDTH, NavigationHeight)];

BuguLive/Class/Sections/Home/Controller/HMVideoPlayerViewController.m

@@ -148,7 +148,9 @@
     
     [self.view addSubview:self.rechargeView];
     
-    
+    [self.videoView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.view);
+    }];
     
     
 }

BuguLive/Class/Sections/Home/Controller/VoiceHomeListViewController.h

@@ -7,7 +7,6 @@
 //
 #import "BGNoContentView.h"
 #import "NewestViewController.h"
-#import "BogoHomeTopView.h"
 @class LivingModel;
 @class cuserModel;
 
@@ -23,7 +22,6 @@
 @interface VoiceHomeListViewController : BGBaseViewController
 
 @property (nonatomic, weak) id<PushToLiveControllerDelegate>delegate;
-@property(nonatomic, weak) id<BogoHomeTopViewDelegate> topViewdelegate;
 
 @property (nonatomic, assign) CGRect collectionViewFrame;
 

BuguLive/Class/Sections/Home/Controller/VoiceHomeListViewController.m

@@ -963,9 +963,7 @@ static NSString *secondHeaderViewIdentifier = @"secondHederview";
 }
 
 - (void)handleLiveEvent {
-    if(self.topViewdelegate && [self.topViewdelegate respondsToSelector:@selector(clickLiveBtn)]) {
-        [self.topViewdelegate clickLiveBtn];
-    }
+    
 }
 
 @end

BuguLive/Class/Sections/Home/V3NewUIController/BogoNewsViewController/BogoNewsViewController.m

@@ -86,8 +86,8 @@
 
 - (void)viewDidLoad
 {
-    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, SCREEN_HEIGHT)];
-    topImgView.image = [UIImage imageNamed:@"lg_bg"];
+    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kScreenW)];
+    topImgView.image = [UIImage imageNamed:@"bg_top"];
     [self.view addSubview:topImgView];
     
 //    CAGradientLayer *gradientLayer = [CAGradientLayer layer];

BuguLive/Class/Sections/Home/V3NewUIController/BogoSquare(广场)/BogoSquareViewController.m

@@ -36,8 +36,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, SCREEN_HEIGHT)];
-    topImgView.image = [UIImage imageNamed:@"lg_bg"];
+    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kScreenW)];
+    topImgView.image = [UIImage imageNamed:@"bg_top"];
     [self.view addSubview:topImgView];
     
     

BuguLive/Class/Sections/Home/V3NewUIController/NewHomeUI/Controller/BogoHomeViewController.h

@@ -8,7 +8,6 @@
 
 #import <UIKit/UIKit.h>
 #import "MLMSegmentManager.h"
-#import "BogoHomeTopView.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface BogoHomeViewController : UIViewController
@@ -17,7 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) MLMSegmentLayoutStyle layout;
 @property (nonatomic, strong) MLMSegmentHead *segHead;
 @property (nonatomic, strong) MLMSegmentScroll *segScroll;
-@property(nonatomic, weak) id<BogoHomeTopViewDelegate> topViewdelegate;
 @property(nonatomic, copy) void (^clickSquareBtnBlock)(NSInteger index);
 @end
 

BuguLive/Class/Sections/Home/V3NewUIController/NewHomeUI/Controller/BogoHomeViewController.m

@@ -9,7 +9,6 @@
 #import "BogoHomeViewController.h"
 
 #import "NewestViewController.h"
-#import "BogoHomeTopView.h"
 #import "VideoViewController.h"
 
 #import "BogoSquarePopView.h"
@@ -22,14 +21,13 @@
 #import "MLMSegmentManager.h"
 #import "GKDBViewController.h"
 #import "GameListViewController.h"
-@interface BogoHomeViewController ()<MLMSegmentHeadDelegate,PushToLiveControllerDelegate,UITextFieldDelegate,BogoHomeTopViewDelegate>
+@interface BogoHomeViewController ()<MLMSegmentHeadDelegate,PushToLiveControllerDelegate,UITextFieldDelegate>
 
 @property (nonatomic, strong) NSMutableArray                            *itemTitleMutableArray;         // 完整的分类标题容器
 @property (nonatomic, strong) NSMutableArray    *classifiedModelMutableArray;   // 服务端下发分类的模型容器
 @property (nonatomic, strong) NSMutableArray    *videoVCMutableArray;           // 服务端下发分类的对应的控制器容器
 
 @property(nonatomic, strong) NSArray *listArr;
-@property(nonatomic, strong) BogoHomeTopView *topView;
 
 @property (nonatomic,strong) BogoSquarePopView *AddSquarreView;
 @property(nonatomic, strong) UIButton *publishBtn;
@@ -53,19 +51,20 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
 
-    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, SCREEN_HEIGHT)];
-    topImgView.image = [UIImage imageNamed:@"lg_bg"];
+    UIImageView *topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kScreenW)];
+    topImgView.image = [UIImage imageNamed:@"bg_top"];
     [self.view addSubview:topImgView];
     
 //    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:animated];
     
-    [self.view addSubview:self.topView];
     [self setUpSegView];
     
     [self reloadUserInfoWithOne:YES];
-    [self.topView setHidden:YES];
     [self.view addSubview:self.publishBtn];
-
+    [self.publishBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.equalTo(self.segHead);
+        make.right.mas_offset(-10);
+    }];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -186,14 +185,26 @@
     _segHead.headColor = kClearColor;
 //    _segHead.deSelectColor = [UIColor colorWithHexString:@"#FFFFFF"];
     self.vcs = [self vcArr:_listArr.count];
-    self.view.backgroundColor = kClearColor;
+    self.view.backgroundColor = KMainBgColor;
     _segScroll = [[MLMSegmentScroll alloc] initWithFrame:CGRectMake(0,  kStatusBarHeight - kRealValue(8) + 46  + 10, SCREEN_WIDTH, SCREEN_HEIGHT-CGRectGetMaxY(_segHead.frame) - kNavigationBarHeight - 40) vcOrViews:self.vcs];
     _segScroll.loadAll = NO;
     _segScroll.showIndex = 0;
     
     [MLMSegmentManager associateHead:_segHead withScroll:_segScroll completion:^{
-        [self.view addSubview:_segHead];
-        [self.view addSubview:_segScroll];
+        [self.view addSubview:self.segHead];
+        [self.view addSubview:self.segScroll];
+        [self.segHead mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_offset(0);
+            make.height.mas_equalTo(kRealValue(46));
+            make.right.mas_offset(-kRealValue(46));
+            make.top.mas_offset(StatusBarHeight+8);
+        }];
+        
+        [self.segScroll mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.mas_offset(0);
+            make.top.equalTo(self.segHead.mas_bottom).mas_offset(0);
+            make.bottom.mas_offset(0);
+        }];
     }];
 //    [self updateClassiFiedVC];
     
@@ -267,7 +278,6 @@
     VoiceHomeListViewController *voiceRoom = [VoiceHomeListViewController new];
     voiceRoom.types = @"1";
     voiceRoom.delegate = self;
-    voiceRoom.topViewdelegate = self;
     GameListViewController *gameVc = [[GameListViewController alloc] init];
     
 //    xiaoshipinBottom = 64 + 50;
@@ -349,10 +359,8 @@
 -(void)didSelectedIndex:(NSInteger)index{
     if (index == 0){
         [self.publishBtn setHidden:NO];
-        [self.topView setHidden:YES];
     }else{
         [self.publishBtn setHidden:YES];
-        [self.topView setHidden:NO];
     }
     _segScroll.showIndex = index;
 //    [_segScroll addViewCacheIndex:index];
@@ -505,15 +513,6 @@
     }];
 }
 
-
--(BogoHomeTopView *)topView{
-    if (!_topView) {
-        _topView = [[BogoHomeTopView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, kRealValue(44) + StatusBarHeight)];
-        _topView.delegate = self;
-    }
-    return _topView;
-}
-
 -(BogoSquarePopView *)AddSquarreView{
     if (!_AddSquarreView) {
         _AddSquarreView = [[BogoSquarePopView alloc]initWithFrame:CGRectMake(0, 0, kRealValue(90), kRealValue(98))];
@@ -535,18 +534,7 @@
 
 - (void)clickLiveBtn
 {
-    if(self.topViewdelegate && [self.topViewdelegate respondsToSelector:@selector(clickLiveBtn)]){
-        [self.topViewdelegate clickLiveBtn];
-    }
-}
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
+    
 }
-*/
 
 @end

BuguLive/Class/Sections/Home/V3NewUIController/NewHomeUI/View/BogoHomeTopView.h

@@ -1,35 +0,0 @@
-//
-//  BogoHomeTopView.h
-//  BuguLive
-//
-//  Created by 宋晨光 on 2021/3/18.
-//  Copyright © 2021 xfg. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-//点击直播的代理
-@protocol BogoHomeTopViewDelegate <NSObject>
-
--(void)clickLiveBtn;
-
-@end
-
-
-
-
-@interface BogoHomeTopView : UIView<UITextFieldDelegate>
-
-@property(nonatomic, strong) UIImageView *topImgView;
-@property(nonatomic, strong) UIButton    *msgBtn;
-@property(nonatomic, strong) UITextField    *searchField;
-
-@property(nonatomic, weak) id<BogoHomeTopViewDelegate> delegate;
-
-
-
-@end
-
-NS_ASSUME_NONNULL_END

BuguLive/Class/Sections/Home/V3NewUIController/NewHomeUI/View/BogoHomeTopView.m

@@ -1,262 +0,0 @@
-//
-//  BogoHomeTopView.m
-//  BuguLive
-//
-//  Created by 宋晨光 on 2021/3/18.
-//  Copyright © 2021 xfg. All rights reserved.
-//
-
-#import "BogoHomeTopView.h"
-#import "SSearchVC.h"
-#import "BGConversationSegmentController.h"
-
-#import "AgreementViewController.h"
-#import "PublishLivestViewController.h"
-#import "SIdentificationVC.h"
-#import "BogoSearchViewController.h"
-#import "LeaderboardViewController.h"
-@implementation BogoHomeTopView
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self setUpView];
-    }
-    return self;
-}
-
-//- (instancetype)init
-//{
-//    self = [super init];
-//    if (self) {
-//        [self setUpView];
-//    }
-//    return self;
-//}
-
--(void)setUpView{
-    self.topImgView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, kScreenW, self.height)];
-    self.topImgView.image = [UIImage imageNamed:@"bogo_home_topImgView"];
-    self.topImgView.userInteractionEnabled = YES;
-    
-//    CAGradientLayer *gl = [CAGradientLayer layer];
-//    gl.frame = CGRectMake(0, 0, kScreenW, self.height);
-//    gl.startPoint = CGPointMake(0, 0);
-//    gl.endPoint = CGPointMake(1, 1);
-//    gl.colors = @[(__bridge id)[UIColor colorWithRed:119/255.0 green:52/255.0 blue:254/255.0 alpha:1.0].CGColor,(__bridge id)[UIColor colorWithRed:175/255.0 green:26/255.0 blue:251/255.0 alpha:1.0].CGColor];
-//    gl.locations = @[@(0.0),@(1.0f)];
-
-//    [self.topImgView.layer addSublayer:gl];
-    
-//    self.topImgView.backgroundColor = [UIColor colorWithHexString:@""];
-    self.searchField.left = kRealValue(12);
-    
-    self.searchField.top = kStatusBarHeight + 5;
-    self.msgBtn.centerY = self.searchField.centerY;
-//    = kRealValue(30) + self.searchField.height / 2 + 10;
-    
-    [self addSubview:self.topImgView];
-    self.topImgView.hidden = YES;
-    
-    UIButton *searchBtn = [[UIButton alloc] init];
-    [searchBtn setBackgroundImage:[UIImage imageNamed:@"habibi_sousuo"] forState:UIControlStateNormal];
-    [self addSubview:searchBtn];
-    
-    UILabel * searchLabel = [[UILabel alloc] init];
-    searchLabel.text = ASLocalizedString(@"搜索");
-    searchLabel.font = [UIFont systemFontOfSize:12];
-    searchLabel.textColor = [UIColor colorWithHexString:@"#333333"];
-    [searchBtn addSubview:searchLabel];
-    
-    
-    UIButton *startLive = [[UIButton alloc] init];
-    [startLive setImage:[UIImage imageNamed:@"开播"] forState:UIControlStateNormal];
-    [startLive addTarget:self action:@selector(handleLiveEvent) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:startLive];
-    
-    UIButton *paihangBtn = [[UIButton alloc] init];
-    [paihangBtn setImage:[UIImage imageNamed:@"hbibi_paihagnbang"] forState:UIControlStateNormal];
-    [self addSubview:paihangBtn];
-    
-    [paihangBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(startLive.mas_left).offset(kRealValue(-10));
-        make.size.height.equalTo(@kRealValue(30));
-        make.size.width.equalTo(@kRealValue(30));
-        make.centerY.equalTo(startLive);
-    }];
-    
-    [searchBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-//        make.right.equalTo(paihangBtn.mas_left).offset(kRealValue(-10));
-//        make.size.height.equalTo(@kRealValue(28));
-////        make.size.width.equalTo(@kRealValue(140));
-//        make.width.mas_equalTo(140);
-//        make.centerY.equalTo(startLive);
-        
-        make.right.mas_equalTo(paihangBtn.mas_left).mas_offset(-10);
-        make.centerY.mas_equalTo(startLive);
-        make.width.mas_equalTo(70);
-        make.height.mas_equalTo(28);
-    }];
-    
-    [searchLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(searchBtn);
-        make.centerX.mas_equalTo(searchBtn).mas_offset(10);
-    }];
-    
-    [startLive mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self).offset(kRealValue(-10));
-        make.size.height.equalTo(@kRealValue(30));
-        make.size.width.equalTo(@kRealValue(30));
-        make.top.equalTo(self).offset(kStatusBarHeight + kRealValue(5));
-    }];
-    
-    
-    [searchBtn addTarget:self action:@selector(clickSearch:) forControlEvents:UIControlEventTouchUpInside];
-    [paihangBtn addTarget:self action:@selector(clickPaihang) forControlEvents:UIControlEventTouchUpInside];
-
-    
-//    [self addSubview:self.searchField];
-
-//    [self addSubview:self.msgBtn];
-}
-
-- (void)handleLiveEvent {
-    if(self.delegate && [self.delegate respondsToSelector:@selector(clickLiveBtn)]) {
-        [self.delegate clickLiveBtn];
-    }
-}
-
-
-- (void)clickPaihang {
-    
-    LeaderboardViewController *lbVCtr = [[LeaderboardViewController alloc] init];
-    lbVCtr.isHiddenTabbar = YES;
-    [[AppDelegate sharedAppDelegate]pushViewController:lbVCtr animated:YES];
-    
-
-}
-
--(void)clickMsgBtn:(UIButton *)sender{
-    
-//    UserModel *userModel = [GlobalVariables sharedInstance].userModel;
-    
-//    NSString *idStr;  //认证
-//    if ([userModel.is_authentication intValue] ==0)
-//    {
-//        idStr = ASLocalizedString(@"未认证");
-//    }
-//    if ([userModel.is_authentication intValue] ==1)
-//    {
-//        idStr = ASLocalizedString(@"等待审核");
-//    }
-//    if ([userModel.is_authentication intValue] ==2)
-//    {
-//        idStr = ASLocalizedString(@"已认证");
-//    }
-//    if ([userModel.is_authentication intValue] ==3)
-//    {
-//        idStr = ASLocalizedString(@"审核不通过");
-//    }
-    
-    if ([GlobalVariables sharedInstance].appModel.must_authentication.intValue == 1) {
-        if ([GlobalVariables sharedInstance].userModel.is_authentication.intValue != 2) {
-            [self showAuthView];
-            return;
-        }
-    }
-
-    IMALoginParam *loginParam = [IMALoginParam loadFromLocal];
-    if (loginParam.isAgree ==1)
-    {
-        if (AppDelegate.sharedAppDelegate.isInAudioVideoChatVc) {
-            [[BGHUDHelper sharedInstance] tipMessage:ASLocalizedString(@"通话中，请结束通话后再试")];
-            return;
-        }
-        
-        PublishLivestViewController *pvc = [[PublishLivestViewController alloc] init];
-        [[AppDelegate sharedAppDelegate] presentViewController:pvc animated:YES completion:^{
-            
-        }];
-    }
-    else
-    {
-        AgreementViewController *agreeVC = [AgreementViewController webControlerWithUrlStr:[GlobalVariables sharedInstance].appModel.agreement_link isShowIndicator:YES isShowNavBar:YES];
-        [[AppDelegate sharedAppDelegate] presentViewController:agreeVC animated:YES completion:^{
-            
-        }];
-    }
-    
-//    BGConversationSegmentController *chatListVC = [[BGConversationSegmentController alloc]init];
-//    [[AppDelegate sharedAppDelegate] pushViewController:chatListVC animated:YES];
-}
-
-//是否已认证
--(void)showAuthView{
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:ASLocalizedString(@"您当前还未实名认证，需要认证后才能开始直播")preferredStyle:UIAlertControllerStyleAlert];
-    
-    UIAlertAction *actionCacel = [UIAlertAction actionWithTitle:ASLocalizedString(@"取消")style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
-        
-    }];
-    UIAlertAction *actionConfirm = [UIAlertAction actionWithTitle:ASLocalizedString(@"立即认证")style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        UserModel *userModel = [GlobalVariables sharedInstance].userModel;
-        SIdentificationVC *identificationVC = [[SIdentificationVC alloc]init];
-        identificationVC.user_id = userModel.user_id;
-        identificationVC.sexString = userModel.sex;
-        identificationVC.nameString = userModel.nick_name;
-        [[AppDelegate sharedAppDelegate] pushViewController:identificationVC animated:YES];
-
-    }];
-    
-    [alertController addAction:actionCacel];
-    [alertController addAction:actionConfirm];
-    [[AppDelegate sharedAppDelegate].topViewController presentViewController:alertController animated:YES completion:nil];
-}
-
--(void)clickSearch:(UITapGestureRecognizer *)sender{
-//    SSearchVC *searchVC = [[SSearchVC alloc]init];
-//    searchVC.searchType = @"0";
-//    [[AppDelegate sharedAppDelegate] pushViewController:searchVC animated:YES];
-    BogoSearchViewController *searchVC = [[BogoSearchViewController alloc]initWithNibName:@"BogoSearchViewController" bundle:[NSBundle mainBundle]];
-    [[AppDelegate sharedAppDelegate] pushViewController:searchVC animated:YES];
-}
-
--(UITextField *)searchField{
-    if (!_searchField) {
-        
-        _searchField = [[UITextField alloc]initWithFrame:CGRectMake(kRealValue(12), 0, kScreenW - kRealValue(39) - kRealValue(22) - kRealValue(12 * 2),kRealValue(32))];
-        _searchField.text = ASLocalizedString(@"请输入搜索内容");
-        _searchField.font = [UIFont systemFontOfSize:14];
-        _searchField.textColor = [UIColor colorWithHexString:@"#AAAAAA"];
-        _searchField.backgroundColor = kWhiteColor;
-        _searchField.layer.cornerRadius = kRealValue(32 / 2);
-        _searchField.layer.masksToBounds = YES;
-        UIView *leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, 33, 33)];
-        UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 15, 15)];
-        imageView.image = [UIImage imageNamed:@"bogo_home_top_search"];
-        imageView.center = leftView.center;
-        [leftView addSubview:imageView];
-        _searchField.leftView = leftView;
-        _searchField.leftViewMode = UITextFieldViewModeAlways;
-        _searchField.delegate = self;
-        
-        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickSearch:)];
-        [_searchField addGestureRecognizer:tap];
-    }
-    return _searchField;
-}
-
--(UIButton *)msgBtn{
-    if (!_msgBtn) {
-        _msgBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_msgBtn setImage:[UIImage imageNamed:@"bogo_home_live_start"] forState:UIControlStateNormal];
-        [_msgBtn addTarget:self action:@selector(clickMsgBtn:) forControlEvents:UIControlEventTouchUpInside];
-        _msgBtn.frame = CGRectMake(kScreenW - kRealValue(50), 0, kRealValue(30), kRealValue(50));
-    }
-    return _msgBtn;
-}
-
-
-
-
-@end

BuguLive/Class/Sections/Home/View/HMVideoControlView.h

@@ -39,10 +39,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface HMVideoItemButton : UIButton
-
-@end
-
 @interface HMVideoControlView : BGBaseView
 
 @property (nonatomic, weak) id<HMVideoControlViewDelegate> delegate;
@@ -52,11 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) SmallVideoListModel    *model;
 
-@property (nonatomic, strong) HMVideoItemButton   *commentBtn;
-
-@property (nonatomic, strong) UIButton *commentButton;
-
-@property(nonatomic, strong) UIButton *moreBtn;
+@property (nonatomic, strong) QMUIButton   *commentBtn;
 
 @property(nonatomic, assign) BOOL isPushed;
 

BuguLive/Class/Sections/Home/View/HMVideoControlView.m

@@ -7,61 +7,20 @@
 //
 
 #import "HMVideoControlView.h"
-#import "HMVideoSliderView.h"
 #import "PersonCenterModel.h"
 #import "CommentModel.h"
 #import "BogoShopKit.h"
 
-// 判断是否是iPhone X系列
-#define IS_iPhoneX      ([UIScreen instancesRespondToSelector:@selector(currentMode)] ?\
-(\
-CGSizeEqualToSize(CGSizeMake(375, 812),[UIScreen mainScreen].bounds.size)\
-||\
-CGSizeEqualToSize(CGSizeMake(812, 375),[UIScreen mainScreen].bounds.size)\
-||\
-CGSizeEqualToSize(CGSizeMake(414, 896),[UIScreen mainScreen].bounds.size)\
-||\
-CGSizeEqualToSize(CGSizeMake(896, 414),[UIScreen mainScreen].bounds.size))\
-:\
-NO)
-#define ADAPTATIONRATIO     kScreenW / 750.0f
-#define TABBAR_HEIGHT       (IS_iPhoneX ? 83.0f : 49.0f)
-
-@implementation HMVideoItemButton
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    
-    [self.imageView sizeToFit];
-    [self.titleLabel sizeToFit];
-    
-    CGFloat width = self.frame.size.width;
-    CGFloat height = self.frame.size.height;
-    
-    CGFloat imgW = self.imageView.frame.size.width;
-    CGFloat imgH = self.imageView.frame.size.height;
-    
-    self.imageView.frame = CGRectMake((width - imgH) / 2, 0, imgW, imgH);
-    
-    CGFloat titleW = self.titleLabel.frame.size.width;
-    CGFloat titleH = self.titleLabel.frame.size.height;
-    
-    self.titleLabel.frame = CGRectMake((width - titleW) / 2, height - titleH + 5, titleW, titleH);
-}
-
-@end
-
 @interface HMVideoControlView ()
 
 @property (nonatomic, strong) UIImageView           *iconView;
-@property (nonatomic, strong) HMVideoItemButton   *praiseBtn;
-@property (nonatomic, strong) HMVideoItemButton   *shareBtn;
-@property (nonatomic, strong) HMVideoItemButton   *oneOnOneBtn;
-@property (nonatomic, strong) HMVideoItemButton   *giftBtn;
+@property (nonatomic, strong) QMUIButton   *praiseBtn;
+@property (nonatomic, strong) QMUIButton   *shareBtn;
+@property (nonatomic, strong) QMUIButton   *oneOnOneBtn;
+//@property (nonatomic, strong) QMUIButton   *giftBtn;
 
 @property (nonatomic, strong) UILabel               *nameLabel;
 @property (nonatomic, strong) UILabel               *contentLabel;
-@property (nonatomic, strong) HMVideoSliderView          *sliderView;
 
 @property (nonatomic, strong) UIActivityIndicatorView   *loadingView;
 @property (nonatomic, strong) UIButton                  *playBtn;
@@ -75,6 +34,9 @@ NO)
 
 @property(nonatomic, strong) BogoVideoGoodControl *goodControl;
 
+@property (nonatomic, strong) UIStackView *stackView;
+@property (nonatomic, strong) UIView *avatarView;
+
 @end
 
 @implementation HMVideoControlView
@@ -83,31 +45,12 @@ NO)
     if (self = [super init]) {
         self.isPushed = isPushed;
         [self addSubview:self.coverImgView];
-        [self addSubview:self.iconView];
-        [self addSubview:self.praiseBtn];
-        [self addSubview:self.commentBtn];
-        [self addSubview:self.shareBtn];
-        [self addSubview:self.oneOnOneBtn];
-        if (![GlobalVariables sharedInstance].userModel.is_open_young.integerValue) {
-            [self addSubview:self.giftBtn];
-        }
+        [self addSubview:self.stackView];
         [self addSubview:self.nameLabel];
         [self addSubview:self.contentLabel];
-        [self addSubview:self.sliderView];
         
         [self addSubview:self.loadingView];
         [self addSubview:self.playBtn];
-        [self addSubview:self.commentButton];
-        
-        
-        [self addSubview:self.moreBtn];
-        
-        [self.moreBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.right.mas_equalTo(-20);
-            make.top.mas_equalTo(kStatusBarHeight);
-            make.width.mas_equalTo(40);
-            make.height.mas_equalTo(kRealValue(30));
-        }];
         
         [self.coverImgView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(self);
@@ -121,69 +64,18 @@ NO)
         if (self.isPushed){
             bottomM = TABBAR_HEIGHT;
         }
-        [self.sliderView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.equalTo(self);
-            make.bottom.equalTo(self).offset(-bottomM);
-            make.height.mas_equalTo(ADAPTATIONRATIO * 1.0f);
-        }];
         
         [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.equalTo(self).offset(ADAPTATIONRATIO * 30.0f);
-            make.bottom.equalTo(self.sliderView).offset(-ADAPTATIONRATIO * 30.0f);
-            make.width.mas_equalTo(ADAPTATIONRATIO * 504.0f);
+            make.left.equalTo(self).offset(kRealValue(12));
+            make.bottom.mas_offset(kRealValue(-18));
+            make.width.mas_lessThanOrEqualTo(kRealValue(275));
         }];
         
         [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.equalTo(self.contentLabel);
-            make.bottom.equalTo(self.contentLabel.mas_top).offset(-ADAPTATIONRATIO * 20.0f);
+            make.bottom.equalTo(self.contentLabel.mas_top).offset(-8);
         }];
         
-        [self.oneOnOneBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.right.equalTo(self).offset(-ADAPTATIONRATIO * 15.0f);
-            make.bottom.equalTo(self.contentLabel.mas_bottom).offset(-ADAPTATIONRATIO * 10.0f);
-            make.height.mas_equalTo(ADAPTATIONRATIO * 110.0f);
-        }];
-        
-        if (![GlobalVariables sharedInstance].userModel.is_open_young.integerValue) {
-            [self.giftBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.right.equalTo(self).offset(-ADAPTATIONRATIO * 25.0f);
-                make.bottom.equalTo(self.nameLabel.mas_top).offset(-ADAPTATIONRATIO * 50.0f);
-    //            make.centerX.mas_equalTo()
-                make.height.mas_equalTo(ADAPTATIONRATIO * 55.0f);
-            }];
-            
-            [self.shareBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-    //            make.right.equalTo(self).offset(-ADAPTATIONRATIO * 30.0f);
-                make.centerX.mas_equalTo(self.giftBtn.mas_centerX);
-                make.bottom.equalTo(self.giftBtn.mas_top).offset(-ADAPTATIONRATIO * 40.0f);
-                make.height.mas_equalTo(ADAPTATIONRATIO * 110.0f);
-            }];
-        }else{
-            [self.shareBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-    //            make.right.equalTo(self).offset(-ADAPTATIONRATIO * 30.0f);
-                make.right.equalTo(self).offset(-ADAPTATIONRATIO * 25.0f);
-                make.bottom.equalTo(self.nameLabel.mas_top).offset(-ADAPTATIONRATIO * 90.0f);
-                make.height.mas_equalTo(ADAPTATIONRATIO * 110.0f);
-            }];
-        }
-        
-        [self.commentBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerX.equalTo(self.shareBtn);
-            make.bottom.equalTo(self.shareBtn.mas_top).offset(-ADAPTATIONRATIO * 45.0f);
-            make.height.mas_equalTo(ADAPTATIONRATIO * 110.0f);
-        }];
-        
-        [self.praiseBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerX.equalTo(self.shareBtn);
-            make.bottom.equalTo(self.commentBtn.mas_top).offset(-ADAPTATIONRATIO * 45.0f);
-            make.height.mas_equalTo(ADAPTATIONRATIO * 110.0f);
-        }];
-        
-        [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerX.equalTo(self.shareBtn);
-            make.bottom.equalTo(self.praiseBtn.mas_top).offset(-ADAPTATIONRATIO * 70.0f);
-            make.width.height.mas_equalTo(ADAPTATIONRATIO * 100.0f);
-        }];
         
         [self.loadingView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.center.equalTo(self);
@@ -193,17 +85,11 @@ NO)
             make.center.equalTo(self);
         }];
         
-        [self.commentButton mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.equalTo(self).offset(10);
-            make.top.equalTo(self.sliderView.mas_bottom).offset(10);
-            make.right.equalTo(self);
-        }];
-        
-        [self addSubview:self.focusBtn];
-        [self.focusBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerX.equalTo(self.iconView);
-            make.centerY.equalTo(self.iconView.mas_bottom);
+        [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.bottom.mas_equalTo(self.contentLabel);
+            make.right.mas_offset(kRealValue(-12));
         }];
+
         
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(controlViewDidClick:)];
         [self addGestureRecognizer:tap];
@@ -219,12 +105,11 @@ NO)
     _model = model;
     
     if ([model.user_id isEqualToString:[[IMAPlatform sharedInstance].host imUserId]]) {
-        self.giftBtn.hidden = YES;
+//        self.giftBtn.hidden = YES;
     }else{
-        self.giftBtn.hidden = NO;
+//        self.giftBtn.hidden = NO;
     }
     
-    self.sliderView.value = 0;
     //
     [self.coverImgView sd_setImageWithURL:[NSURL URLWithString:model.photo_image] placeholderImage:[UIImage imageNamed:@"placeholderimg"]];
     //
@@ -239,9 +124,7 @@ NO)
     
     if (![self.model.user_id isEqualToString:[BGIMLoginManager sharedInstance].loginParam.identifier]){
         [self.focusBtn setHidden:[model.has_focus isEqualToString:@"1"]];
-        self.moreBtn.hidden = YES;
     }else{
-        self.moreBtn.hidden = NO;
         self.focusBtn.hidden = NO;
     }
     [self loadNetDataWithPage:1];
@@ -411,7 +294,7 @@ NO)
 
 #pragma mark - Public Methods
 - (void)setProgress:(float)progress {
-    self.sliderView.value = progress;
+    
 }
 
 - (void)startLoading {
@@ -529,6 +412,48 @@ NO)
 }
 
 #pragma mark - 懒加载
+
+- (UIStackView *)stackView {
+    if (!_stackView) {
+        
+        NSMutableArray *buttons = [[NSMutableArray alloc] initWithArray:@[
+            self.avatarView, self.praiseBtn, self.commentBtn, self.shareBtn, self.oneOnOneBtn
+        ]];
+        
+        _stackView = [[UIStackView alloc] initWithArrangedSubviews:buttons];
+        _stackView.axis = UILayoutConstraintAxisVertical;
+        _stackView.distribution = UIStackViewDistributionEqualSpacing;
+        _stackView.alignment = UIStackViewAlignmentCenter;
+        _stackView.spacing = 10;
+    }
+    return _stackView;
+}
+
+- (UIView *)avatarView {
+    if (!_avatarView) {
+        _avatarView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kRealValue(48), kRealValue(58))];
+        [_avatarView addSubview:self.iconView];
+        [_avatarView addSubview:self.focusBtn];
+        [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.size.mas_equalTo(self.iconView.size);
+            make.top.centerX.mas_offset(0);
+        }];
+        
+        [self.focusBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.mas_offset(0);
+            make.centerY.equalTo(self.iconView.mas_bottom);
+            make.size.mas_equalTo(kRealValue(20));
+        }];
+        
+        [_avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.size.mas_equalTo(self.avatarView.size);
+        }];
+        
+    }
+    
+    return _avatarView;
+}
+
 - (UIImageView *)coverImgView {
     if (!_coverImgView) {
         _coverImgView = [UIImageView new];
@@ -540,8 +465,8 @@ NO)
 
 - (UIImageView *)iconView {
     if (!_iconView) {
-        _iconView = [UIImageView new];
-        _iconView.layer.cornerRadius = ADAPTATIONRATIO * 50.0f;
+        _iconView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kRealValue(48), kRealValue(48))];
+        _iconView.layer.cornerRadius = _iconView.height/2;
         _iconView.layer.masksToBounds = YES;
         _iconView.layer.borderColor = [UIColor whiteColor].CGColor;
         _iconView.layer.borderWidth = 1.0f;
@@ -553,61 +478,66 @@ NO)
     return _iconView;
 }
 
-- (HMVideoItemButton *)praiseBtn {
+- (QMUIButton *)praiseBtn {
     if (!_praiseBtn) {
-        _praiseBtn = [HMVideoItemButton new];
-        [_praiseBtn setImage:[UIImage imageNamed:@"me_icon_star_normal"] forState:UIControlStateNormal];
-        [_praiseBtn setImage:[UIImage imageNamed:@"me_icon_star_selected"] forState:UIControlStateSelected];
-        _praiseBtn.titleLabel.font = [UIFont systemFontOfSize:13.0f];
+        _praiseBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
+        [_praiseBtn setImage:[UIImage imageNamed:@"icon22x22-2"] forState:UIControlStateNormal];
+        [_praiseBtn setImage:[UIImage imageNamed:@"icon22x22-2"] forState:UIControlStateSelected];
+        [_praiseBtn setTitle:@"0" forState:UIControlStateNormal];
+        _praiseBtn.imagePosition = QMUIButtonImagePositionTop;
+        _praiseBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_praiseBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         [_praiseBtn addTarget:self action:@selector(praiseBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _praiseBtn;
 }
 
-- (HMVideoItemButton *)commentBtn {
+- (QMUIButton *)commentBtn {
     if (!_commentBtn) {
-        _commentBtn = [HMVideoItemButton new];
-        [_commentBtn setImage:[UIImage imageNamed:@"me_icon_comment"] forState:UIControlStateNormal];
-        _commentBtn.titleLabel.font = [UIFont systemFontOfSize:13.0f];
+        _commentBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
+        [_commentBtn setImage:[UIImage imageNamed:@"icon22x22"] forState:UIControlStateNormal];
+        [_commentBtn setTitle:@"0" forState:UIControlStateNormal];
+        _commentBtn.imagePosition = QMUIButtonImagePositionTop;
+        _commentBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_commentBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         [_commentBtn addTarget:self action:@selector(commentBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _commentBtn;
 }
 
-- (HMVideoItemButton *)shareBtn {
+- (QMUIButton *)shareBtn {
     if (!_shareBtn) {
-        _shareBtn = [HMVideoItemButton new];
-        [_shareBtn setImage:[UIImage imageNamed:@"me_icon_share"] forState:UIControlStateNormal];
-        _shareBtn.titleLabel.font = [UIFont systemFontOfSize:13.0f];
+        _shareBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
+        [_shareBtn setImage:[UIImage imageNamed:@"icon22x22-3"] forState:UIControlStateNormal];
+        [_shareBtn setTitle:@"0" forState:UIControlStateNormal];
+        _shareBtn.imagePosition = QMUIButtonImagePositionTop;
+        _shareBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_shareBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         [_shareBtn addTarget:self action:@selector(shareBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+        
     }
     return _shareBtn;
 }
 
--(HMVideoItemButton *)giftBtn{
-    if (!_giftBtn) {
-        _giftBtn = [HMVideoItemButton new];
-        [_giftBtn setImage:[UIImage imageNamed:@"mg_video_gift"] forState:UIControlStateNormal];
-        _giftBtn.titleLabel.font = [UIFont systemFontOfSize:13.0f];
-        [_giftBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        [_giftBtn addTarget:self action:@selector(giftBtnClick:) forControlEvents:UIControlEventTouchUpInside];
-        if (kIsCheckingVersion())
-        {
-            _giftBtn.hidden = YES;
-        }
-    }
-    return _giftBtn;
-}
+//-(HMVideoItemButton *)giftBtn{
+//    if (!_giftBtn) {
+//        _giftBtn = [HMVideoItemButton new];
+//        [_giftBtn setImage:[UIImage imageNamed:@"mg_video_gift"] forState:UIControlStateNormal];
+//        _giftBtn.titleLabel.font = [UIFont systemFontOfSize:13.0f];
+//        [_giftBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+//        [_giftBtn addTarget:self action:@selector(giftBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+//        if (kIsCheckingVersion())
+//        {
+//            _giftBtn.hidden = YES;
+//        }
+//    }
+//    return _giftBtn;
+//}
 
-- (HMVideoItemButton *)oneOnOneBtn {
+- (QMUIButton *)oneOnOneBtn {
     if (!_oneOnOneBtn) {
-        _oneOnOneBtn = [HMVideoItemButton new];
-        [_oneOnOneBtn setImage:[UIImage imageNamed:@"me_icon_im_video"] forState:UIControlStateNormal];
-        _oneOnOneBtn.titleLabel.font = [UIFont systemFontOfSize:13.0f];
-        [_oneOnOneBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        _oneOnOneBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
+        [_oneOnOneBtn setImage:[UIImage imageNamed:@"容器 2590"] forState:UIControlStateNormal];
         [_oneOnOneBtn addTarget:self action:@selector(oneOnOneBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _oneOnOneBtn;
@@ -636,17 +566,6 @@ NO)
     return _contentLabel;
 }
 
-- (HMVideoSliderView *)sliderView {
-    if (!_sliderView) {
-        _sliderView = [HMVideoSliderView new];
-        _sliderView.isHideSliderBlock = YES;
-        _sliderView.sliderHeight = ADAPTATIONRATIO * 1.0f;
-        _sliderView.maximumTrackTintColor = [UIColor grayColor];
-        _sliderView.minimumTrackTintColor = [UIColor whiteColor];
-    }
-    return _sliderView;
-}
-
 - (UIActivityIndicatorView *)loadingView {
     if (!_loadingView) {
         _loadingView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
@@ -665,31 +584,6 @@ NO)
     return _playBtn;
 }
 
-- (UIButton *)commentButton{
-    if (!_commentButton) {
-        _commentButton = [[UIButton alloc]initWithFrame:CGRectZero];
-        [_commentButton setBackgroundColor:kClearColor];
-        [_commentButton setTitle:ASLocalizedString(@"想撩TA，先评论")forState:UIControlStateNormal];
-        [_commentButton.titleLabel setFont:[UIFont systemFontOfSize:15]];
-        _commentButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
-        [_commentButton.titleLabel setTextColor:[kWhiteColor colorWithAlphaComponent:0.5]];
-        _commentButton.hidden = YES;
-        [_commentButton addTarget:self action:@selector(commentBtnAction) forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _commentButton;
-}
-
--(UIButton *)moreBtn{
-    if (!_moreBtn) {
-        _moreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _moreBtn.frame = CGRectMake(kScreenW - kRealValue(10) - 64, kStatusBarHeight, kRealValue(44), kRealValue(44));
-        [_moreBtn setImage:[UIImage imageNamed:@"video_more_Btn"] forState:UIControlStateNormal];
-        [_moreBtn addTarget:self action:@selector(clickMoreBtn:) forControlEvents:UIControlEventTouchUpInside];
-        _moreBtn.hidden = YES;
-    }
-    return _moreBtn;
-}
-
 
 -(void)clickMoreBtn:(UIButton *)sender{
     if ([self.delegate respondsToSelector:@selector(controlViewDidClickMoreBtn:)]) {
@@ -700,7 +594,7 @@ NO)
 - (UIButton *)focusBtn{
     if (!_focusBtn) {
         _focusBtn = [[UIButton alloc]initWithFrame:CGRectZero];
-        [_focusBtn setImage:[UIImage imageNamed:@"me_icon_focus"] forState:UIControlStateNormal];
+        [_focusBtn setImage:[UIImage imageNamed:@"容器 2584"] forState:UIControlStateNormal];
         [_focusBtn addTarget:self action:@selector(focusBtnAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _focusBtn;

BuguLive/Class/Sections/Home/View/HMVideoSliderView.h

@@ -1,77 +0,0 @@
-//
-//  HMVideoSliderView.h
-//  BuguLive
-//
-//  Created by 范东 on 2018/12/27.
-//  Copyright © 2018 xfg. All rights reserved.
-//
-
-#import "BGBaseView.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol HMVideoSliderViewDelegate <NSObject>
-
-@optional
-// 滑块滑动开始
-- (void)sliderTouchBegan:(float)value;
-// 滑块滑动中
-- (void)sliderValueChanged:(float)value;
-// 滑块滑动结束
-- (void)sliderTouchEnded:(float)value;
-// 滑杆点击
-- (void)sliderTapped:(float)value;
-
-@end
-
-@interface HMVideoSliderView : BGBaseView
-
-@property (nonatomic, weak) id<HMVideoSliderViewDelegate> delegate;
-
-/** 默认滑杆的颜色 */
-@property (nonatomic, strong) UIColor *maximumTrackTintColor;
-/** 滑杆进度颜色 */
-@property (nonatomic, strong) UIColor *minimumTrackTintColor;
-/** 缓存进度颜色 */
-@property (nonatomic, strong) UIColor *bufferTrackTintColor;
-
-/** 默认滑杆的图片 */
-@property (nonatomic, strong) UIImage *maximumTrackImage;
-/** 滑杆进度的图片 */
-@property (nonatomic, strong) UIImage *minimumTrackImage;
-/** 缓存进度的图片 */
-@property (nonatomic, strong) UIImage *bufferTrackImage;
-
-/** 滑杆进度 */
-@property (nonatomic, assign) float value;
-/** 缓存进度 */
-@property (nonatomic, assign) float bufferValue;
-
-/** 是否允许点击，默认是YES */
-@property (nonatomic, assign) BOOL allowTapped;
-/** 设置滑杆的高度 */
-@property (nonatomic, assign) CGFloat sliderHeight;
-
-/** 是否隐藏滑块（默认为NO） */
-@property (nonatomic, assign) BOOL isHideSliderBlock;
-
-// 设置滑块背景色
-- (void)setBackgroundImage:(UIImage *)image forState:(UIControlState)state;
-// 设置滑块图片
-- (void)setThumbImage:(UIImage *)image forState:(UIControlState)state;
-
-// 显示菊花动画
-- (void)showLoading;
-// 隐藏菊花动画
-- (void)hideLoading;
-
-@end
-
-@interface HMSliderButton : UIButton
-
-- (void)showActivityAnim;
-- (void)hideActivityAnim;
-
-@end
-
-NS_ASSUME_NONNULL_END

BuguLive/Class/Sections/Home/View/HMVideoSliderView.m

@@ -1,360 +0,0 @@
-//
-//  HMVideoSliderView.m
-//  BuguLive
-//
-//  Created by 范东 on 2018/12/27.
-//  Copyright © 2018 xfg. All rights reserved.
-//
-
-#import "HMVideoSliderView.h"
-
-/** 滑块的大小 */
-#define kSliderBtnWH  19.0
-/** 间距 */
-#define kProgressMargin 2.0
-/** 进度的宽度 */
-#define kProgressW    self.frame.size.width - kProgressMargin * 2
-/** 进度的高度 */
-#define kProgressH    3.0
-
-@interface HMVideoSliderView()
-
-/** 进度背景 */
-@property (nonatomic, strong) UIImageView *bgProgressView;
-/** 缓存进度 */
-@property (nonatomic, strong) UIImageView *bufferProgressView;
-/** 滑动进度 */
-@property (nonatomic, strong) UIImageView *sliderProgressView;
-
-/** 滑块 */
-@property (nonatomic, strong) HMSliderButton *sliderBtn;
-
-@property (nonatomic, assign) CGPoint lastPoint;
-
-@property (nonatomic, strong) UITapGestureRecognizer *tapGesture;
-
-@end
-
-@implementation HMVideoSliderView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    if (self = [super initWithFrame:frame]) {
-        
-        self.allowTapped = YES;
-        
-        [self addSubViews];
-    }
-    return self;
-}
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    
-    self.allowTapped = YES;
-    
-    [self addSubViews];
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    
-    if (self.sliderBtn.hidden) {
-        self.bgProgressView.width   = self.width;
-    }else {
-        self.bgProgressView.width   = self.width - kProgressMargin * 2;
-    }
-    
-    self.bgProgressView.centerY     = self.height * 0.5;
-    self.bufferProgressView.centerY = self.height * 0.5;
-    self.sliderProgressView.centerY = self.height * 0.5;
-    self.sliderBtn.centerY          = self.height * 0.5;
-}
-
-/**
- 添加子视图
- */
-- (void)addSubViews {
-    self.backgroundColor = [UIColor clearColor];
-    
-    [self addSubview:self.bgProgressView];
-    [self addSubview:self.bufferProgressView];
-    [self addSubview:self.sliderProgressView];
-    [self addSubview:self.sliderBtn];
-    
-    // 初始化frame
-    self.bgProgressView.frame     = CGRectMake(kProgressMargin, 0, 0, kProgressH);
-    
-    self.bufferProgressView.frame = self.bgProgressView.frame;
-    
-    self.sliderProgressView.frame = self.bgProgressView.frame;
-    
-    self.sliderBtn.frame          = CGRectMake(0, 0, kSliderBtnWH, kSliderBtnWH);
-    
-    // 添加点击手势
-    self.tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapped:)];
-    [self addGestureRecognizer:self.tapGesture];
-}
-
-#pragma mark - Setter
-- (void)setMaximumTrackTintColor:(UIColor *)maximumTrackTintColor {
-    _maximumTrackTintColor = maximumTrackTintColor;
-    
-    self.bgProgressView.backgroundColor = maximumTrackTintColor;
-}
-
-- (void)setMinimumTrackTintColor:(UIColor *)minimumTrackTintColor {
-    _minimumTrackTintColor = minimumTrackTintColor;
-    
-    self.sliderProgressView.backgroundColor = minimumTrackTintColor;
-}
-
-- (void)setBufferTrackTintColor:(UIColor *)bufferTrackTintColor {
-    _bufferTrackTintColor = bufferTrackTintColor;
-    
-    self.bufferProgressView.backgroundColor = bufferTrackTintColor;
-}
-
-- (void)setMaximumTrackImage:(UIImage *)maximumTrackImage {
-    _maximumTrackImage = maximumTrackImage;
-    
-    self.bgProgressView.image = maximumTrackImage;
-    self.maximumTrackTintColor = [UIColor clearColor];
-}
-
-- (void)setMinimumTrackImage:(UIImage *)minimumTrackImage {
-    _minimumTrackImage = minimumTrackImage;
-    
-    self.sliderProgressView.image = minimumTrackImage;
-    
-    self.minimumTrackTintColor = [UIColor clearColor];
-}
-
-- (void)setBufferTrackImage:(UIImage *)bufferTrackImage {
-    _bufferTrackImage = bufferTrackImage;
-    
-    self.bufferProgressView.image = bufferTrackImage;
-    
-    self.bufferTrackTintColor = [UIColor clearColor];
-}
-
-- (void)setValue:(float)value {
-    _value = value;
-    
-    CGFloat finishValue  = self.bgProgressView.width * value;
-    self.sliderProgressView.width = finishValue;
-    
-    self.sliderBtn.left = (self.width - self.sliderBtn.width) * value;
-    
-    self.lastPoint = self.sliderBtn.center;
-}
-
-- (void)setBufferValue:(float)bufferValue {
-    _bufferValue = bufferValue;
-    
-    CGFloat finishValue = self.bgProgressView.width * bufferValue;
-    
-    self.bufferProgressView.width = finishValue;
-}
-
-- (void)setBackgroundImage:(UIImage *)image forState:(UIControlState)state {
-    [self.sliderBtn setBackgroundImage:image forState:state];
-    
-    [self.sliderBtn sizeToFit];
-}
-
-- (void)setThumbImage:(UIImage *)image forState:(UIControlState)state {
-    [self.sliderBtn setImage:image forState:state];
-    
-    [self.sliderBtn sizeToFit];
-}
-
-- (void)showLoading {
-    [self.sliderBtn showActivityAnim];
-}
-
-- (void)hideLoading {
-    [self.sliderBtn hideActivityAnim];
-}
-
-- (void)setAllowTapped:(BOOL)allowTapped {
-    _allowTapped = allowTapped;
-    
-    if (!allowTapped) {
-        [self removeGestureRecognizer:self.tapGesture];
-    }
-}
-
-- (void)setSliderHeight:(CGFloat)sliderHeight {
-    _sliderHeight = sliderHeight;
-    
-    self.bgProgressView.height     = sliderHeight;
-    self.bufferProgressView.height = sliderHeight;
-    self.sliderProgressView.height = sliderHeight;
-}
-
-- (void)setIsHideSliderBlock:(BOOL)isHideSliderBlock {
-    _isHideSliderBlock = isHideSliderBlock;
-    
-    // 隐藏滑块，滑杆不可点击
-    if (isHideSliderBlock) {
-        self.sliderBtn.hidden = YES;
-        
-        self.bgProgressView.left     = 0;
-        self.bufferProgressView.left = 0;
-        self.sliderProgressView.left = 0;
-        
-        self.allowTapped = NO;
-    }
-}
-
-#pragma mark - User Action
-- (void)sliderBtnTouchBegin:(UIButton *)btn {
-    
-    if ([self.delegate respondsToSelector:@selector(sliderTouchBegan:)]) {
-        [self.delegate sliderTouchBegan:self.value];
-    }
-}
-
-- (void)sliderBtnTouchEnded:(UIButton *)btn {
-    
-    if ([self.delegate respondsToSelector:@selector(sliderTouchEnded:)]) {
-        [self.delegate sliderTouchEnded:self.value];
-    }
-}
-
-- (void)sliderBtnDragMoving:(UIButton *)btn event:(UIEvent *)event {
-    
-    // 点击的位置
-    CGPoint point = [event.allTouches.anyObject locationInView:self];
-    
-    // 获取进度值 由于btn是从 0-(self.width - btn.width)
-    float value = (point.x - btn.width * 0.5) / (self.width - btn.width);
-    
-    // value的值需在0-1之间
-    value = value >= 1.0 ? 1.0 : value <= 0.0 ? 0.0 : value;
-    
-    [self setValue:value];
-    
-    if ([self.delegate respondsToSelector:@selector(sliderValueChanged:)]) {
-        [self.delegate sliderValueChanged:value];
-    }
-}
-
-- (void)tapped:(UITapGestureRecognizer *)tap {
-    CGPoint point = [tap locationInView:self];
-    
-    // 获取进度
-    float value = (point.x - self.bgProgressView.left) * 1.0 / self.bgProgressView.width;
-    value = value >= 1.0 ? 1.0 : value <= 0 ? 0 : value;
-    
-    [self setValue:value];
-    
-    if ([self.delegate respondsToSelector:@selector(sliderTapped:)]) {
-        [self.delegate sliderTapped:value];
-    }
-}
-
-#pragma mark - 懒加载
-- (UIView *)bgProgressView {
-    if (!_bgProgressView) {
-        _bgProgressView = [UIImageView new];
-        _bgProgressView.backgroundColor = [UIColor grayColor];
-        _bgProgressView.contentMode = UIViewContentModeScaleAspectFill;
-        _bgProgressView.clipsToBounds = YES;
-    }
-    return _bgProgressView;
-}
-
-- (UIView *)bufferProgressView {
-    if (!_bufferProgressView) {
-        _bufferProgressView = [UIImageView new];
-        _bufferProgressView.backgroundColor = [UIColor whiteColor];
-        _bufferProgressView.contentMode = UIViewContentModeScaleAspectFill;
-        _bufferProgressView.clipsToBounds = YES;
-    }
-    return _bufferProgressView;
-}
-
-- (UIView *)sliderProgressView {
-    if (!_sliderProgressView) {
-        _sliderProgressView = [UIImageView new];
-        _sliderProgressView.backgroundColor = [UIColor redColor];
-        _sliderProgressView.contentMode = UIViewContentModeScaleAspectFill;
-        _sliderProgressView.clipsToBounds = YES;
-    }
-    return _sliderProgressView;
-}
-
-- (HMSliderButton *)sliderBtn {
-    if (!_sliderBtn) {
-        _sliderBtn = [HMSliderButton new];
-        //        _sliderBtn.backgroundColor = [UIColor whiteColor];
-        [_sliderBtn addTarget:self action:@selector(sliderBtnTouchBegin:) forControlEvents:UIControlEventTouchDown];
-        [_sliderBtn addTarget:self action:@selector(sliderBtnTouchEnded:) forControlEvents:UIControlEventTouchCancel];
-        [_sliderBtn addTarget:self action:@selector(sliderBtnTouchEnded:) forControlEvents:UIControlEventTouchUpInside];
-        [_sliderBtn addTarget:self action:@selector(sliderBtnTouchEnded:) forControlEvents:UIControlEventTouchUpOutside];
-        [_sliderBtn addTarget:self action:@selector(sliderBtnDragMoving:event:) forControlEvents:UIControlEventTouchDragInside];
-    }
-    return _sliderBtn;
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end
-
-@interface HMSliderButton()
-
-@property (nonatomic, strong) UIActivityIndicatorView *indicatorView;
-
-@end
-
-@implementation HMSliderButton
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    if (self = [super initWithFrame:frame]) {
-        self.indicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
-        self.indicatorView.hidesWhenStopped       = NO;
-        self.indicatorView.userInteractionEnabled = NO;
-        self.indicatorView.frame     = CGRectMake(0, 0, 20, 20);
-        self.indicatorView.transform = CGAffineTransformMakeScale(0.6, 0.6);
-        
-        [self addSubview:self.indicatorView];
-    }
-    return self;
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    
-    self.indicatorView.center = CGPointMake(self.width / 2, self.height/ 2);
-    self.indicatorView.transform = CGAffineTransformMakeScale(0.6, 0.6);
-}
-
-- (void)showActivityAnim {
-    self.indicatorView.hidden = NO;
-    [self.indicatorView startAnimating];
-}
-
-- (void)hideActivityAnim {
-    self.indicatorView.hidden = YES;
-    [self.indicatorView stopAnimating];
-}
-
-// 重写此方法将按钮的点击范围扩大
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
-    CGRect bounds = self.bounds;
-    
-    // 扩大点击区域
-    bounds = CGRectInset(bounds, -20, -20);
-    
-    // 若点击的点在新的bounds里面。就返回yes
-    return CGRectContainsPoint(bounds, point);
-}
-
-@end