红包大奖 功能逻辑 暂时提交

MiMoLive/MiMoLive.xcodeproj/project.pbxproj

@@ -971,7 +971,7 @@
 		A6F3FBF12C33DE6B00602D14 /* MOStrokeLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = A6F3FBF02C33DE6B00602D14 /* MOStrokeLabel.m */; };
 		A6F3FBF52C33F74C00602D14 /* MODiamondWinAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = A6F3FBF42C33F74C00602D14 /* MODiamondWinAlertView.m */; };
 		A6F3FBF72C33F7A300602D14 /* MODiamondWinAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6F3FBF62C33F7A300602D14 /* MODiamondWinAlertView.xib */; };
-		A6F3FBFB2C3400F300602D14 /* ProximaSansBlackOblique.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A6F3FBFA2C3400F300602D14 /* ProximaSansBlackOblique.ttf */; };
+		A6F3FBFD2C34094200602D14 /* Gilroy-HeavyItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A6F3FBFC2C34094200602D14 /* Gilroy-HeavyItalic.otf */; };
 		A6F4DE862C1AC73500C3EA7F /* MORedPacketRuleView.m in Sources */ = {isa = PBXBuildFile; fileRef = A6F4DE852C1AC73500C3EA7F /* MORedPacketRuleView.m */; };
 		A6F4DE882C1AC74000C3EA7F /* MORedPacketRuleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6F4DE872C1AC74000C3EA7F /* MORedPacketRuleView.xib */; };
 		A6F4DE8B2C1ACD2200C3EA7F /* MORedPacketHistoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = A6F4DE8A2C1ACD2200C3EA7F /* MORedPacketHistoryView.m */; };
@@ -2731,7 +2731,7 @@
 		A6F3FBF32C33F74C00602D14 /* MODiamondWinAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MODiamondWinAlertView.h; sourceTree = "<group>"; };
 		A6F3FBF42C33F74C00602D14 /* MODiamondWinAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MODiamondWinAlertView.m; sourceTree = "<group>"; };
 		A6F3FBF62C33F7A300602D14 /* MODiamondWinAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MODiamondWinAlertView.xib; sourceTree = "<group>"; };
-		A6F3FBFA2C3400F300602D14 /* ProximaSansBlackOblique.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = ProximaSansBlackOblique.ttf; sourceTree = "<group>"; };
+		A6F3FBFC2C34094200602D14 /* Gilroy-HeavyItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Gilroy-HeavyItalic.otf"; sourceTree = "<group>"; };
 		A6F4BB9E2B849A0500FE4FC7 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		A6F4BB9F2B849A0500FE4FC7 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
 		A6F4DE842C1AC73500C3EA7F /* MORedPacketRuleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MORedPacketRuleView.h; sourceTree = "<group>"; };
@@ -5976,11 +5976,11 @@
 			isa = PBXGroup;
 			children = (
 				A6000A942C2AE46F00C93C76 /* akrobat-black.ttf */,
-				A609ED3F2BFCA30D00368C86 /* icon_main_game_new.svga */,
-				A6F3FBFA2C3400F300602D14 /* ProximaSansBlackOblique.ttf */,
+				A6F3FBFC2C34094200602D14 /* Gilroy-HeavyItalic.otf */,
 				A609ED3E2BFCA30D00368C86 /* Source Sans Pro BlackIt.otf */,
-				A6723BF22BD7F81F00665479 /* icon_guide_click_active.svga */,
 				A67C69ED2BD12C6500F213D9 /* ExtensionBoldItalic.otf */,
+				A609ED3F2BFCA30D00368C86 /* icon_main_game_new.svga */,
+				A6723BF22BD7F81F00665479 /* icon_guide_click_active.svga */,
 				A6BFFC2B2BCD53AF00AE8612 /* icon_live_super_lucky.svga */,
 				A6EFF5F02BBAA9B50002D141 /* icon_live_living.svga */,
 				A6A2FB502BAAC4FC004A88C1 /* icon_live_sign_in.svga */,
@@ -7042,7 +7042,6 @@
 				A68C05472AE9436C0080F6EC /* MOGuildStartCell.xib in Resources */,
 				A6AB6C1D2AFBCF6700422B99 /* M_SenseME_DogFace_p_2.0.0.1.model in Resources */,
 				A608EBE72AE6ABAE0092317D /* MOContactPersonListVC.xib in Resources */,
