zwp 6 months ago
parent
commit
53f988e3fa

+ 2 - 2
BuguLive.xcodeproj/project.pbxproj

@@ -18010,7 +18010,7 @@
 					"\"$(SRCROOT)/BuguLive/Others/Vendors/JuBaoPay/Alipay\"",
 				);
 				INFOPLIST_FILE = BuguLive/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = 711live;
+				INFOPLIST_KEY_CFBundleDisplayName = oneRizeLive;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -18197,7 +18197,7 @@
 					"\"$(SRCROOT)/BuguLive/Others/Vendors/JuBaoPay/Alipay\"",
 				);
 				INFOPLIST_FILE = BuguLive/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = 711live;
+				INFOPLIST_KEY_CFBundleDisplayName = oneRizeLive;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

+ 2 - 2
BuguLive/Assets.xcassets/login(登录 前缀:lg)/com_preload_head_img.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_logo@2x.png",
+      "filename" : "com_preload_head_img@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "login_logo@3x.png",
+      "filename" : "com_preload_head_img@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/com_preload_head_img.imageset/com_preload_head_img@2x.png


BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/com_preload_head_img.imageset/com_preload_head_img@3x.png


BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/com_preload_head_img.imageset/login_logo@2x.png


BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/com_preload_head_img.imageset/login_logo@3x.png


BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/lg_bg.imageset/lg_bg.png


+ 2 - 1
BuguLive/Assets.xcassets/login(登录 前缀:lg)/wel.imageset/Contents.json → BuguLive/Assets.xcassets/login(登录 前缀:lg)/oneRizeLive.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "wel.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "oneRizeLive@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "oneRizeLive@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/oneRizeLive.imageset/oneRizeLive@2x.png


BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/oneRizeLive.imageset/oneRizeLive@3x.png


BIN
BuguLive/Assets.xcassets/login(登录 前缀:lg)/wel.imageset/wel.png


+ 2 - 2
BuguLive/Class/AppOhters/AppDelegate.m

@@ -218,7 +218,7 @@ static SystemSoundID shake_sound_male_id = 0;
     UIImageView *tmpImgView = [[UIImageView alloc]initWithFrame:[[UIScreen mainScreen] bounds]];
     tmpImgView.contentMode = UIViewContentModeScaleAspectFill;
     tmpImgView.clipsToBounds = YES;
-    [tmpImgView setImage:[UIImage imageNamed:@"wel"]];
+    [tmpImgView setImage:[UIImage imageNamed:@"lg_bg"]];
     [tmpController.view addSubview:tmpImgView];
 
     self.window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
@@ -1008,7 +1008,7 @@ static SystemSoundID shake_sound_male_id = 0;
     if(diagramArr.count == 0)
     {
         //广告图片URLString/或本地图片名(.jpg/.gif请带上后缀)
-        imageAdconfiguration.imageNameOrURLString = @"wel";
+        imageAdconfiguration.imageNameOrURLString = @"lg_bg";
     }
     else
     {

+ 1 - 1
BuguLive/Class/General/Base/BaseWebViewController/BGBaseWebViewController.m

@@ -283,7 +283,7 @@
     if (_isShowLaunchImgView)
     {
         _launchImgView = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
-        [_launchImgView setImage:[UIImage imageNamed:@"wel"]];
+        [_launchImgView setImage:[UIImage imageNamed:@"lg_bg"]];
         [self.view addSubview:_launchImgView];
     }
 }

+ 1 - 1
BuguLive/Class/Live/LiveUI/Controller/LiveBase/BGLiveBaseController.m

@@ -318,7 +318,7 @@
     }
     else
     {
-        [_vagueImgView setImage:[UIImage imageNamed:@"wel"]];
+        [_vagueImgView setImage:[UIImage imageNamed:@"lg_bg"]];
     }
     [self.view addSubview:_vagueImgView];
     [self.view bringSubviewToFront:_vagueImgView];

+ 19 - 17
BuguLive/Class/Sections/Login/BogoLogin/BogoJHLogin.xib

