修改app的名字和启动页

2023-11-23 16:23:22 -08:00
parent 0254de9caa
commit e0392d821a
10 changed files with 113 additions and 27 deletions
--- a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj
+++ b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj
@@ -2690,6 +2690,11 @@
 				GCC_NO_COMMON_BLOCKS = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "yinmeng-ios/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = Mew;
+				INFOPLIST_KEY_NSCameraUsageDescription = "“Mew”需要您的同意,才能访问进行拍照并上传您的图片，便于他人查看";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "\"Mew\"需要您的同意，才可以进行语音聊天";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "“Mew”需要您的同意,才可以存储相片到相册";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "“Mew”需要您的同意,才可以访问相册并选择您需要上传的图片，便于他人查看";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -2730,6 +2735,11 @@
 				GCC_NO_COMMON_BLOCKS = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "yinmeng-ios/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = Mew;
+				INFOPLIST_KEY_NSCameraUsageDescription = "“Mew”需要您的同意,才能访问进行拍照并上传您的图片，便于他人查看";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "\"Mew\"需要您的同意，才可以进行语音聊天";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "“Mew”需要您的同意,才可以存储相片到相册";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "“Mew”需要您的同意,才可以访问相册并选择您需要上传的图片，便于他人查看";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
--- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/Contents.json
+++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mew_launch_logo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mew_launch_logo@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@2x.png
+++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@2x.png
--- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@3x.png
+++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/mew_launch_logo.imageset/mew_launch_logo@3x.png
--- a/yinmeng-ios/yinmeng-ios/Base.lproj/LaunchScreen.storyboard
+++ b/yinmeng-ios/yinmeng-ios/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_0" orientation="portrait" appearance="light"/>
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@@ -11,15 +14,60 @@
            <objects>
                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mew_home_bg" translatesAutoresizingMaskIntoConstraints="NO" id="PNT-qz-0tc">
+                                <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mew_launch_logo" translatesAutoresizingMaskIntoConstraints="NO" id="VtB-hS-Aga">
+                                <rect key="frame" x="75" y="202" width="240" height="128"/>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mew_home_header_bg" translatesAutoresizingMaskIntoConstraints="NO" id="pcR-pR-yML">
+                                <rect key="frame" x="65" y="410.66666666666669" width="260" height="22.666666666666686"/>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mew" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O9G-IL-eNc">
+                                <rect key="frame" x="156" y="338" width="78" height="38"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="38" id="bZc-Tk-rMk"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="24"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="PNT-qz-0tc" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="2Af-vd-7mS"/>
+                            <constraint firstItem="PNT-qz-0tc" firstAttribute="trailing" secondItem="6Tk-OE-BBY" secondAttribute="trailing" id="2rZ-NH-CFA"/>
+                            <constraint firstItem="pcR-pR-yML" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="40d-ES-7x9"/>
+                            <constraint firstItem="PNT-qz-0tc" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="8i9-19-ffT"/>
+                            <constraint firstItem="pcR-pR-yML" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Bbp-O2-he9"/>
+                            <constraint firstItem="O9G-IL-eNc" firstAttribute="top" secondItem="VtB-hS-Aga" secondAttribute="bottom" constant="8" id="C1v-tZ-ssN"/>
+                            <constraint firstAttribute="bottom" secondItem="PNT-qz-0tc" secondAttribute="bottom" id="FWY-h9-AIl"/>
+                            <constraint firstItem="VtB-hS-Aga" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="155" id="RIh-sk-IRP"/>
+                            <constraint firstItem="VtB-hS-Aga" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="75" id="TA9-Cj-DIF"/>
+                            <constraint firstItem="pcR-pR-yML" firstAttribute="top" secondItem="O9G-IL-eNc" secondAttribute="bottom" constant="34.666666666666686" id="Wmn-XW-ctP"/>
+                            <constraint firstItem="O9G-IL-eNc" firstAttribute="top" secondItem="VtB-hS-Aga" secondAttribute="bottom" constant="8" symbolic="YES" id="YwX-o4-XxA"/>
+                            <constraint firstItem="O9G-IL-eNc" firstAttribute="centerX" secondItem="pcR-pR-yML" secondAttribute="centerX" id="fIG-io-kLL"/>
+                            <constraint firstItem="O9G-IL-eNc" firstAttribute="centerX" secondItem="VtB-hS-Aga" secondAttribute="centerX" id="iRv-yQ-Bjr"/>
+                            <constraint firstItem="O9G-IL-eNc" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" constant="338" id="vAL-vM-0fV"/>
+                            <constraint firstItem="O9G-IL-eNc" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="156" id="yCJ-6y-9ev"/>
+                        </constraints>
                    </view>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52.307692307692307" y="374.64454976303318"/>
        </scene>
    </scenes>
