完成

QXLive/Other/AppDelegate.m

@@ -26,18 +26,22 @@
 
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-//    for (NSString *str in [UIFont familyNames]) {
-//         
-//         NSLog(@"UIFont_Name－－－－－－－－－－－－:%@",str);
-//         
-//     }
+    NSArray *array = [UIFont familyNames];
+    for  (NSString * familyname in array) {
+        NSLog(@"Family:%@" ,familyname);
+//        NSArray *fontnames = [UIFont fontNamesForFamilyName:familyname];
+//        for  (NSString *name in fontnames) {
+//            NSLog(@"Font Name:%@" ,name);
+//        }
+    }
+  
     // Override point for customization after application launch.
     [QXConfig defaultConfig];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor = [UIColor whiteColor];
     QXAppStartViewController *startVC  = [[QXAppStartViewController alloc] init];
     self.window.rootViewController = startVC;
-    [Bugly startWithAppId:@"38d154fc5f"];
+    [Bugly startWithAppId:@"65efebcd8f"];
     SDImageWebPCoder *webPCoder = [SDImageWebPCoder sharedCoder];
     [[SDImageCodersManager sharedManager] addCoder:webPCoder];
     [self configThirdPartLogin];

QXLive/Other/Assets.xcassets/home/room/room_cabin_close.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room/room_cabin_gift.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room/room_cabin_heart.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 7425@2x.png",
+      "filename" : "小爱心@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 7425@3x.png",
+      "filename" : "小爱心@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/home/room/room_cabin_movie.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room/room_cabin_open.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room/room_sound_sel.imageset/Contents.json

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

QXLive/Other/NoitceAndKey.h

@@ -18,10 +18,11 @@ typedef NS_ENUM(NSInteger) {
     QXRoomRoleTypeAudience,
 }QXRoomRoleType;
 // 三方平台
+
 #if DEVELOPENT == 1
-static NSString *const WechatAppId = @"wx9b6db036ca1073a2";
-static NSString *const WechatAppSecret = @"c07c5f21fc8bf655617f1468ab95419f";
-static NSString *const WechatUniversalLink = @"https://chat.qxmier.com/";
+static NSString *const WechatAppId = @"wxef1289d8a89b41d4";
+static NSString *const WechatAppSecret = @"229b6a2a75d8343676a3cc6aa3930213";
+static NSString *const WechatUniversalLink = @"https://mdh.xscmmidi.site/";
 
 /// 人脸核身
 static NSString *const FaceAuthId = @"TIDAxpO9";
@@ -29,10 +30,10 @@ static NSString *const FaceAuthSecret = @"DcnCE33XLLfSYPTWU21lCjn9Tw14L8DtBPypZQ
 static NSString *const FaceAuthLicense = @"Af9QYHMCQ+OeFGTY+2sAST8E4CGao8Ytj74vPaFIM7wMclK/Bm2Zf9DIT6ke0kpeTLORUxE++QRJJ1HZYNYlmA802cQvga/C0HouDiUTul7KBT9LkMUfYp53D1nTiYcIQ6Jh9YEraH1zlJnEqmzeKBfY6TqsX5e1j6K0pMOZShVlGUhL0DgM+lrrpYPeds3E1/rerH1tARtRmCCD8LrpLDTBP84AqCpg2PtzVWJrDwm7rMeyZm0yeed9pN3LH9D2FiFju+yhtj930D1CEk3n4WZwLvjO8c/lPmycze6jAKE+XfAEa7jK8twUe3YHweNfAzzN55mVpK0K4gTEsbGzHg==";
 
 /// 腾讯IM
-static NSInteger const TencentIMID = 1600096890;
-static NSString *const TencentIMSecret = @"d9a5b8088ed39113d0c92ae434bc37528c4715c1f1d2eaedb172134eacd06103";
+static NSInteger const TencentIMID = 1600101474;
+static NSString *const TencentIMSecret = @"96d9453fbdc23f5326f351c83e27fc65db0ea6cdc0ac706770bfbeeaf6c89456";
 