@@ -30,7 +30,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bgW-hc-8Xe" userLabel="[layout]login_button">
-                    <rect key="frame" x="55" y="248" width="265" height="329"/>
+                    <rect key="frame" x="55" y="342.5" width="265" height="192"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aan-Sr-KAH" customClass="QMUIFillButton">
                             <rect key="frame" x="0.0" y="148" width="265" height="44"/>
@@ -108,7 +108,7 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xf3-FS-u95">
-                            <rect key="frame" x="0.0" y="3" width="265" height="45"/>
+                            <rect key="frame" x="0.0" y="0.0" width="265" height="45"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="45" id="GZL-wa-Dtk"/>
@@ -120,13 +120,13 @@
                         <constraint firstItem="r0e-UB-jmi" firstAttribute="top" secondItem="kEQ-h2-S0P" secondAttribute="bottom" constant="30" id="564-1C-Ydd"/>
                         <constraint firstItem="aan-Sr-KAH" firstAttribute="leading" secondItem="bgW-hc-8Xe" secondAttribute="leading" id="5Bb-T2-aHf"/>
                         <constraint firstAttribute="trailing" secondItem="kEQ-h2-S0P" secondAttribute="trailing" id="Ehk-VU-Nxz"/>
+                        <constraint firstItem="Xf3-FS-u95" firstAttribute="top" secondItem="bgW-hc-8Xe" secondAttribute="top" id="NoF-ES-VF7"/>
                         <constraint firstItem="r0e-UB-jmi" firstAttribute="leading" secondItem="bgW-hc-8Xe" secondAttribute="leading" id="Ow6-5O-FSa"/>
                         <constraint firstItem="Xf3-FS-u95" firstAttribute="leading" secondItem="bgW-hc-8Xe" secondAttribute="leading" id="UmK-Td-mKy"/>
                         <constraint firstItem="kEQ-h2-S0P" firstAttribute="top" secondItem="bgW-hc-8Xe" secondAttribute="top" id="X9s-G2-JFa"/>
+                        <constraint firstAttribute="bottom" secondItem="aan-Sr-KAH" secondAttribute="bottom" id="awN-zm-ct9"/>
                         <constraint firstItem="aan-Sr-KAH" firstAttribute="top" secondItem="r0e-UB-jmi" secondAttribute="bottom" constant="30" id="bdc-gr-D95"/>
                         <constraint firstAttribute="trailing" secondItem="r0e-UB-jmi" secondAttribute="trailing" id="dSt-k5-bec"/>
-                        <constraint firstAttribute="height" constant="329" id="fPu-EZ-ydv"/>
-                        <constraint firstAttribute="bottom" secondItem="Xf3-FS-u95" secondAttribute="bottom" constant="281" id="qvR-Eh-evV"/>
                         <constraint firstItem="kEQ-h2-S0P" firstAttribute="leading" secondItem="bgW-hc-8Xe" secondAttribute="leading" id="zaq-kW-DdI"/>
                         <constraint firstAttribute="trailing" secondItem="Xf3-FS-u95" secondAttribute="trailing" id="zy3-Ev-x9C"/>
                     </constraints>
@@ -150,47 +150,49 @@
                     </connections>
                 </button>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="com_preload_head_img" translatesAutoresizingMaskIntoConstraints="NO" id="Eku-Mu-RZL">
-                    <rect key="frame" x="137.5" y="100" width="100" height="100"/>
+                    <rect key="frame" x="137.5" y="88" width="100" height="100"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="100" id="S3P-os-eOu"/>
                         <constraint firstAttribute="height" constant="100" id="ZiW-uy-UTu"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QVt-1N-C9l">
-                    <rect key="frame" x="187.5" y="218" width="0.0" height="0.0"/>
-                    <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="20"/>
-                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="oneRizeLive" translatesAutoresizingMaskIntoConstraints="NO" id="90p-Lk-YKb">
+                    <rect key="frame" x="51" y="208" width="273" height="40"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="40" id="Hc0-qz-17t"/>
+                        <constraint firstAttribute="width" constant="273" id="cjr-DS-R3O"/>
+                    </constraints>
+                </imageView>
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="bgW-hc-8Xe" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="55" id="4TE-BP-eNB"/>
                 <constraint firstAttribute="trailing" secondItem="bgW-hc-8Xe" secondAttribute="trailing" constant="55" id="9E1-CE-rDo"/>