+    <resources>
+        <image name="mew_home_bg" width="375" height="812"/>
+        <image name="mew_home_header_bg" width="260" height="23"/>
+        <image name="mew_launch_logo" width="88" height="88"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
--- a/yinmeng-ios/yinmeng-ios/Info.plist
+++ b/yinmeng-ios/yinmeng-ios/Info.plist
@@ -2,14 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSCameraUsageDescription</key>
-	<string>“Mew”需要您的同意,才能访问进行拍照并上传您的图片，便于他人查看</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>“Mew”需要您的同意,才可以访问相册并选择您需要上传的图片，便于他人查看</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>“Mew”需要您的同意,才可以存储相片到相册</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>&quot;Mew&quot;需要您的同意，才可以进行语音聊天</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
--- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/AudioPlayerManager.m
+++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/AudioPlayerManager.m
@@ -94,7 +94,7 @@ static AudioPlayerManager *_instance = nil;
    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:musicUrl]];
    NSURLSessionDownloadTask *download = [manager downloadTaskWithRequest:request progress:^(NSProgress * _Nonnull downloadProgress) {
    } destination:^NSURL * _Nonnull(NSURL * _Nonnull targetPath, NSURLResponse * _Nonnull response) {
-        NSString *filePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"mineSkillCardVoice"] stringByAppendingPathComponent:fileName];
+        NSString *filePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"userVoice"] stringByAppendingPathComponent:fileName];
        return [NSURL fileURLWithPath:filePath];
    } completionHandler:^(NSURLResponse * _Nonnull response, NSURL * _Nullable filePath, NSError * _Nullable error) {
        if (!error) {
--- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m
+++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m
@@ -15,6 +15,7 @@
 #import "ThemeColor.h"
 #import "YMMacro.h"
 #import "YMHUDTool.h"
+#import "YMIButton.h"

@interface MewPlayVoiceView()
@property (nonatomic, strong) UIImageView *bgImageView;
@@ -26,7 +27,7 @@
 /// 唱片机柄
@property (nonatomic, strong) UIImageView *playVoiceImageView;
 /// 发布声音秀
-@property (nonatomic, strong) UIButton *pushVoiceButton;
+@property (nonatomic, strong) YMIButton *pushVoiceButton;

@property (nonatomic, strong) UIView *optionVoiceBgView;
 /// 暂停
@@ -87,9 +88,12 @@
        return;
    }
    
-    if (!self.stopVoiceButton.selected) {
+    self.stopVoiceButton.selected = YES;
    [self playDiscAnimation:YES];
-    }
+//    self.playVoiceButton.selected = NO;
+//    if (!self.stopVoiceButton.selected) {
+//        [self playDiscAnimation:YES];
+//    }
    
    [self.delegate didSelectMewPlayVoiceViewWithTarget:2];
 }
@@ -183,17 +187,17 @@
    return _playVoiceButton;
 }

- (UIButton *)pushVoiceButton {
+- (YMIButton *)pushVoiceButton {
    if (!_pushVoiceButton) {
-        _pushVoiceButton = [[UIButton alloc] init];
+        _pushVoiceButton = [[YMIButton alloc] initWithImagePosition:XPButtonImagePositionRight];
        [_pushVoiceButton setImage:[UIImage imageNamed:@"mew_home_push_voice"] forState:UIControlStateNormal];
        [_pushVoiceButton setTitle:@"发布声音秀" forState:UIControlStateNormal];
        _pushVoiceButton.layer.cornerRadius = 52.0/2;
        _pushVoiceButton.layer.masksToBounds = YES;
        UIImage *backgroundImage =  [UIImage gradientColorImageFromColors:@[
            [ThemeColor colorWithHexString:@"#FF60FD"],
-            [ThemeColor colorWithHexString:@"#69EBFF"],
-            [ThemeColor colorWithHexString:@"#8974FF"]
+            [ThemeColor colorWithHexString:@"##8974FF"],
+            [ThemeColor colorWithHexString:@"#69EBFF"]
        ] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(200, 52)];
        _pushVoiceButton.backgroundColor = [UIColor colorWithPatternImage:backgroundImage];
        [_pushVoiceButton addTarget:self action:@selector(pushVoiceButtonAction) forControlEvents:UIControlEventTouchUpInside];
--- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h
+++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h
@@ -7,10 +7,14 @@

 #import <UIKit/UIKit.h>
 #import <MJRefresh/MJRefresh.h>
-@class FansInfoModel;
+@class UserInfoModel;

 NS_ASSUME_NONNULL_BEGIN

+@protocol MewRightFollowVoiceViewDelegate <NSObject>
+- (void)didSelectRightFollowVoiceUser:(UserInfoModel *)userInfo;
+@end
+
 typedef void(^follownRefresh)(void);
@interface MewRightFollowVoiceView : UIView

@@ -18,7 +22,7 @@ typedef void(^follownRefresh)(void);
@property (nonatomic, copy) follownRefresh loadFollownRefresh;
 /// 加载更多
@property (nonatomic, copy) follownRefresh moreFollownRefresh;
-@property (nonatomic, strong) NSArray<FansInfoModel *> *fansListModel;
+@property (nonatomic, strong) NSArray<UserInfoModel *> *fansListModel;

@property (nonatomic, strong, readonly) UICollectionView *followCollectionView;

--- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m
+++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m
@@ -14,6 +14,7 @@
 #import "YMMacro.h"
 #import "ThemeColor.h"
 #import "FansInfoModel.h"
+#import "UserInfoModel.h"
 #import "NSArray+Safe.h"

@interface MewRightFollowVoiceView() <UICollectionViewDelegate, UICollectionViewDataSource>
@@ -40,7 +41,7 @@
 }

 #pragma mark - Set
- (void)setFansListModel:(NSArray<FansInfoModel *> *)fansListModel {
+- (void)setFansListModel:(NSArray<UserInfoModel *> *)fansListModel {
    _fansListModel = fansListModel;
    [self.followCollectionView reloadData];
 }
@@ -52,7 +53,7 @@

 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
    MewRightFollowVoiceCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MewRightFollowVoiceCollectionCell class]) forIndexPath:indexPath];
-    FansInfoModel *model = [self.fansListModel safeObjectAtIndex1:indexPath.row];
+    UserInfoModel *model = [self.fansListModel safeObjectAtIndex1:indexPath.row];
    cell.avater = model.avatar;
    cell.nick = model.nick;
    cell.sex = model.gender;
@@ -60,6 +61,11 @@
 }


+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+    if () {
+        
+    }
+}


 #pragma mark - Init View