-static NSString *const AddressOfMQTTServer = @"47.120.21.132";
+static NSString *const AddressOfMQTTServer = @"1.13.181.248";
 static NSInteger const AddressOfMQTTPort = 1883;
 static NSInteger const AppPushId = 46164;
 
@@ -43,29 +44,29 @@ static NSString *const AuthSDKKey = @"Q8xhyn+MAyHw8FQLjKOWU8ZrZMXsuflPGSxDvwKu8U
 
 #else
 
-static NSString *const WechatAppId = @"wxc7681513be9f926b";
-static NSString *const WechatAppSecret = @"37afd7c6b9135b642bd01190305868fe";
-static NSString *const WechatUniversalLink = @"https://chat.qxmier.com/";
+static NSString *const WechatAppId = @"wxef1289d8a89b41d4";
+static NSString *const WechatAppSecret = @"229b6a2a75d8343676a3cc6aa3930213";
+static NSString *const WechatUniversalLink = @"https://mdh.xscmmidi.site/";
 
 /// 人脸核身
-static NSString *const FaceAuthId = @"IDAxzBMV";
-static NSString *const FaceAuthSecret = @"lrFr0W6U88JEoXIP0Cdk1Bc1c3EoiQgSr4LqPATKoeHofde6tGudnLApr3JGq3jC";
-static NSString *const FaceAuthLicense = @"mjOBs0dOQXvt2Mwnenv0KYr2FbI8vl/sQmTH5Y33YiLFPnrZkJtyuSw/aYDW3lFU8Dd/bxBn2ymlqW32wpiUM6anJw7tyoNg2XeY3scvChHUGC271eu+qVWXVCon5LeWtfy9NiTKqobvN++c5GbcE3uKxOAqAGeeibt1/kSkIVJlGUhL0DgM+lrrpYPeds3E1/rerH1tARtRmCCD8LrpLDTBP84AqCpg2PtzVWJrDwm7rMeyZm0yeed9pN3LH9D2FiFju+yhtj930D1CEk3n4WZwLvjO8c/lPmycze6jAKE+XfAEa7jK8twUe3YHweNfAzzN55mVpK0K4gTEsbGzHg==";
+static NSString *const FaceAuthId = @"IDA8YkL0";
+static NSString *const FaceAuthSecret = @"RqNCp7PoY77oJqVu9hFEDM0Ol2DNDQQQ97vy9CbZx6qw6iDSPZtRfotXvQgq7xA2";
+static NSString *const FaceAuthLicense = @"P6N+VYfdu1Op5p+QwUGdI4y64PqOnxMzChX2SWWvrXjKi5gSKTKYnksyPYGpdDoEiZGUuvidfW3fJx0DHobAmD/MMpCxdzRyvyn4Z0d7Ccno6TEO2eigEbAOL4rrM8xZHE6+POuORUrmDjRR7yKwT6yVJoMa96ULUZ54tAHY5TAMBPhZad80QU40PM+28QcOtufSd6QQwyKyjM/vCo8gnR8v9lTewz7y7GWkISVoymwW8BQMIkvWEXiGoi6u3mCuj2gn7cwGcb2HCXvM0EIzSLgKSwMFrIKYVmbEQ0ZIwUqCAk7IJv5V2VyGPUc1VIli0lWWPhwaL+1kVhpPytiK5A==";
 
 /// 腾讯IM
-static NSInteger const TencentIMID = 1600096860;
-static NSString *const TencentIMSecret = @"448a3259085924f89957c1884c761974e8fded64b9ab1c67b8e0a5a1c4b68f3f";
+static NSInteger const TencentIMID = 1600101474;
+static NSString *const TencentIMSecret = @"96d9453fbdc23f5326f351c83e27fc65db0ea6cdc0ac706770bfbeeaf6c89456";
 
-static NSString *const AddressOfMQTTServer = @"81.70.45.221";
+static NSString *const AddressOfMQTTServer = @"62.234.12.147";
 static NSInteger const AddressOfMQTTPort = 1883;
 
 static NSInteger const AppPushId = 46163;
 
 ///声网
-static NSString *const AgoraAuthId = @"4a521d6f1c6343998b1c8fd425dea02a";
+static NSString *const AgoraAuthId = @"a3f0f0c78307434fa1c697c3429fbdcf";
 
 //一键登录AuthSDKInfo