-				A6F3FBFB2C3400F300602D14 /* ProximaSansBlackOblique.ttf in Resources */,
 				A6733DA12AF2733700F57852 /* MOFamilyNameplateCell.xib in Resources */,
 				A61E9BAF2B060131008C9313 /* MOLiveHeadView.xib in Resources */,
 				A6BFFC2C2BCD53AF00AE8612 /* icon_live_super_lucky.svga in Resources */,
@@ -7093,6 +7092,7 @@
 				A6A2FB512BAAC4FC004A88C1 /* icon_live_sign_in.svga in Resources */,
 				A67908D92C0C507E001B73AE /* MOAchorTaskShowView.xib in Resources */,
 				A6C5630A2B6A34CB0068F266 /* MOWishRuleView.xib in Resources */,
+				A6F3FBFD2C34094200602D14 /* Gilroy-HeavyItalic.otf in Resources */,
 				A6CBECAD2B22FCA500B949CC /* MOLianMaiListView.xib in Resources */,
 				A64F99DD2B284776007E3CA5 /* MOVerificationView.xib in Resources */,
 				A68E81D62B173BD7001A6E79 /* MOMyEarningsTopView.xib in Resources */,

MiMoLive/MiMoLive.xcworkspace/xcuserdata/yanxuyao.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -64,5 +64,21 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E49422C8-EFA6-44B2-9762-6BC680C76D7D"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "MiMoLive/Classes/Mine/View/MOMine/MOMianTopCell.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "223"
+            endingLineNumber = "223"
+            landmarkName = "-setMeDataInfo:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

MiMoLive/MiMoLive/Classes/Base/AlertView/MODiamondWinAlertView/MODiamondWinAlertView.h

@@ -11,6 +11,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MODiamondWinAlertView : UIView
 
++ (instancetype)moDiamondWinAlertView;
+
+- (void)showDiamondWinAlertView;
+- (void)dismissDiamondWinAlertView;
+
 @end
 
 NS_ASSUME_NONNULL_END

MiMoLive/MiMoLive/Classes/Base/AlertView/MODiamondWinAlertView/MODiamondWinAlertView.m

@@ -6,6 +6,20 @@
 //
 
 #import "MODiamondWinAlertView.h"
+#import "MOStrokeLabel.h"
+#import "MOBezierAnimationLab.h"
+
+@interface MODiamondWinAlertView ()
+
+@property (weak, nonatomic) IBOutlet UIView *bgView;
+@property (weak, nonatomic) IBOutlet MOBezierAnimationLab *titleLab;
+
+@property (weak, nonatomic) IBOutlet MOStrokeLabel *contentLab;
+
+@property (weak, nonatomic) IBOutlet UIButton *goPlayBtn;
+
+
+@end
 
 @implementation MODiamondWinAlertView
 
@@ -15,6 +29,56 @@
 
 - (void)awakeFromNib{
     [super awakeFromNib];
+    
+    self.titleLab.text = NSLocalString(@"mimo_diamonds_win_title");
+    [self.titleLab mo_setGradientWithColors: @[(id)[MOTools colorWithHexString:@"#0EFFFC" alpha:1.0].CGColor,(id)[MOTools colorWithHexString:@"#6D9AFF" alpha:1.0].CGColor] startPoint:CGPointMake(0.0, 0.3) endPoint:CGPointMake(0.0, 1.0)];
+    
+    NSArray *colorArr = @[[MOTools colorWithHexString:@"#FFE04F" alpha:1.0],[MOTools colorWithHexString:@"#D77E00" alpha:1.0],[MOTools colorWithHexString:@"#FFE640" alpha:1.0]];
+    UIImage *image = [MOTools createGradientRectImageWithBounds:CGRectMake(0, 0, 153.0, 46.0) Colors:colorArr GradientType:1];
+    [self.goPlayBtn setBackgroundImage:image forState:UIControlStateNormal];
+    [self.goPlayBtn setTitle:NSLocalString(@"mimo_diamonds_win_go_play_btn") forState:UIControlStateNormal];
+    self.goPlayBtn.layer.cornerRadius = 46.0 / 2.0;
+    self.goPlayBtn.layer.masksToBounds = YES;
+    
+    self.contentLab.attributedText = [MOTextTools base_colorfulStringWith:NSLocalString(@"mimo_diamonds_win_content") AndNameStr:NSLocalString(@"mimo_diamonds_win_content_g") AndBaseColor:@"#FFFFFF" AndNameColor:@"#8AFF73"];
+}
+
+- (IBAction)closeBtnClick:(id)sender {
+    [self dismissDiamondWinAlertView];
+}
+
+- (void)showDiamondWinAlertView//界面显示动画
+{
+    
+    UIWindow *keyWindow = [[UIApplication sharedApplication] delegate].window;
+    [keyWindow addSubview:self];
+    self.frame = CGRectMake(0.0, 0.0, SCREENWIDTH, SCREENHEIGHT);
+    
+    //动画效果
+    self.bgView.transform = CGAffineTransformMakeScale(1.3, 1.3);
+    self.bgView.alpha = 0;
+    [UIView animateWithDuration:0.2 animations:^
+    {
+        self.bgView.transform = CGAffineTransformMakeScale(1.0, 1.0);
+        self.bgView.alpha = 1;
+    } completion:^(BOOL finished)
+    {
+    }];
+}
+
+- (void)dismissDiamondWinAlertView
+{
+    [UIView animateWithDuration:0.2 animations:^
+    {
+        self.bgView.transform = CGAffineTransformMakeScale(1.3, 1.3);
+        self.bgView.alpha = 0;
+    } completion:^(BOOL finished)
+    {
+        if (finished)
+        {
+            [self removeFromSuperview];
+        }
+    }];
 }
 
 @end

MiMoLive/MiMoLive/Classes/Base/AlertView/MODiamondWinAlertView/MODiamondWinAlertView.xib

@@ -8,8 +8,8 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
-        <array key="ExtensionBoldItalic.otf">
-            <string>ExtensionBoldItalic</string>
+        <array key="Gilroy-HeavyItalic.otf">
+            <string>Gilroy-HeavyItalic</string>
         </array>
     </customFonts>
     <objects>
@@ -32,9 +32,9 @@
                                 <constraint firstAttribute="height" constant="148" id="o4p-uE-yqv"/>
                             </constraints>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Diamonds Winner" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8dz-Nd-RYo">
-                            <rect key="frame" x="25" y="30" width="201" height="26"/>
-                            <fontDescription key="fontDescription" name="ExtensionBoldItalic" family="ExtensionBoldItalic" pointSize="20"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Diamonds Winner" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8dz-Nd-RYo" customClass="MOBezierAnimationLab">
+                            <rect key="frame" x="25" y="30" width="201" height="25.666666666666671"/>
+                            <fontDescription key="fontDescription" name="Gilroy-HeavyItalic" family="Gilroy" pointSize="20"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
@@ -51,13 +51,34 @@
                                 <constraint firstAttribute="height" constant="46" id="Seh-Zg-37X"/>
                                 <constraint firstAttribute="width" constant="153" id="obK-cG-8UT"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                            <fontDescription key="fontDescription" name="Gilroy-HeavyItalic" family="Gilroy" pointSize="20"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="Go Play"/>
                         </button>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You have one FREE  chance to join in the Diamond Grand Winner" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Edr-5w-RPA" customClass="MOStrokeLabel">
+                            <rect key="frame" x="25" y="83" width="201" height="53.666666666666657"/>
+                            <fontDescription key="fontDescription" name="Gilroy-HeavyItalic" family="Gilroy" pointSize="14"/>
+                            <nil key="textColor"/>
+                            <nil key="highlightedColor"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="color" keyPath="customStrokeColor">
+                                    <color key="value" red="0.56862745098039214" green="0.16862745098039217" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="customShadowBlur">
+                                    <real key="value" value="3"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="customShadowColor">
+                                    <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="size" keyPath="customShadowOffset">
+                                    <size key="value" width="2" height="2"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </label>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
+                        <constraint firstItem="Edr-5w-RPA" firstAttribute="top" secondItem="mdX-cF-Rvz" secondAttribute="bottom" constant="25" id="58L-e0-AHj"/>
                         <constraint firstAttribute="trailing" secondItem="MEY-hW-vxg" secondAttribute="trailing" id="7UH-Lq-wip"/>
                         <constraint firstAttribute="height" constant="233" id="9si-Xi-YRn"/>
                         <constraint firstAttribute="bottom" secondItem="dmb-k8-hgE" secondAttribute="bottom" constant="7" id="IFW-Mn-gQ1"/>
@@ -65,8 +86,10 @@
                         <constraint firstItem="MEY-hW-vxg" firstAttribute="top" secondItem="4Ag-AI-9uH" secondAttribute="top" id="MEd-OR-jDB"/>
                         <constraint firstItem="8dz-Nd-RYo" firstAttribute="top" secondItem="4Ag-AI-9uH" secondAttribute="top" constant="30" id="RS0-ek-tPI"/>
                         <constraint firstAttribute="trailing" secondItem="8dz-Nd-RYo" secondAttribute="trailing" constant="25" id="W8w-I8-QTf"/>