-                <constraint firstItem="QVt-1N-C9l" firstAttribute="top" secondItem="Eku-Mu-RZL" secondAttribute="bottom" constant="18" id="C4y-lw-ECx"/>
                 <constraint firstItem="DVl-t1-YcX" firstAttribute="leading" secondItem="AmA-tY-ukJ" secondAttribute="trailing" constant="-10" id="Ede-U6-Xtc"/>
-                <constraint firstItem="QVt-1N-C9l" firstAttribute="centerX" secondItem="Eku-Mu-RZL" secondAttribute="centerX" id="KKO-im-m6T"/>
                 <constraint firstItem="DVl-t1-YcX" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Nj5-JH-i0l"/>
-                <constraint firstItem="Eku-Mu-RZL" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="100" id="Sgu-g3-kx2"/>
-                <constraint firstItem="DVl-t1-YcX" firstAttribute="top" secondItem="bgW-hc-8Xe" secondAttribute="bottom" constant="7.5" id="UOJ-pb-ibm"/>
+                <constraint firstItem="Eku-Mu-RZL" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="88" id="Sgu-g3-kx2"/>
+                <constraint firstItem="DVl-t1-YcX" firstAttribute="top" secondItem="bgW-hc-8Xe" secondAttribute="bottom" constant="50" id="UOJ-pb-ibm"/>
+                <constraint firstItem="90p-Lk-YKb" firstAttribute="top" secondItem="Eku-Mu-RZL" secondAttribute="bottom" constant="20" id="WWv-F1-Rei"/>
                 <constraint firstItem="g9K-dj-bil" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="aWj-jZ-NhK"/>
                 <constraint firstAttribute="trailing" secondItem="g9K-dj-bil" secondAttribute="trailing" id="hzQ-BJ-Cl2"/>
                 <constraint firstItem="Eku-Mu-RZL" firstAttribute="centerX" secondItem="g9K-dj-bil" secondAttribute="centerX" id="qLh-2k-x7t"/>
                 <constraint firstAttribute="bottom" secondItem="DVl-t1-YcX" secondAttribute="bottom" constant="52.5" id="rPa-8m-uXI"/>
                 <constraint firstItem="AmA-tY-ukJ" firstAttribute="centerY" secondItem="DVl-t1-YcX" secondAttribute="centerY" id="v9W-GE-N2w"/>
+                <constraint firstItem="90p-Lk-YKb" firstAttribute="centerX" secondItem="Eku-Mu-RZL" secondAttribute="centerX" id="xXv-nb-SwQ"/>
                 <constraint firstItem="g9K-dj-bil" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="yC8-Nw-5Ip"/>
                 <constraint firstAttribute="bottom" secondItem="g9K-dj-bil" secondAttribute="bottom" id="yzt-N7-aR7"/>
             </constraints>
-            <point key="canvasLocation" x="-66.400000000000006" y="39.90147783251232"/>
+            <point key="canvasLocation" x="-66.400000000000006" y="39.130434782608695"/>
         </view>
     </objects>
     <resources>
         <image name="bogo_regiset_normal" width="16" height="16"/>
-        <image name="com_preload_head_img" width="112" height="112"/>
+        <image name="com_preload_head_img" width="128" height="128"/>
         <image name="facebook" width="20" height="20"/>
         <image name="google" width="30" height="30"/>
         <image name="lg_bg" width="375" height="812"/>
         <image name="mobile" width="30" height="30"/>
+        <image name="oneRizeLive" width="273" height="40"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 2 - 3
BuguLive/Launch Screen.storyboard

@@ -2,7 +2,6 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -16,7 +15,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wel" translatesAutoresizingMaskIntoConstraints="NO" id="G0v-By-0kA">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lg_bg" translatesAutoresizingMaskIntoConstraints="NO" id="G0v-By-0kA">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_logo" translatesAutoresizingMaskIntoConstraints="NO" id="IEE-Nj-nbi">
@@ -45,7 +44,7 @@
         </scene>
     </scenes>
     <resources>
+        <image name="lg_bg" width="128" height="128"/>
         <image name="login_logo" width="112" height="112"/>
-        <image name="wel" width="375" height="812"/>
     </resources>
 </document>