Explorar o código

直播增加VIP定制课

Steven hai 6 meses
pai
achega
7ad534fe12

+ 1 - 0
KulexiuForStudent/KulexiuForStudent/Module/Live/View/KSShopCardView.h

@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 typedef NS_ENUM(NSInteger, CART_TYPE) {
     CART_TYPE_NONE,
+    CART_TYPE_VIP,
     CART_TYPE_ACCOMPANY = 2,
     CART_TYPE_LIVE,
     CART_TYPE_VIDEO,

+ 28 - 11
KulexiuForStudent/KulexiuForStudent/Module/Live/View/KSShopCardView.xib

@@ -14,18 +14,33 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ufy-tg-Q9c">
-                    <rect key="frame" x="297" y="615" width="86" height="181"/>
+                    <rect key="frame" x="297" y="576" width="86" height="220"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="liveCart_AlertBg" translatesAutoresizingMaskIntoConstraints="NO" id="3lN-YD-l1m">
-                            <rect key="frame" x="0.0" y="0.0" width="86" height="181"/>
+                            <rect key="frame" x="0.0" y="0.0" width="86" height="220"/>
                         </imageView>
-                        <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LzX-ss-QR3">
+                        <button opaque="NO" tag="1001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IDz-ck-3kV">
                             <rect key="frame" x="13" y="12" width="60" height="32"/>
                             <constraints>
+                                <constraint firstAttribute="height" constant="32" id="WPx-b2-8Gr"/>
+                                <constraint firstAttribute="width" constant="60" id="dvN-Gh-lMk"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" title="VIP定制课" backgroundImage="course_bg">
+                                <color key="titleColor" red="0.25490196079999999" green="0.43529411759999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            </state>
+                            <connections>
+                                <action selector="chooseAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="cHe-4A-q5d"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LzX-ss-QR3">
+                            <rect key="frame" x="13" y="51" width="60" height="32"/>
+                            <constraints>
                                 <constraint firstAttribute="width" constant="60" id="SkV-ZH-Lz9"/>
                                 <constraint firstAttribute="height" constant="32" id="pLd-3Z-mFf"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="趣纠课" backgroundImage="course_bg">
                                 <color key="titleColor" red="0.25490196078431371" green="0.43529411764705883" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -35,12 +50,12 @@
                             </connections>
                         </button>
                         <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D77-vR-GET">
-                            <rect key="frame" x="13" y="51" width="60" height="32"/>
+                            <rect key="frame" x="13" y="90" width="60" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="32" id="loQ-2S-47S"/>
                                 <constraint firstAttribute="width" constant="60" id="xPF-Dw-XZR"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="直播课" backgroundImage="course_bg">
                                 <color key="titleColor" red="0.25490196079999999" green="0.43529411759999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -50,12 +65,12 @@
                             </connections>
                         </button>
                         <button opaque="NO" tag="1004" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZZq-UP-OkF">
-                            <rect key="frame" x="13" y="90" width="60" height="32"/>
+                            <rect key="frame" x="13" y="129" width="60" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="60" id="cDj-Sn-wdz"/>
                                 <constraint firstAttribute="height" constant="32" id="iIY-lM-qo1"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="视频课" backgroundImage="course_bg">
                                 <color key="titleColor" red="0.25490196079999999" green="0.43529411759999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -65,12 +80,12 @@
                             </connections>
                         </button>
                         <button opaque="NO" tag="1005" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AYN-JT-FVH">
-                            <rect key="frame" x="13" y="129" width="60" height="32"/>
+                            <rect key="frame" x="13" y="168" width="60" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="32" id="YE6-Od-QrD"/>
                                 <constraint firstAttribute="width" constant="60" id="hsb-cq-EZj"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="乐谱" backgroundImage="course_bg">
                                 <color key="titleColor" red="0.25490196079999999" green="0.43529411759999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -84,7 +99,9 @@
                     <constraints>
                         <constraint firstItem="3lN-YD-l1m" firstAttribute="leading" secondItem="Ufy-tg-Q9c" secondAttribute="leading" id="5bp-tj-iSz"/>
                         <constraint firstItem="LzX-ss-QR3" firstAttribute="centerX" secondItem="Ufy-tg-Q9c" secondAttribute="centerX" id="6WR-FE-6Iu"/>
+                        <constraint firstItem="IDz-ck-3kV" firstAttribute="top" secondItem="Ufy-tg-Q9c" secondAttribute="top" constant="12" id="B46-gN-zf2"/>
                         <constraint firstItem="D77-vR-GET" firstAttribute="top" secondItem="LzX-ss-QR3" secondAttribute="bottom" constant="7" id="Dzn-fM-Xq0"/>
+                        <constraint firstItem="LzX-ss-QR3" firstAttribute="top" secondItem="IDz-ck-3kV" secondAttribute="bottom" constant="7" id="K2D-57-v4c"/>
                         <constraint firstItem="D77-vR-GET" firstAttribute="centerX" secondItem="LzX-ss-QR3" secondAttribute="centerX" id="LOO-ID-KTg"/>
                         <constraint firstItem="AYN-JT-FVH" firstAttribute="centerX" secondItem="LzX-ss-QR3" secondAttribute="centerX" id="PAg-Bm-atQ"/>
                         <constraint firstAttribute="bottom" secondItem="3lN-YD-l1m" secondAttribute="bottom" id="UA1-Zq-YfH"/>
@@ -92,10 +109,10 @@
                         <constraint firstAttribute="trailing" secondItem="3lN-YD-l1m" secondAttribute="trailing" id="WXy-DS-zbW"/>
                         <constraint firstItem="ZZq-UP-OkF" firstAttribute="centerX" secondItem="LzX-ss-QR3" secondAttribute="centerX" id="aPs-Rm-bqB"/>
                         <constraint firstItem="ZZq-UP-OkF" firstAttribute="top" secondItem="D77-vR-GET" secondAttribute="bottom" constant="7" id="cWz-am-9yD"/>
-                        <constraint firstItem="LzX-ss-QR3" firstAttribute="top" secondItem="Ufy-tg-Q9c" secondAttribute="top" constant="12" id="gZF-z8-kQh"/>
                         <constraint firstAttribute="bottom" secondItem="AYN-JT-FVH" secondAttribute="bottom" constant="20" id="h0f-gC-bhN"/>
                         <constraint firstItem="AYN-JT-FVH" firstAttribute="top" secondItem="ZZq-UP-OkF" secondAttribute="bottom" constant="7" id="nkr-sm-QVM"/>
                         <constraint firstAttribute="width" constant="86" id="rUV-0a-GzK"/>
+                        <constraint firstItem="LzX-ss-QR3" firstAttribute="centerX" secondItem="IDz-ck-3kV" secondAttribute="centerX" id="vM1-id-a5y"/>
                     </constraints>
                 </view>
             </subviews>

+ 6 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXLive/Controller/TXLiveRoomViewController.m

@@ -2078,7 +2078,7 @@ static int clickPraiseBtnTimes  = 0;
     }
     return _cardView;
 }
-// tabs=  practice | 趣纠课 live | 直播课 video | 视频课 music | 乐谱 跳转到对应tab页
+// tabs= vip | VIP定制课 practice | 趣纠课  live | 直播课 video | 视频课 music | 乐谱 跳转到对应tab页
 
 - (void)displayTeacherInfo:(CART_TYPE)type {
     [self sendRushMessage];
@@ -2104,6 +2104,11 @@ static int clickPraiseBtnTimes  = 0;
             tabs = @"";
         }
             break;
+        case CART_TYPE_VIP:
+        {
+            tabs = @"vip";
+        }
+            break;
         case CART_TYPE_ACCOMPANY:
         {
             tabs = @"practice";