提交

QXLive.xcodeproj/project.pbxproj

@@ -786,7 +786,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -848,7 +848,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1067,7 +1067,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi.QXLiveScreen;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.QXLiveScreen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1093,7 +1093,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi.QXLiveScreen;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.QXLiveScreen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1119,7 +1119,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test.QXLiveScreen;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test.QXLiveScreen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1145,7 +1145,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test.QXLiveScreen;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test.QXLiveScreen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1202,7 +1202,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
@@ -1266,7 +1266,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;

QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -272,5 +272,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E5F3FD59-09F0-47AB-B9AC-F17A091A9653"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "QXLive/Login(&#x767b;&#x5f55;)/Controlller/QXLoginViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "185"
+            endingLineNumber = "185"
+            landmarkName = "-startLoginWithModel:complete:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C9A8DE33-DA4D-41ED-AF3F-94C04D8D962B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "QXLive/Login(&#x767b;&#x5f55;)/Controlller/QXLoginViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "207"
+            endingLineNumber = "207"
+            landmarkName = "-startLoginWithModel:complete:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

QXLive/Base/QXAppStartViewController.m

@@ -17,7 +17,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.bgImaegView = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    self.bgImaegView.image = [UIImage imageNamed:@"app_start_midi1"];;
+    self.bgImaegView.image = [UIImage imageNamed:@"app_start_myyuyin"];;
     self.bgImaegView.contentMode = UIViewContentModeScaleAspectFill;
     [self.view addSubview:self.bgImaegView];
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:noticeUserLogin object:nil];

QXLive/Base/QXGlobal.m

@@ -199,7 +199,6 @@
     navagationController = (QXBaseNavigationController*)KEYWINDOW.rootViewController;
 //    navagationController.interactivePopGestureRecognizer.enabled = NO;
     if (_miniView) {
-        [[QXGiftPlayerManager shareManager] startPlay];
         [_miniView removeFromSuperview];
         _miniView = nil;
     }
@@ -332,7 +331,6 @@
     self.miniView.roomId = self.roomId;
     self.miniView.roomCoverImage = roomCover;
     [self.miniView show];
-    [[QXGiftPlayerManager shareManager] stopPlay];
 }
 
 -(QXMiniRoomView *)miniView{

QXLive/Config/QXConfig.m

@@ -22,7 +22,7 @@
     config.backgroundImage = @"app_bg";
     config.placehoulderTextColor = RGB16(0x9b9b9b);
     /// appstore
-    config.themeColor = RGB16(0x6C49E4);
+    config.themeColor = RGB16(0xFC7285);
     config.btnTextColor = RGB16(0xffffff);
     
 //    config.themeColor = RGB16(0xFC7285);

QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m

@@ -40,7 +40,7 @@
     self.categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(14, kSafeAreaTop, 100, 44)];
     self.categoryView.delegate = self;
 //    self.categoryView.titles = @[QXText(@"发现"),QXText(@"扩列")];
-    self.categoryView.titles = @[QXText(@"扩列"),QXText(@"发现")];
+    self.categoryView.titles = @[QXText(@"发现")];
     self.categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"];
     self.categoryView.titleColor = [UIColor colorWithHexString:@"#666666"];
     self.categoryView.cellWidth = 50;