-static NSString *const AuthSDKKey = @"hKYFcoI6vIdz9/yOCs3XJ/fUQ0u3DHGa5UPONdSJfSccjVtn3sHBRecwepn5iNIgOYWq8xgUc4LtWqSjpveHIYzJx0YcQm/j5IXdVKe74RI+4vT00UwP8oQSZ2w0a18Sbbd8uKgFys8CUyQZWfMZXHIVuHmNBHRHZ1xoX2sCCCl56U3vQ11ZSpJdeZW4wvQ8qeQ56Q4wyW5hyo/yFU1sxohn1ApS6FbbXXwroWV57aK1R9+zaBOqn41NCKlvKsSD";
+static NSString *const AuthSDKKey = @"Qyj6q/o52PnGW8NJE48dN4ha+0KWDVyuF05Xj9HRV85u8YBs4xIkelP44/5xEv3+cMVs5aDf5/1ESuDp6rWq3tcbDoaUSaNya8S31LDrNfajmXBRucTnIpfp02T2NWjzQmKrhQVJUwH2UWp3p63fxfxE7AzA38qKtqjXKPWt+pqeeMO6lBzB0jrZv+aGPj4IsEdVw0lAW4yO0QPqKORWJNHQgEbB4sWl17Ryby4UzYzHc4gN6kAJh74ickyuKp3j";
 #endif
 
 /// 声网
@@ -78,10 +79,10 @@ static NSString *const kUserLoginData = @"LoginData";
 
 
 //阿里云文件上传
-static NSString *const OSS_BUCKET_NAME = @"qx-yusheng";
-static NSString *const OSSAccessKeyId = @"LTAI5tJ2UYfFNF7K3F4e1siv";
-static NSString *const OSSAccessKeySecret = @"DhpCS82gaigZljYqsWsUWUAZ20dREz";
-static NSString *const OSSEndPoint = @"oss-cn-hangzhou.aliyuncs.com";
+static NSString *const OSS_BUCKET_NAME = @"midi01";
+static NSString *const OSSAccessKeyId = @"LTAI5tKgrfcFQxH46ZwWYgFW";
+static NSString *const OSSAccessKeySecret = @"ZOjTqAJmUL563EKFKySrUwAHtx4hKt";
+static NSString *const OSSEndPoint = @"oss-cn-beijing.aliyuncs.com";
 
 
 //文件路径
@@ -122,4 +123,6 @@ static NSString *const noticeUnreadNumberDidChanged = @"noticeUnreadNumberDidCha
 static NSString *const noticeTencentLogin = @"noticeTencentLogin";
 
 static NSString *const noticeUserLogin = @"noticeUserLogin";
+/// 活动盘进度更新
+static NSString *const noticeActivityUpdate = @"noticeActivityUpdate";
 #endif /* NoitceAndKey_h */

QXLive/Other/QXApi.h

@@ -7,12 +7,20 @@
 
 #ifndef Api_h
 #define Api_h
+//正式：
+//mdh.xscmmidi.site --H5
+//admin.xscmmidi.site  --管理后台
+//md.xscmmidi.site  -- 这是接口 api
+//测试：
+//tmdh.xscmmidi.site --H5
+//tadmin.xscmmidi.site  --管理后台
+//tmd.xscmmidi.site  -- 这是接口 api
 #if DEVELOPENT == 1
-static NSString* ServerUrl = @"http://tmd.qixing2.top/";
-static NSString* H5ServerUrl = @"https://chatvespa.qxmier.com/";
+static NSString* ServerUrl = @"https://tmd.xscmmidi.site/";
+static NSString* H5ServerUrl = @"https://tmdh.xscmmidi.site/";
 #else
-static NSString* ServerUrl = @"https://chat.qxmier.com/";
-static NSString* H5ServerUrl = @"https://vespa.qxmier.com/";
+static NSString* ServerUrl = @"https://md.xscmmidi.site/";
+static NSString* H5ServerUrl = @"https://mdh.xscmmidi.site/";
 #endif
 #pragma mark - 引导页
 /// 引导页