Browse Source

更换SVIP图标

Steven 8 months ago
parent
commit
8efc220019
17 changed files with 28 additions and 14 deletions
  1. 4 4
      KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj
  2. 2 2
      KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvip.imageset/mineCenter_tagSvip@2x.png
  4. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvip.imageset/mineCenter_tagSvip@3x.png
  5. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvipExpired.imageset/mineCenter_tagSvipExpired@2x.png
  6. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvipExpired.imageset/mineCenter_tagSvipExpired@3x.png
  7. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVip.imageset/mineCenter_tagVip@2x.png
  8. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVip.imageset/mineCenter_tagVip@3x.png
  9. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVipExpired.imageset/mineCenter_tagVipExpired@2x.png
  10. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVipExpired.imageset/mineCenter_tagVipExpired@3x.png
  11. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_svip.imageset/mine_svip@2x.png
  12. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_svip.imageset/mine_svip@3x.png
  13. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_vip.imageset/mine_vip@2x.png
  14. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_vip.imageset/mine_vip@3x.png
  15. 18 4
      KulexiuForStudent/KulexiuForStudent/Common/Base/LoadingManager/KSHudLoagingManager.m
  16. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.xib
  17. BIN
      KulexiuForStudent/KulexiuForStudent/ToolKit/KSToolLibrary.framework/KSToolLibrary

+ 4 - 4
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -304,6 +304,7 @@
 		BC12639A28FF8E1700509E90 /* HomeNewMusicView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC12639928FF8E1700509E90 /* HomeNewMusicView.xib */; };
 		BC12639D28FF8E6D00509E90 /* HomeRecommendMusicView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC12639C28FF8E6D00509E90 /* HomeRecommendMusicView.m */; };
 		BC12639F28FF8E7400509E90 /* HomeRecommendMusicView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC12639E28FF8E7400509E90 /* HomeRecommendMusicView.xib */; };
+		BC1553792C4E73C300F6A151 /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC1553782C4E73C300F6A151 /* KSToolLibrary.framework */; };
 		BC1D02422C0490AB001F6A94 /* KSMuteTipsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC1D023F2C0490AB001F6A94 /* KSMuteTipsView.xib */; };
 		BC1D02432C0490AB001F6A94 /* KSMuteTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1D02402C0490AB001F6A94 /* KSMuteTipsView.m */; };
 		BC27A06E280FF56C00F91E27 /* AccompanyEvaluateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC27A06A280FF56B00F91E27 /* AccompanyEvaluateCell.xib */; };
@@ -915,7 +916,6 @@
 		BCF425F72AB991E600BCD942 /* TenantAlbumModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF425F62AB991E600BCD942 /* TenantAlbumModel.m */; };
 		BCF472E72AB019CD0032BE16 /* TenantDarkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF472E62AB019CD0032BE16 /* TenantDarkViewController.m */; };
 		BCF472EA2AB01AEB0032BE16 /* TenantMoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF472E92AB01AEB0032BE16 /* TenantMoreViewController.m */; };
-		BCFC09C82C47F6AD009A727F /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCFC09C72C47F6AD009A727F /* KSToolLibrary.framework */; };
 		BCFC09CA2C47F6FF009A727F /* CloudAccompanyLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCFC09C92C47F6FF009A727F /* CloudAccompanyLibrary.framework */; };
 		BCFC09D12C48B3D7009A727F /* KSAccompanyDraftViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFC09D02C48B3D7009A727F /* KSAccompanyDraftViewController.m */; };
 		BCFC09DA2C48C8DE009A727F /* UserVip.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFC09D82C48C8DD009A727F /* UserVip.m */; };
@@ -1538,6 +1538,7 @@
 		BC12639B28FF8E6D00509E90 /* HomeRecommendMusicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeRecommendMusicView.h; sourceTree = "<group>"; };
 		BC12639C28FF8E6D00509E90 /* HomeRecommendMusicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeRecommendMusicView.m; sourceTree = "<group>"; };
 		BC12639E28FF8E7400509E90 /* HomeRecommendMusicView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeRecommendMusicView.xib; sourceTree = "<group>"; };
+		BC1553782C4E73C300F6A151 /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BC1D023F2C0490AB001F6A94 /* KSMuteTipsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSMuteTipsView.xib; sourceTree = "<group>"; };
 		BC1D02402C0490AB001F6A94 /* KSMuteTipsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSMuteTipsView.m; sourceTree = "<group>"; };
 		BC1D02412C0490AB001F6A94 /* KSMuteTipsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSMuteTipsView.h; sourceTree = "<group>"; };
@@ -2488,7 +2489,6 @@
 		BCF880DD2B91C4FA0007B8F0 /* Config-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Config-debug.xcconfig"; sourceTree = "<group>"; };
 		BCF880DF2B91C5090007B8F0 /* Config-test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Config-test.xcconfig"; sourceTree = "<group>"; };
 		BCF880E02B91C5150007B8F0 /* Config-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Config-release.xcconfig"; sourceTree = "<group>"; };
-		BCFC09C72C47F6AD009A727F /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BCFC09C92C47F6FF009A727F /* CloudAccompanyLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CloudAccompanyLibrary.framework; sourceTree = "<group>"; };
 		BCFC09CF2C48B3D7009A727F /* KSAccompanyDraftViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSAccompanyDraftViewController.h; sourceTree = "<group>"; };
 		BCFC09D02C48B3D7009A727F /* KSAccompanyDraftViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSAccompanyDraftViewController.m; sourceTree = "<group>"; };
@@ -2575,7 +2575,7 @@
 				BCFEE1932AD15C0E000E888F /* SoundpipeAudioKit in Frameworks */,
 				BCFC09CA2C47F6FF009A727F /* CloudAccompanyLibrary.framework in Frameworks */,
 				BCFEE18D2AD15BD4000E888F /* AudioKitEX in Frameworks */,