@@ -68,28 +68,28 @@
 }
 
 -(NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView{
-    return 2;
+    return 1;
 }
 -(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index{
-//    if (index == 0) {
-//        QXFindViewController *vc = [[QXFindViewController alloc] init];
-//        self.findVC = vc;
-//        return vc;
-//    }else{
-//        QXExpansionViewController *vc = [[QXExpansionViewController alloc] init];
-//        return vc;
-//    }
     if (index == 0) {
-        QXExpansionViewController *vc = [[QXExpansionViewController alloc] init];
-        return vc;
-    }else{
         QXFindViewController *vc = [[QXFindViewController alloc] init];
         self.findVC = vc;
         return vc;
+    }else{
+        QXExpansionViewController *vc = [[QXExpansionViewController alloc] init];
+        return vc;
     }
+//    if (index == 0) {
+//        QXExpansionViewController *vc = [[QXExpansionViewController alloc] init];
+//        return vc;
+//    }else{
+//        QXFindViewController *vc = [[QXFindViewController alloc] init];
+//        self.findVC = vc;
+//        return vc;
+//    }
 }
 -(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{
-    self.publishBtn.hidden = !(index==1);
+//    self.publishBtn.hidden = !(index==1);
 }
 #pragma mark - action
 -(void)pulishAction{
@@ -111,7 +111,7 @@
         [_publishBtn setImage:[UIImage imageNamed:@"publish_icon"] forState:UIControlStateNormal];
         [_publishBtn setImage:[UIImage imageNamed:@"publish_icon"] forState:UIControlStateHighlighted];
         [_publishBtn addTarget:self action:@selector(pulishAction) forControlEvents:UIControlEventTouchUpInside];
-        _publishBtn.hidden = YES;
+//        _publishBtn.hidden = YES;
     }
     return _publishBtn;
 }

QXLive/HomePage(声播)/Controlller/QXHomeViewController.m

@@ -75,7 +75,7 @@
     if ([QXConfig.backgroundImage hasPrefix:@"http"] || [QXConfig.backgroundImage hasPrefix:@"https"]) {
         [self updateBgImage:QXConfig.backgroundImage];
     }else{
-        [self updateBgImage:@"app_home_bg"];
+        [self updateBgImage:@"app_bg"];
     }
     UIImageView *logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mi_di"]];
     [self.view addSubview:logoImageView];
@@ -91,8 +91,8 @@
     [self.view addSubview:self.roomBtn];
    
     [self.roomBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(54);
-        make.height.mas_equalTo(26);
+        make.width.mas_equalTo(30);
+        make.height.mas_equalTo(30);
         make.centerY.equalTo(logoImageView);
         make.right.equalTo(self.view).offset(-10);
     }];

QXLive/Info.plist

@@ -4,7 +4,7 @@
 <dict>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
-		<string>com.xscm.midi.task</string>
+		<string>com.jdf.myyuliao.task</string>
 	</array>
 	<key>CFBundleURLTypes</key>
 	<array>

QXLive/Login(登录)/Controlller/QXLoginViewController.m

@@ -248,8 +248,8 @@
     model.preferredStatusBarStyle = UIStatusBarStyleDarkContent;
     model.logoImage = [UIImage imageNamed:@"login_logo"];
     model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        frame.origin = CGPointMake((SCREEN_WIDTH - 88) * .5, 150+ kSafeAreaTop);
-        frame.size = CGSizeMake(88, 88);
+        frame.origin = CGPointMake((SCREEN_WIDTH - 170) * .5, 75+ kSafeAreaTop);
+        frame.size = CGSizeMake(170, 170);
         return frame;
     };
     model.sloganText = [[NSAttributedString alloc] initWithString:@"本机号码" attributes:@{NSForegroundColorAttributeName : RGB16(0x666666),NSFontAttributeName : [UIFont systemFontOfSize:12]}];

QXLive/Login(登录)/View/QXLoginBottomView.m

@@ -107,12 +107,12 @@
     NSString *str = [NSString stringWithFormat:@"%@%@%@%@",QXText(@"我已阅读并同意"),QXText(@"《用户使用协议》"),QXText(@"和"),QXText(@"《隐私政策》")];
     NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:str];
     MJWeakSelf
-    [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《用户使用协议》")] color:RGB16(0xFF8ACC) backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+    [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《用户使用协议》")] color:QXConfig.themeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
         if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickAgreementLoginWithUrl:type:)]) {
             [weakSelf.delegate didClickAgreementLoginWithUrl:@"111" type:1];
         }
     }];
-    [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《隐私政策》")] color:RGB16(0xFF8ACC) backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+    [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《隐私政策》")] color:QXConfig.themeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
         if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickAgreementLoginWithUrl:type:)]) {
             [weakSelf.delegate didClickAgreementLoginWithUrl:@"111" type:2];
         }

QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m

@@ -8,6 +8,7 @@
 #import "QXGuildViewController.h"
 #import <WebKit/WebKit.h>
 #import "QXUserHomePageViewController.h"
+#import "QXRealNameViewController.h"
 
 
 static void *WKWebBrowserContext = &WKWebBrowserContext;
@@ -119,6 +120,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
                 return;
             }
             [[QXGlobal shareGlobal] joinRoomWithRoomId:room_id isRejoin:NO navagationController:self.navigationController];
+        }else if ([dict[@"action"] isEqualToString:@"enterAuthent"]) {
+            QXRealNameViewController *vc = [[QXRealNameViewController alloc] init];
+            [self.navigationController pushViewController:vc animated:YES];
         }
         
         

QXLive/Other/Assets.xcassets/app_bg.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "背景2@2x.png",
+      "filename" : "首页@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "排行榜@2x.png",
+      "filename" : "Group 27@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "排行榜@3x.png",
+      "filename" : "Group 27@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/home/home_room.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "编组 4@2x.png",
+      "filename" : "Group 26@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "编组 4@3x.png",
+      "filename" : "Group 26@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/home/home_search.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "协议已勾选@2x.png",
+      "filename" : "Group 6883@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "协议已勾选@3x.png",
+      "filename" : "Group 6883@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "iPadProApp_83.5pt@2x.png",
+      "filename" : "00@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "动态未选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "动态未选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "动态已选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "动态已选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "首页未选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "首页未选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "首页已选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "首页已选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "我的未选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "我的未选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "我的已选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "我的已选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "消息未选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "消息未选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "消息已选中@2x.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "消息已选中@3x.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }