mojiahui/WebApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
QuFY
2025-08-20 09:08:28 +08:00
parent 59b42526b5
commit 7787b3ee30
28 changed files with 253 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ShenQi.xcodeproj/project.pbxproj
View File

@@ -649,7 +649,7 @@
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ShenQi/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = MENANG77;
INFOPLIST_KEY_CFBundleDisplayName = OKEGO;
INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片";
INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片";
INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友";
@@ -671,8 +671,8 @@
"$(inherited)",
"$(PROJECT_DIR)/ShenQi",
);
MARKETING_VERSION = 3.5;
PRODUCT_BUNDLE_IDENTIFIER = noti.MENANG77;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = noti.OKEGO;
PRODUCT_NAME = TESTAPP;
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -700,7 +700,7 @@
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ShenQi/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = MENANG77;
INFOPLIST_KEY_CFBundleDisplayName = OKEGO;
INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片";
INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片";
INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友";
@@ -722,8 +722,8 @@
"$(inherited)",
"$(PROJECT_DIR)/ShenQi",
);
MARKETING_VERSION = 3.5;
PRODUCT_BUNDLE_IDENTIFIER = noti.MENANG77;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = noti.OKEGO;
PRODUCT_NAME = TESTAPP;
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

2
ShenQi.xcodeproj/xcshareddata/xcschemes/ShenQi.xcscheme
View File

@@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

BIN
ShenQi.xcworkspace/xcuserdata/quuuu.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

6
ShenQi.xcworkspace/xcuserdata/quuuu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "8C3A038C-0CB6-445A-A27C-084577E8C5CA"
type = "0"
version = "2.0">
</Bucket>

2
ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "MENANG77.png",
"filename" : "微信图片_20250819133612_1137.jpg",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"

BIN
ShenQi/Assets.xcassets/AppIcon.appiconset/MENANG77.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 306 KiB

BIN
ShenQi/Assets.xcassets/AppIcon.appiconset/微信图片_20250819133612_1137.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 KiB

2
ShenQi/Assets.xcassets/appLogo.imageset/Contents.json vendored
View File

@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "MENANG77.png",
"filename" : "微信图片_20250819133612_1137.jpg",
"idiom" : "universal",
"scale" : "1x"
},

BIN
ShenQi/Assets.xcassets/appLogo.imageset/MENANG77.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 306 KiB

BIN
ShenQi/Assets.xcassets/appLogo.imageset/微信图片_20250819133612_1137.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 KiB

6
ShenQi/Assets.xcassets/icon/Contents.json Normal file
View File

@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

21
ShenQi/Assets.xcassets/icon/home2.imageset/Contents.json vendored Normal file
View File

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

BIN
ShenQi/Assets.xcassets/icon/home2.imageset/微信图片_20250618144512_1271.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

21
ShenQi/Assets.xcassets/icon/menu2.imageset/Contents.json vendored Normal file
View File

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

BIN
ShenQi/Assets.xcassets/icon/menu2.imageset/微信图片_20250618144518_1272.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 KiB

21
ShenQi/Assets.xcassets/icon/missav2.imageset/Contents.json vendored Normal file
View File

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

BIN
ShenQi/Assets.xcassets/icon/missav2.imageset/微信图片_20250618144501_1269.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 85 KiB

21
ShenQi/Assets.xcassets/icon/noti2.imageset/Contents.json vendored Normal file
View File

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

BIN
ShenQi/Assets.xcassets/icon/noti2.imageset/微信图片_20250618144523_1273.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

21
ShenQi/Assets.xcassets/icon/refresh2.imageset/Contents.json vendored Normal file
View File

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

BIN
ShenQi/Assets.xcassets/icon/refresh2.imageset/微信图片_20250618144508_1270.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 KiB

4
ShenQi/Base.lproj/LaunchScreen.storyboard
View File

@@ -18,7 +18,7 @@
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="appLogo" translatesAutoresizingMaskIntoConstraints="NO" id="wWz-RR-gyr">
<rect key="frame" x="96.666666666666686" y="298.66666666666669" width="200" height="200"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="wWz-RR-gyr" secondAttribute="height" multiplier="1:1" id="N0J-q8-ZKK"/>
<constraint firstAttribute="width" constant="200" id="gfW-ba-a5X"/>
@@ -26,7 +26,7 @@
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<color key="backgroundColor" red="0.074509806930000005" green="0.15686275059999999" blue="0.55294120309999995" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstItem="wWz-RR-gyr" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" constant="-40" id="CqV-4e-F3I"/>
<constraint firstItem="wWz-RR-gyr" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="FHK-Fd-BPL"/>

6
ShenQi/Base.lproj/Main.storyboard
View File

@@ -106,7 +106,7 @@
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="appLogo" translatesAutoresizingMaskIntoConstraints="NO" id="keb-Jy-qyA">
<rect key="frame" x="96.666666666666686" y="298.66666666666669" width="200" height="200"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="B9b-Wy-kPu"/>
<constraint firstAttribute="width" secondItem="keb-Jy-qyA" secondAttribute="height" multiplier="1:1" id="vOa-Vr-1Dx"/>
@@ -114,7 +114,7 @@
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="cX4-SA-T7x"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<color key="backgroundColor" red="0.078431375319999996" green="0.15294116739999999" blue="0.55294120309999995" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstItem="keb-Jy-qyA" firstAttribute="centerX" secondItem="cX4-SA-T7x" secondAttribute="centerX" id="PJ3-c1-DbO"/>
<constraint firstItem="keb-Jy-qyA" firstAttribute="centerY" secondItem="cX4-SA-T7x" secondAttribute="centerY" constant="-40" id="S3L-dn-yjZ"/>
@@ -123,7 +123,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="mic-Ts-gXt" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-666" y="4"/>
<point key="canvasLocation" x="-666.41221374045801" y="3.5211267605633805"/>
</scene>
</scenes>
<resources>

12
ShenQi/GoogleService-Info.plist
View File

@@ -3,17 +3,17 @@
<plist version="1.0">
<dict>
<key>API_KEY</key>
<string>AIzaSyCuzddNSARpVhzTZUYZHDm_DzAnmDy9Yeg</string>
<string>AIzaSyBzxoVTlQF1Q7XEFqWAiS9dIFEZkcFk-o0</string>
<key>GCM_SENDER_ID</key>
<string>940761404240</string>
<string>989163327252</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>noti.MENANG77</string>
<string>noti.OKEGO</string>
<key>PROJECT_ID</key>
<string>menang77-bceef</string>
<string>okego-a50f6</string>
<key>STORAGE_BUCKET</key>
<string>menang77-bceef.firebasestorage.app</string>
<string>okego-a50f6.firebasestorage.app</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
@@ -25,6 +25,6 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:940761404240:ios:29c688b5f1ddcd69f7d255</string>
<string>1:989163327252:ios:f5e39cecd23cd49a567c01</string>
</dict>
</plist>

33
ShenQi/MacroDefine.h
View File

@@ -33,6 +33,7 @@
#define TESTUserID @"2"
// 新
#define AUD2UUserID @"24"
#define PPN88UserID @"56"
#define MK88AUSUserID @"57"
#define BODA8AUUserID @"58"
@@ -133,6 +134,35 @@
#define BigBonusUserID @"154"
#define SGPLAY77UserID @"155"
#define JayaKaya99UserID @"156"
#define JDCLUB9VIPUserID @"158"
#define SANDS33HKUserID @"159"
#define TEALIVE88UserID @"161"
#define BandarJudi33UserID @"162"
#define SonicAUUserID @"164"
#define FlashAUUserID @"165"
#define NovaAUUserID @"166"
#define SprintAUUserID @"167"
#define SwiftAUUserID @"168"
#define SPIN44UserID @"169"
#define CPX88UserID @"170"
#define ONLY1AUUserID @"171"
#define SEMANGAT33UserID @"172"
#define S9ASIAUserID @"173"
#define BANTUAN88UserID @"174"
#define SUREBETUserID @"175"
#define RTF88UserID @"176"
#define PENANG55UserID @"177"
#define BET123UserID @"178"
#define OKEBOSUserID @"179"
#define HOH99UserID @"180"
#define JCPOT868UserID @"181"
#define AFB88UserID @"182"
#define Freecuci365UserID @"183"
#define EASYCUCIUserID @"184"
#define POKIES93UserID @"185"
#define AUKING777UserID @"186"
#define PXP99auUserID @"187"
#define OKEGOUserID @"188"
@@ -179,6 +209,7 @@
#define Play33UserID @"75"
#define Boss96UserID @"76"
@@ -194,7 +225,7 @@
#define SCREEN_WIDTH [UIScreen mainScreen].bounds.size.width
#define SCREEN_HEIGHT [UIScreen mainScreen].bounds.size.height
#define NowUserId MENANG77UserID
#define NowUserId OKEGOUserID
#endif /* MacroDefine_h */

79
ShenQi/MainOldViewController.m
View File