-				BCFC09C82C47F6AD009A727F /* KSToolLibrary.framework in Frameworks */,
+				BC1553792C4E73C300F6A151 /* KSToolLibrary.framework in Frameworks */,
 				BC8B6E152856E20800866917 /* WebKit.framework in Frameworks */,
 				BC8A45CB283DDEA100094BBB /* AVFoundation.framework in Frameworks */,
 				BCD9294F28F8FCA4006793E4 /* AudioKit in Frameworks */,
@@ -4671,7 +4671,7 @@
 			children = (
 				BC00A65F2BB58FDB00231B74 /* LLPhotoBrowse.bundle */,
 				BC00A6602BB58FDC00231B74 /* WMPlayer.bundle */,
-				BCFC09C72C47F6AD009A727F /* KSToolLibrary.framework */,
+				BC1553782C4E73C300F6A151 /* KSToolLibrary.framework */,
 				BC3A55682BAA7B19002E1616 /* KSTunerLibrary.framework */,
 				BCFC09C92C47F6FF009A727F /* CloudAccompanyLibrary.framework */,
 				BC3BF62F2B9EAFC800831494 /* client.p12 */,

+ 2 - 2
KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "DEV"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -92,7 +92,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "DEV"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvip.imageset/mineCenter_tagSvip@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvip.imageset/mineCenter_tagSvip@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvipExpired.imageset/mineCenter_tagSvipExpired@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagSvipExpired.imageset/mineCenter_tagSvipExpired@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVip.imageset/mineCenter_tagVip@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVip.imageset/mineCenter_tagVip@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVipExpired.imageset/mineCenter_tagVipExpired@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineCenter_tagVipExpired.imageset/mineCenter_tagVipExpired@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_svip.imageset/mine_svip@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_svip.imageset/mine_svip@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_vip.imageset/mine_vip@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_vip.imageset/mine_vip@3x.png


+ 18 - 4
KulexiuForStudent/KulexiuForStudent/Common/Base/LoadingManager/KSHudLoagingManager.m

@@ -83,9 +83,10 @@
         self.HUD = [MBProgressHUD showHUDAddedTo:displayView animated:YES];
         self.HUD.removeFromSuperViewOnHide =YES;
         self.HUD.mode = MBProgressHUDModeText;
-        self.HUD.label.text = str;
+        self.HUD.label.attributedText = [self getAttrStringWithText:str];
         self.HUD.label.numberOfLines = 0;
-        self.HUD.minSize = CGSizeMake(132.f, 60.0f);
+        self.HUD.minSize = CGSizeMake(132.f, 30.0f);
+        self.HUD.margin = 10.0;
         self.HUD.label.textColor = [UIColor whiteColor];
         self.HUD.bezelView.style = MBProgressHUDBackgroundStyleSolidColor;
         self.HUD.bezelView.backgroundColor = HexRGBAlpha(0x000000, 0.8f);
@@ -129,10 +130,11 @@
     MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:displayView animated:YES];
     hud.removeFromSuperViewOnHide = YES;
     hud.mode = MBProgressHUDModeText;
-    hud.label.text = message;
+    hud.label.attributedText = [self getAttrStringWithText:message];
     hud.label.numberOfLines = 0;
     hud.label.textColor = [UIColor whiteColor];
-    hud.minSize = CGSizeMake(132.0f, 40.0f);
+    hud.minSize = CGSizeMake(132.0f, 30.0f);
+    hud.margin = 10.0;
     hud.bezelView.style = MBProgressHUDBackgroundStyleSolidColor;
     hud.bezelView.backgroundColor = HexRGBAlpha(0x000000, 0.8);
     [hud hideAnimated:YES afterDelay:PROMPT_TIME];
@@ -214,4 +216,16 @@
     });
 
 }
+
+- (NSMutableAttributedString *)getAttrStringWithText:(NSString *)text {
+    if (![NSString isEmptyString:text]) {
+        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+        [paragraphStyle setLineSpacing:6];//调整行间距
+        NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:text attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:16],NSForegroundColorAttributeName:HexRGB(0xffffff)}];
+        return attr;
+    }
+    else {
+        return [[NSMutableAttributedString alloc] initWithString:@""];
+    }
+}
 @end

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.xib

@@ -305,10 +305,11 @@
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_svip" translatesAutoresizingMaskIntoConstraints="NO" id="0Am-MA-eFO">
-                            <rect key="frame" x="340.5" y="57" width="39" height="18"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0Am-MA-eFO">
+                            <rect key="frame" x="338.5" y="57" width="43" height="18"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="18" id="jbJ-ZB-M7W"/>
+                                <constraint firstAttribute="height" constant="18" id="3dC-Cs-145"/>
+                                <constraint firstAttribute="width" secondItem="0Am-MA-eFO" secondAttribute="height" multiplier="12:5" id="ems-ya-9Aq"/>
                             </constraints>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QuV-vC-ohV">
@@ -1060,7 +1061,6 @@
         <image name="mine_music" width="33" height="33"/>
         <image name="mine_musicProduct" width="33" height="34"/>
         <image name="mine_next" width="8" height="15"/>
-        <image name="mine_svip" width="39" height="18"/>
         <image name="mine_ticket" width="42" height="42"/>
         <image name="mine_trainRecord" width="42" height="42"/>
         <image name="mine_uid" width="11" height="11"/>

BIN
KulexiuForStudent/KulexiuForStudent/ToolKit/KSToolLibrary.framework/KSToolLibrary