SuperC 1 год назад
Родитель
Сommit
bf5994b79b

BIN
MiMoLive/MiMoLive.xcworkspace/xcuserdata/yanxuyao.xcuserdatad/UserInterfaceState.xcuserstate


+ 17 - 6
MiMoLive/MiMoLive/Classes/Live/View/UserInfoView/MOReportSomeOneView.m

@@ -10,6 +10,9 @@
 
 @interface MOReportSomeOneView ()<UITableViewDelegate,UITableViewDataSource>
 
+
+@property (weak, nonatomic) IBOutlet UIImageView *bgImgView;
+
 @property (weak, nonatomic) IBOutlet UILabel *titleLab;
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
 @property (weak, nonatomic) IBOutlet UITextView *textView;
@@ -32,6 +35,10 @@
 - (void)awakeFromNib{
     [super awakeFromNib];
     
+    self.titleLab.font = [MOTextTools getTheFontWithSize:16.0 AndFontName:@"Gilroy"];
+    self.cancelBtn.font = [MOTextTools getTheFontWithSize:20.0 AndFontName:@"Akrobat"];
+    self.submitBtn.font = [MOTextTools getTheFontWithSize:20.0 AndFontName:@"Akrobat"];
+    
     self.layer.cornerRadius = 16.0;
     self.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner;
     self.layer.masksToBounds = YES;
@@ -43,17 +50,21 @@
     
     [self.tableView registerNib:[UINib nibWithNibName:@"MOReportTableViewCell" bundle:nil] forCellReuseIdentifier:MOReportTableViewCell_ID];
     
-    NSArray *colorArr = @[[MOTools colorWithHexString:@"#FFDE99" alpha:1.0],[MOTools colorWithHexString:@"#FF8CFE" alpha:1.0]];
-    UIImage *image = [MOTools createGradientRectImageWithBounds:CGRectMake(0, 0, (SCREENWIDTH - 36.0 * 2), 50.0) Colors:colorArr GradientType:0];
+    NSArray *bgColorArr = @[[MOTools colorWithHexString:@"#EDF1FD" alpha:1.0],[MOTools colorWithHexString:@"#FAFAFC" alpha:1.0]];
+    UIImage *bgImage = [MOTools createGradientRectImageWithBounds:CGRectMake(0, 0, 120.0, 50.0) Colors:bgColorArr GradientType:0];
+    [self.bgImgView setImage:bgImage];
+    
+    NSArray *colorArr = @[[MOTools colorWithHexString:@"#B0B0B0" alpha:1.0],[MOTools colorWithHexString:@"#B0B0B0" alpha:1.0]];
+    UIImage *image = [MOTools createGradientRectImageWithBounds:CGRectMake(0, 0, 120.0, 50.0) Colors:colorArr GradientType:0];
     
-    self.cancelBtn.layer.cornerRadius = 50.0 / 2.0;
+    self.cancelBtn.layer.cornerRadius = 40.0 / 2.0;
     self.cancelBtn.layer.masksToBounds = YES;
     [self.cancelBtn setBackgroundImage:image forState:UIControlStateNormal];
     
-    NSArray *submitColorArr = @[[MOTools colorWithHexString:@"#FBE63D" alpha:1.0],[MOTools colorWithHexString:@"#FFC3B5" alpha:1.0]];
-    UIImage *submitImage = [MOTools createGradientRectImageWithBounds:CGRectMake(0, 0, (SCREENWIDTH - 36.0 * 2), 50.0) Colors:submitColorArr GradientType:0];
+    NSArray *submitColorArr = @[kBaseBtnBgColor,kBaseBtnBgColor];
+    UIImage *submitImage = [MOTools createGradientRectImageWithBounds:CGRectMake(0, 0, 120.0, 50.0) Colors:submitColorArr GradientType:0];
     
-    self.submitBtn.layer.cornerRadius = 50.0 / 2.0;
+    self.submitBtn.layer.cornerRadius = 40.0 / 2.0;
     self.submitBtn.layer.masksToBounds = YES;
     [self.submitBtn setBackgroundImage:submitImage forState:UIControlStateNormal];
     

+ 17 - 12
MiMoLive/MiMoLive/Classes/Live/View/UserInfoView/MOReportSomeOneView.xib

@@ -14,6 +14,9 @@
             <rect key="frame" x="0.0" y="0.0" width="393" height="445"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0e0-rd-xZn">
+                    <rect key="frame" x="0.0" y="0.0" width="393" height="445"/>
+                </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LWe-Kl-rTQ">
                     <rect key="frame" x="0.0" y="0.0" width="393" height="41"/>
                     <subviews>
@@ -31,11 +34,11 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reason for reporting" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pTV-zm-5Uq">
                             <rect key="frame" x="70" y="10.333333333333334" width="253" height="20.333333333333329"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                            <color key="textColor" red="0.20392156862745098" green="0.19607843137254902" blue="0.20784313725490194" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="textColor" red="0.15686274509803921" green="0.15686274509803921" blue="0.15686274509803921" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="pTV-zm-5Uq" secondAttribute="trailing" constant="70" id="gWS-HP-G6d"/>
                         <constraint firstItem="JHd-jL-5V6" firstAttribute="leading" secondItem="LWe-Kl-rTQ" secondAttribute="leading" constant="20" id="gix-E6-QEr"/>
@@ -47,7 +50,7 @@
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="pON-3C-xCx">
                     <rect key="frame" x="5" y="44" width="383" height="180"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="180" id="0Mr-uT-1FT"/>
                     </constraints>
@@ -63,25 +66,25 @@
                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                 </textView>
                 <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="X9V-br-eIa">
-                    <rect key="frame" x="10" y="365" width="373" height="50"/>
+                    <rect key="frame" x="10" y="375" width="373" height="40"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i8q-Og-qXn">
-                            <rect key="frame" x="0.0" y="0.0" width="180.66666666666666" height="50"/>
+                            <rect key="frame" x="0.0" y="0.0" width="180.66666666666666" height="40"/>
                             <fontDescription key="fontDescription" type="system" pointSize="20"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="Cancel">
-                                <color key="titleColor" red="0.23137254901960785" green="0.10196078431372549" blue="0.14509803921568626" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </state>
                             <connections>
                                 <action selector="cancelBtnClick:" destination="iN0-l3-epB" eventType="touchUpInside" id="tDo-EP-ipN"/>
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YUc-LS-ABM">
-                            <rect key="frame" x="192.66666666666663" y="0.0" width="180.33333333333337" height="50"/>
+                            <rect key="frame" x="192.66666666666663" y="0.0" width="180.33333333333337" height="40"/>
                             <fontDescription key="fontDescription" type="system" pointSize="20"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="Submit">
-                                <color key="titleColor" red="0.23137254901960785" green="0.10196078431372549" blue="0.14509803921568626" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </state>
                             <connections>
                                 <action selector="submitBtnClick:" destination="iN0-l3-epB" eventType="touchUpInside" id="KM7-ut-78v"/>
@@ -89,27 +92,32 @@
                         </button>
                     </subviews>
                     <constraints>
-                        <constraint firstAttribute="height" constant="50" id="ZdE-Yf-v5d"/>
+                        <constraint firstAttribute="height" constant="40" id="ZdE-Yf-v5d"/>
                     </constraints>
                 </stackView>
             </subviews>
             <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="LWe-Kl-rTQ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="D6W-na-KFD"/>
+                <constraint firstItem="0e0-rd-xZn" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="D76-hR-n2I"/>
                 <constraint firstAttribute="trailing" secondItem="pON-3C-xCx" secondAttribute="trailing" constant="5" id="DLE-fR-9WB"/>
                 <constraint firstItem="X9V-br-eIa" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="10" id="ET9-7a-QEQ"/>
                 <constraint firstAttribute="bottom" secondItem="X9V-br-eIa" secondAttribute="bottom" constant="30" id="FHK-g4-N3j"/>
                 <constraint firstAttribute="trailing" secondItem="LWe-Kl-rTQ" secondAttribute="trailing" id="JAB-9q-Pkp"/>
+                <constraint firstItem="0e0-rd-xZn" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Ly8-5S-XMc"/>
                 <constraint firstItem="pON-3C-xCx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="5" id="P2N-9d-ybt"/>
                 <constraint firstItem="hqV-un-Q8p" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="5" id="Q1y-Y5-BWC"/>
                 <constraint firstItem="hqV-un-Q8p" firstAttribute="top" secondItem="pON-3C-xCx" secondAttribute="bottom" constant="3" id="VVf-TM-Oid"/>
                 <constraint firstItem="LWe-Kl-rTQ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Vd2-WR-ZFK"/>
                 <constraint firstItem="pON-3C-xCx" firstAttribute="top" secondItem="LWe-Kl-rTQ" secondAttribute="bottom" constant="3" id="XoT-Hx-2U2"/>
+                <constraint firstAttribute="trailing" secondItem="0e0-rd-xZn" secondAttribute="trailing" id="eRr-sw-bAx"/>
                 <constraint firstAttribute="trailing" secondItem="X9V-br-eIa" secondAttribute="trailing" constant="10" id="fcf-JV-42a"/>
+                <constraint firstAttribute="bottom" secondItem="0e0-rd-xZn" secondAttribute="bottom" id="km9-jt-ltW"/>
                 <constraint firstAttribute="trailing" secondItem="hqV-un-Q8p" secondAttribute="trailing" constant="5" id="xEU-CB-d5f"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="bgImgView" destination="0e0-rd-xZn" id="5W8-8i-Vcu"/>
                 <outlet property="cancelBtn" destination="i8q-Og-qXn" id="ghv-5h-wz1"/>
                 <outlet property="submitBtn" destination="YUc-LS-ABM" id="G5o-OM-yjC"/>
                 <outlet property="tableView" destination="pON-3C-xCx" id="aDV-Of-PJ8"/>
@@ -124,8 +132,5 @@
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
     </resources>
 </document>

+ 3 - 0
MiMoLive/MiMoLive/Classes/Live/View/UserInfoView/MOReportTableViewCell.m

@@ -14,6 +14,9 @@
     // Initialization code
     
     self.selectionStyle = UITableViewCellSelectionStyleNone;
+    
+    self.titleLab.font = [MOTextTools getTheFontWithSize:13.0 AndFontName:@"Akrobat"];
+    
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

+ 2 - 2
MiMoLive/MiMoLive/Classes/Live/View/UserInfoView/MOReportTableViewCell.xib

@@ -23,7 +23,7 @@
                             <constraint firstAttribute="height" constant="17" id="OqN-lT-Qxk"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                        <color key="textColor" red="0.18823529411764706" green="0.1803921568627451" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="textColor" red="0.45098039215686275" green="0.45098039215686275" blue="0.45098039215686275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_language_no_choose" translatesAutoresizingMaskIntoConstraints="NO" id="DUz-uA-Ilx">
@@ -51,6 +51,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="icon_language_no_choose" width="17" height="17"/>
+        <image name="icon_language_no_choose" width="24" height="24"/>
     </resources>
 </document>