@@ -31,6 +31,7 @@
@property (weak, nonatomic) IBOutlet DSWebDragView *webDragView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *dragHeightConstarint;
@property (weak, nonatomic) IBOutlet DSWebMenuCollectionView *webMenuCollectionView;
@property (nonatomic, strong) UIView *subBgView;
@end
@@ -62,6 +63,11 @@
_webView.navigationDelegate = self;
[self.view addSubview:_webView];
self.subBgView = [[UIView alloc] initWithFrame:self.view.frame];
self.subBgView.backgroundColor = [UIColor whiteColor];
self.subBgView.hidden = YES;
[self.view addSubview:self.subBgView];
NSMutableArray *menuArray = @[].mutableCopy;
AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
NSInteger height = 0 ;
@@ -73,23 +79,32 @@
height = height + 60;
LinkConfig *config = [[LinkConfig alloc] init];
config.isGoBack = YES;
config.icon = @"";
config.name = @"HOME";
config.icon = @"home2";
config.name = @"HOME2";
config.linkUrl = appDelegate.mainURLString;
[menuArray addObject:config];
// height = height + 70;
//
// LinkConfig *config2 = [[LinkConfig alloc] init];
// config2.isGoBack = NO;
// config2.icon = @"missav2";
// config2.name = @"missav2";
// config2.linkUrl = @"https://zh.xhamster.com";
// [menuArray addObject:config2];
// 菜单
// if (!ISNULLSTR(appDelegate.data.linkConfig)) {
// NSError *jsonError;
// id linkConfigResponse = [NSJSONSerialization JSONObjectWithData:[appDelegate.data.linkConfig dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:&jsonError];
// if (jsonError==nil && [linkConfigResponse isKindOfClass:[NSArray class]]) {
// NSArray *linkConfigArray = linkConfigResponse;
// height = height + linkConfigArray.count*70;
// for (NSDictionary *dic in linkConfigArray) {
// LinkConfig *linkModel = [LinkConfig modelWithDictionary:dic];
// [menuArray addObject:linkModel];
// }
// }
// }
if (!ISNULLSTR(appDelegate.data.linkConfig)) {
NSError *jsonError;
id linkConfigResponse = [NSJSONSerialization JSONObjectWithData:[appDelegate.data.linkConfig dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:&jsonError];
if (jsonError==nil && [linkConfigResponse isKindOfClass:[NSArray class]]) {
NSArray *linkConfigArray = linkConfigResponse;
height = height + linkConfigArray.count*70;
for (NSDictionary *dic in linkConfigArray) {
LinkConfig *linkModel = [LinkConfig modelWithDictionary:dic];
[menuArray addObject:linkModel];
}
}
}
// 客服平台
if (!ISNULLSTR(appDelegate.data.fbUrl)) {
height = height + 70;
@@ -163,11 +178,23 @@
self.mainURLString = link.linkUrl;
self.isPresent = NO;
[self intoMainWebView];
self.subBgView.hidden = YES;
NSArray *dataArr = [self.subBgView subviews];
for (UIView *subView in dataArr) {
[subView removeFromSuperview];
}
}
}else{
self.mainURLString = link.linkUrl;
self.isPresent = NO;
[self intoMainWebView];
self.subBgView.hidden = YES;
NSArray *dataArr = [self.subBgView subviews];
for (UIView *subView in dataArr) {
[subView removeFromSuperview];
}
}
}else if ([webMenuType isKindOfClass:[NSNumber class]]) {
NSNumber *number = webMenuType;
@@ -178,6 +205,12 @@
}else if (menuType == DSWebMenuRefreshType) {
self.isPresent = NO;
[self intoMainWebView];
self.subBgView.hidden = YES;
NSArray *dataArr = [self.subBgView subviews];
for (UIView *subView in dataArr) {
[subView removeFromSuperview];
}
}else if (menuType == DSWebMenuWhatsAppType) {
if (!ISNULLSTR(appDelegate.data.wsUrl)) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",appDelegate.data.wsUrl]] options:@{UIApplicationOpenURLOptionUniversalLinksOnly:@NO} completionHandler:^(BOOL success) {}];
@@ -219,13 +252,23 @@
decisionHandler(WKNavigationActionPolicyAllow);
}
- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
{
if (navigationAction.request.URL) {
- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures {
NSString *urlStr = navigationAction.request.URL.absoluteString;
if (urlStr.length == 0) {
self.subBgView.hidden = NO;
CGRect frame = self.view.bounds;
WKWebView *newWebView = [[WKWebView alloc] initWithFrame:frame configuration:configuration];
newWebView.UIDelegate = self;
newWebView.navigationDelegate = self;
[self.subBgView addSubview:newWebView];
return newWebView;
}else if (navigationAction.request.URL) {
UIStoryboard *sb = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
MainOldViewController *view = [sb instantiateViewControllerWithIdentifier:@"MainOldViewController"];
// MainOldViewController *view = [[MainOldViewController alloc] init];
view.gameURLString = navigationAction.request.URL.absoluteString;
view.gameURLString = urlStr;
view.isPresent = YES;
view.modalPresentationStyle = UIModalPresentationFullScreen;
[self presentViewController:view animated:YES completion:^{}];

4
ShenQi/WMDragView/DSWebDragView.m
View File

@@ -16,7 +16,7 @@
self.backgroundColor = [UIColor clearColor];
self.homeImageView = [[UIImageView alloc] initWithFrame:self.bounds];
self.homeImageView.image = [UIImage imageNamed:@"menu"];
self.homeImageView.image = [UIImage imageNamed:@"menu2"];
self.homeImageView.backgroundColor = [UIColor whiteColor];
self.homeImageView.layer.cornerRadius = 30.f;
self.homeImageView.layer.masksToBounds = YES;
@@ -31,7 +31,7 @@
self.backgroundColor = [UIColor clearColor];
self.homeImageView = [[UIImageView alloc] initWithFrame:self.bounds];
self.homeImageView.image = [UIImage imageNamed:@"menu"];
self.homeImageView.image = [UIImage imageNamed:@"menu2"];
self.homeImageView.backgroundColor = [UIColor whiteColor];
self.homeImageView.layer.cornerRadius = 30.f;
self.homeImageView.layer.masksToBounds = YES;

41
ShenQi/WMDragView/DSWebMenuCollectionView.m
View File

@@ -81,25 +81,26 @@ static NSString *identifier = @"AvatarCollectionViewCell";
if (ISNULLSTR(link.icon)) {
cell.avatarImageView.image = [self circularImageWithText:link.name];
}else{
NSURLSessionDataTask *dataTask = [[NSURLSession sharedSession] dataTaskWithURL:[NSURL URLWithString:link.icon] completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
if (error) {
NSLog(@"Error downloading image: %@", error);
} else {
dispatch_async(dispatch_get_main_queue(), ^{
UIImage *image = [UIImage imageWithData:data];
cell.avatarImageView.image = image;
});
}
}];
[dataTask resume];
cell.avatarImageView.image = [UIImage imageNamed:link.icon];
// NSURLSessionDataTask *dataTask = [[NSURLSession sharedSession] dataTaskWithURL:[NSURL URLWithString:link.icon] completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
// if (error) {
// NSLog(@"Error downloading image: %@", error);
// } else {
// dispatch_async(dispatch_get_main_queue(), ^{
// UIImage *image = [UIImage imageWithData:data];
// cell.avatarImageView.image = image;
// });
// }
// }];
// [dataTask resume];
}
}else if ([value isKindOfClass:[NSNumber class]]) {
NSNumber *number = value;
DSWebMenuType type = number.integerValue;
if (type == DSWebMenuHomeType) {
cell.avatarImageView.image = [UIImage imageNamed:@"menu"];
cell.avatarImageView.image = [UIImage imageNamed:@"menu2"];
}else if (type == DSWebMenuRefreshType) {
cell.avatarImageView.image = [UIImage imageNamed:@"refresh"];
cell.avatarImageView.image = [UIImage imageNamed:@"refresh2"];
}else if (type == DSWebMenuTelegramType) {
cell.avatarImageView.image = [UIImage imageNamed:@"telegram"];
}else if (type == DSWebMenuWhatsAppType) {
@@ -107,10 +108,10 @@ static NSString *identifier = @"AvatarCollectionViewCell";
}else if (type == DSWebMenuFacebookType) {
cell.avatarImageView.image = [UIImage imageNamed:@"facebook"];
}else if (type == DSWebMenuNotiType) {
cell.avatarImageView.image = [UIImage imageNamed:@"noti"];
cell.imgWidth.constant = 40;
cell.avatarImageView.layer.cornerRadius = 20.f;
cell.avatarImageView.layer.masksToBounds = YES;
cell.avatarImageView.image = [UIImage imageNamed:@"noti2"];
// cell.imgWidth.constant = 40;
// cell.avatarImageView.layer.cornerRadius = 20.f;
// cell.avatarImageView.layer.masksToBounds = YES;
}
}
cell.avatarImageView.contentMode = UIViewContentModeScaleAspectFit;
@@ -127,7 +128,7 @@ static NSString *identifier = @"AvatarCollectionViewCell";
- (UIImage *)circularImageWithText:(NSString *)text {
// 设置字体和大小
UIFont *font = [UIFont systemFontOfSize:16.0f];
UIFont *font = [UIFont boldSystemFontOfSize:15.0f];
CGSize textSize = [text sizeWithFont:font];
// 创建图形上下文
@@ -141,11 +142,11 @@ static NSString *identifier = @"AvatarCollectionViewCell";
CGContextClip(context);
// 设置背景颜色（可选）
CGContextSetRGBFillColor(context, 1.0, 1.0, 1.0, 1.0); // 白色背景
CGContextSetRGBFillColor(context, 228.0/255.0, 171.0/255.0, 95.0/255.0, 1.0); // 白色背景
CGContextFillRect(context, rect);
// 设置文本颜色
[[UIColor redColor] set];
[[UIColor blackColor] set];
// 计算文本绘制位置，使其居中
CGFloat x = (size - textSize.width) / 2.0f;