+                        <constraint firstItem="Edr-5w-RPA" firstAttribute="leading" secondItem="4Ag-AI-9uH" secondAttribute="leading" constant="25" id="Xza-i7-QfT"/>
                         <constraint firstAttribute="width" constant="251" id="lFw-xY-CAm"/>
                         <constraint firstAttribute="bottom" secondItem="MEY-hW-vxg" secondAttribute="bottom" id="mGf-ov-vHT"/>
+                        <constraint firstAttribute="trailing" secondItem="Edr-5w-RPA" secondAttribute="trailing" constant="25" id="nMh-8Y-3NT"/>
                         <constraint firstItem="mdX-cF-Rvz" firstAttribute="centerX" secondItem="4Ag-AI-9uH" secondAttribute="centerX" id="nvs-Oy-E8f"/>
                         <constraint firstItem="dmb-k8-hgE" firstAttribute="centerX" secondItem="4Ag-AI-9uH" secondAttribute="centerX" id="p1J-Zs-A66"/>
                         <constraint firstItem="lxl-8c-pOr" firstAttribute="centerX" secondItem="4Ag-AI-9uH" secondAttribute="centerX" id="qiG-eP-VMb"/>
@@ -83,6 +106,9 @@
                     </constraints>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                     <state key="normal" image="icon_task_close"/>
+                    <connections>
+                        <action selector="closeBtnClick:" destination="iN0-l3-epB" eventType="touchUpInside" id="hhB-QT-jdO"/>
+                    </connections>
                 </button>
             </subviews>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
@@ -94,6 +120,12 @@
                 <constraint firstItem="4Ag-AI-9uH" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="bRl-Xw-KCb"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="bgView" destination="4Ag-AI-9uH" id="X5u-GB-bbx"/>
+                <outlet property="contentLab" destination="Edr-5w-RPA" id="bh5-Un-6cY"/>
+                <outlet property="goPlayBtn" destination="lxl-8c-pOr" id="eTd-rN-4l3"/>
+                <outlet property="titleLab" destination="8dz-Nd-RYo" id="0d1-Jh-yUw"/>
+            </connections>
             <point key="canvasLocation" x="97" y="-12"/>
         </view>
     </objects>

MiMoLive/MiMoLive/Info.plist

@@ -108,7 +108,7 @@
 	</dict>
 	<key>UIAppFonts</key>
 	<array>
-		<string>ProximaSansBlackOblique.ttf</string>
+		<string>Gilroy-HeavyItalic.otf</string>
 		<string>akrobat-black.ttf</string>
 		<string>Source Sans Pro BlackIt.otf</string>
 		<string>ExtensionBoldItalic.otf</string>

MiMoLive/MiMoLive/en.lproj/Localizable.strings

@@ -932,3 +932,7 @@
 "mimo_anchor_short_leave_rtm_tip" = "The host is temporarily away and will return later";
 "mimo_anchor_short_leave_back_rtm_tip" = "Welcome host back";
 "mimo_anchor_short_leave_btn_click_tip" = "Unavailable during suspension";
+
+"mimo_diamonds_win_title" = "Diamonds Winner";
+"mimo_diamonds_win_content" = "You have one FREE  chance to join in the Diamond Grand Winner";
+"mimo_diamonds_win_go_play_btn" = "Go Play";

MiMoLive/MiMoLive/id.lproj/Localizable.strings

@@ -931,6 +931,10 @@
 "mimo_anchor_short_leave_back_rtm_tip" = "Selamat datang kembali, host";
 "mimo_anchor_short_leave_btn_click_tip" = "Tidak tersedia selama penangguhan";
 
+"mimo_diamonds_win_title" = "Diamonds Winner";
+"mimo_diamonds_win_content" = "You have one FREE  chance to join in the Diamond Grand Winner";
+"mimo_diamonds_win_go_play_btn" = "Go Play";
+
 //第三方
 //MJRefresh
 "MJRefreshAutoFooterNoMoreDataText" = "Tidak ada lagi data";

MiMoLive/MiMoLive/zh-Hans.lproj/Localizable.strings

@@ -937,3 +937,8 @@
 "mimo_anchor_short_leave_back_rtm_tip" = "欢迎主播回来";
 "mimo_anchor_short_leave_btn_click_tip" = "暂停期间不可使用";
 
+
+"mimo_diamonds_win_title" = "Diamonds Winner";
+"mimo_diamonds_win_content" = "You have one FREE chance to join in the Diamond Grand Winner";
+"mimo_diamonds_win_content_g" = "FREE";
+"mimo_diamonds_win_go_play_btn" = "Go Play";