This commit is contained in:
Yao
2024-12-25 09:41:16 +08:00
parent 654d456c7d
commit 33a7b58a49
33 changed files with 274 additions and 214 deletions

View File

@@ -11,7 +11,7 @@
207022AF2CD8C1C10061657B /* MainOldViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 207022AE2CD8C1C10061657B /* MainOldViewController.m */; };
20848E1C2ACFEB30007ED869 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20848E1B2ACFEB30007ED869 /* SafariServices.framework */; };
2087138D2CB4FE9B00CE4E72 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2087138C2CB4FE9B00CE4E72 /* WebKit.framework */; };
20A0A84A2CE6EF7000667C5F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 20A0A8492CE6EF7000667C5F /* GoogleService-Info.plist */; };
209718A82D16997E00529419 /* LinkConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 209718A72D16997E00529419 /* LinkConfig.m */; };
20B317F82CD4BA6800B29987 /* NSObject+YYModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 20B317F52CD4BA6700B29987 /* NSObject+YYModel.m */; };
20B317F92CD4BA6800B29987 /* YYClassInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 20B317F62CD4BA6700B29987 /* YYClassInfo.m */; };
20B61C7D29DC008500CE7946 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 20B61C7C29DC008500CE7946 /* AppDelegate.m */; };
@@ -28,6 +28,7 @@
20CC02D32D150A1C0001B529 /* DSAvatarCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 20CC02D12D150A1C0001B529 /* DSAvatarCollectionViewCell.xib */; };
20DA04E42CD32AEF003530CA /* DSWebDragView.m in Sources */ = {isa = PBXBuildFile; fileRef = 20DA04E02CD32AEF003530CA /* DSWebDragView.m */; };
20DA04E52CD32AEF003530CA /* WMDragView.m in Sources */ = {isa = PBXBuildFile; fileRef = 20DA04E12CD32AEF003530CA /* WMDragView.m */; };
20E0DB032D1AF33500E5DBA1 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 20E0DB022D1AF33500E5DBA1 /* GoogleService-Info.plist */; };
9D06CD612B70B72500A5CDF7 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D06CD602B70B72500A5CDF7 /* libc++.tbd */; };
9D06CD632B70B72E00A5CDF7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D06CD622B70B72E00A5CDF7 /* SystemConfiguration.framework */; };
9D06CD652B70B73B00A5CDF7 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D06CD642B70B73B00A5CDF7 /* libz.tbd */; };
@@ -74,12 +75,13 @@
20848DC92ACEB763007ED869 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
20848E1B2ACFEB30007ED869 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
2087138C2CB4FE9B00CE4E72 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
20A0A8492CE6EF7000667C5F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
209718A62D16997E00529419 /* LinkConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LinkConfig.h; sourceTree = "<group>"; };
209718A72D16997E00529419 /* LinkConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LinkConfig.m; sourceTree = "<group>"; };
20B317F42CD4BA6700B29987 /* YYClassInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYClassInfo.h; sourceTree = "<group>"; };
20B317F52CD4BA6700B29987 /* NSObject+YYModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+YYModel.m"; sourceTree = "<group>"; };
20B317F62CD4BA6700B29987 /* YYClassInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYClassInfo.m; sourceTree = "<group>"; };
20B317F72CD4BA6700B29987 /* NSObject+YYModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+YYModel.h"; sourceTree = "<group>"; };
20B61C7829DC008500CE7946 /* PPN88.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PPN88.app; sourceTree = BUILT_PRODUCTS_DIR; };
20B61C7829DC008500CE7946 /* Candy916.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Candy916.app; sourceTree = BUILT_PRODUCTS_DIR; };
20B61C7B29DC008500CE7946 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
20B61C7C29DC008500CE7946 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
20B61C8529DC008500CE7946 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -104,6 +106,7 @@
20DA04E12CD32AEF003530CA /* WMDragView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WMDragView.m; sourceTree = "<group>"; };
20DA04E22CD32AEF003530CA /* DSWebDragView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSWebDragView.h; sourceTree = "<group>"; };
20DA04E32CD32AEF003530CA /* WMDragView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMDragView.h; sourceTree = "<group>"; };
20E0DB022D1AF33500E5DBA1 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
2770952325ADBC033AEA844E /* Pods_SQNoti.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SQNoti.framework; sourceTree = BUILT_PRODUCTS_DIR; };
30D1D837206E6AC5F27F4CB4 /* Pods-ShenQi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShenQi.release.xcconfig"; path = "Target Support Files/Pods-ShenQi/Pods-ShenQi.release.xcconfig"; sourceTree = "<group>"; };
9D06CD602B70B72500A5CDF7 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
@@ -167,6 +170,8 @@
20CC02C32D1418370001B529 /* ConfigData.m */,
20CC02C12D1418320001B529 /* ConfigDataModel.h */,
20CC02C22D1418340001B529 /* ConfigDataModel.m */,
209718A62D16997E00529419 /* LinkConfig.h */,
209718A72D16997E00529419 /* LinkConfig.m */,
);
path = YYModel;
sourceTree = "<group>";
@@ -184,7 +189,7 @@
20B61C7929DC008500CE7946 /* Products */ = {
isa = PBXGroup;
children = (
20B61C7829DC008500CE7946 /* PPN88.app */,
20B61C7829DC008500CE7946 /* Candy916.app */,
);
name = Products;
sourceTree = "<group>";
@@ -202,7 +207,7 @@
20CC02C92D141B650001B529 /* LaunchViewController.xib */,
207022AD2CD8C1C10061657B /* MainOldViewController.h */,
207022AE2CD8C1C10061657B /* MainOldViewController.m */,
20A0A8492CE6EF7000667C5F /* GoogleService-Info.plist */,
20E0DB022D1AF33500E5DBA1 /* GoogleService-Info.plist */,
20B317F32CD4BA6700B29987 /* YYModel */,
20DA04DF2CD32AEF003530CA /* WMDragView */,
207022A72CD8B2B50061657B /* Localizable.strings */,
@@ -262,7 +267,7 @@
);
name = ShenQi;
productName = ShenQi;
productReference = 20B61C7829DC008500CE7946 /* PPN88.app */;
productReference = 20B61C7829DC008500CE7946 /* Candy916.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -307,13 +312,13 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
20A0A84A2CE6EF7000667C5F /* GoogleService-Info.plist in Resources */,
207022A52CD8B2B50061657B /* Localizable.strings in Resources */,
20B61C8B29DC008800CE7946 /* LaunchScreen.storyboard in Resources */,
20CC02CB2D141B650001B529 /* LaunchViewController.xib in Resources */,
20B61C8829DC008800CE7946 /* Assets.xcassets in Resources */,
20B61C8629DC008500CE7946 /* Main.storyboard in Resources */,
20CC02D32D150A1C0001B529 /* DSAvatarCollectionViewCell.xib in Resources */,
20E0DB032D1AF33500E5DBA1 /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -371,6 +376,7 @@
20DA04E52CD32AEF003530CA /* WMDragView.m in Sources */,
20B317F82CD4BA6800B29987 /* NSObject+YYModel.m in Sources */,
20CC02CA2D141B650001B529 /* LaunchViewController.m in Sources */,
209718A82D16997E00529419 /* LinkConfig.m in Sources */,
20B61C7D29DC008500CE7946 /* AppDelegate.m in Sources */,
207022AF2CD8C1C10061657B /* MainOldViewController.m in Sources */,
20CC02C52D14183A0001B529 /* ConfigDataModel.m in Sources */,
@@ -564,7 +570,7 @@
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片";
INFOPLIST_KEY_NSUserTrackingUsageDescription = "获取设备ID";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UIRequiresFullScreen = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
@@ -578,11 +584,11 @@
"$(inherited)",
"$(PROJECT_DIR)/ShenQi",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = noti.ppn88;
PRODUCT_NAME = PPN88;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = noti.candy916;
PRODUCT_NAME = Candy916;
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = PPN88_dev_111;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Candy916_Dev;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -617,7 +623,7 @@
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片";
INFOPLIST_KEY_NSUserTrackingUsageDescription = "获取设备ID";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UIRequiresFullScreen = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
@@ -631,11 +637,11 @@
"$(inherited)",
"$(PROJECT_DIR)/ShenQi",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = noti.ppn88;
PRODUCT_NAME = PPN88;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = noti.candy916;
PRODUCT_NAME = Candy916;
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = PPN88_adhoc_111;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Candy916_adhoc;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

View File

@@ -30,7 +30,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "20B61C7729DC008500CE7946"
BuildableName = "PPN88.app"
BuildableName = "Candy916.app"
BlueprintName = "ShenQi"
ReferencedContainer = "container:ShenQi.xcodeproj">
</BuildableReference>
@@ -61,7 +61,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "20B61C7729DC008500CE7946"
BuildableName = "PPN88.app"
BuildableName = "Candy916.app"
BlueprintName = "ShenQi"
ReferencedContainer = "container:ShenQi.xcodeproj">
</BuildableReference>
@@ -80,7 +80,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "20B61C7729DC008500CE7946"
BuildableName = "PPN88.app"
BuildableName = "Candy916.app"
BlueprintName = "ShenQi"
ReferencedContainer = "container:ShenQi.xcodeproj">
</BuildableReference>

View File

@@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "20B61C7729DC008500CE7946"
BuildableName = "PPN88.app"
BuildableName = "Candy916.app"
BlueprintName = "ShenQi"
ReferencedContainer = "container:ShenQi.xcodeproj">
</BuildableReference>
@@ -45,7 +45,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "20B61C7729DC008500CE7946"
BuildableName = "PPN88.app"
BuildableName = "Candy916.app"
BlueprintName = "ShenQi"
ReferencedContainer = "container:ShenQi.xcodeproj">
</BuildableReference>
@@ -62,7 +62,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "20B61C7729DC008500CE7946"
BuildableName = "PPN88.app"
BuildableName = "Candy916.app"
BlueprintName = "ShenQi"
ReferencedContainer = "container:ShenQi.xcodeproj">
</BuildableReference>

View File

@@ -16,53 +16,5 @@
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "DC4C90D3-20F8-455B-B704-0CCCB45EAD14"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ShenQi/MainOldViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "180"
endingLineNumber = "180"
landmarkName = "-intoMainWebView"
landmarkType = "7">
<Locations>
<Location
uuid = "DC4C90D3-20F8-455B-B704-0CCCB45EAD14 - 1d751ba393f4c154"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[MainOldViewController intoMainWebView]"
moduleName = "Candy916"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/yao/Desktop/Gitee/ShenQi/ShenQi/MainOldViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "180"
endingLineNumber = "180"
offsetFromSymbolStart = "220">
</Location>
<Location
uuid = "DC4C90D3-20F8-455B-B704-0CCCB45EAD14 - 1d751ba393f4c154"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[MainOldViewController intoMainWebView]"
moduleName = "Candy916"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/yao/Desktop/Gitee/ShenQi/ShenQi/MainOldViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "180"
endingLineNumber = "180"
offsetFromSymbolStart = "236">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

View File

@@ -14,6 +14,7 @@
@property (nonatomic, strong) UIWindow *window;
@property (nonatomic, strong) ConfigData *data;
@property (nonatomic, strong) NSString *mainURLString;
@property (nonatomic, assign) BOOL isRefresh;
@property (nonatomic, assign) BOOL forceUpdate;

View File

@@ -62,7 +62,7 @@
request.HTTPMethod = @"PUT";
[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
NSDictionary *parmas = @{@"userId":[NSNumber numberWithInteger:[PPN88UserID integerValue]]};
NSDictionary *parmas = @{@"userId":[NSNumber numberWithInteger:[Candy916UserID integerValue]]};
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:parmas options:NSJSONWritingPrettyPrinted error:nil];
request.HTTPBody = jsonData;
@@ -475,4 +475,9 @@
[tap.view removeFromSuperview];
}
+ (BOOL)allowsAnyHTTPSCertificateForHost:(NSString *)host
{
return YES;
}
@end

View File

@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "PPN88.png",
"filename" : "candy916.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 KiB

View File

@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "PPN88.png",
"filename" : "refresh.png",
"idiom" : "universal",
"scale" : "1x"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 893 B

View File

@@ -16,7 +16,7 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="PPN88" translatesAutoresizingMaskIntoConstraints="NO" id="wWz-RR-gyr">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="candy916" 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"/>
<constraints>
@@ -26,7 +26,7 @@
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" red="0.98781532049999998" green="1" blue="0.99589437250000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<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"/>
@@ -39,6 +39,6 @@
</scene>
</scenes>
<resources>
<image name="PPN88" width="1024" height="1024"/>
<image name="candy916" width="1024" height="1024"/>
</resources>
</document>

View File

@@ -55,19 +55,8 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aS0-9b-Vdi">
<rect key="frame" x="150.66666666666666" y="399" width="92" height="54.333333333333314"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="tinted" image="shuaxin" imagePlacement="top" title="进入App"/>
<connections>
<action selector="intoGameAction:" destination="IMS-fv-0OO" eventType="touchUpInside" id="eFh-NV-HoP"/>
</connections>
</button>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="kot-ab-erv">
<rect key="frame" x="186.66666666666666" y="416" width="20" height="20"/>
</activityIndicatorView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jWy-uW-8Li" customClass="DSWebDragView">
<rect key="frame" x="0.0" y="271.66666666666669" width="60" height="60"/>
<rect key="frame" x="0.0" y="408.66666666666669" width="60" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="XG1-uZ-BDG"/>
<constraint firstAttribute="width" secondItem="jWy-uW-8Li" secondAttribute="height" multiplier="1:1" id="yzH-EX-jDa"/>
@@ -92,19 +81,13 @@
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="rsS-Qz-Fg1" firstAttribute="leading" secondItem="fdh-Xv-lcd" secondAttribute="leading" id="1K4-aF-xwO"/>
<constraint firstItem="aS0-9b-Vdi" firstAttribute="centerX" secondItem="Ys6-Sp-lCM" secondAttribute="centerX" id="3Ao-jF-5Bi"/>
<constraint firstItem="jWy-uW-8Li" firstAttribute="leading" secondItem="fdh-Xv-lcd" secondAttribute="leading" id="7jf-ye-5u6"/>
<constraint firstItem="jWy-uW-8Li" firstAttribute="top" secondItem="rsS-Qz-Fg1" secondAttribute="top" id="F8B-Ta-ciW"/>
<constraint firstItem="kot-ab-erv" firstAttribute="centerX" secondItem="Ys6-Sp-lCM" secondAttribute="centerX" id="LLF-YW-byF"/>
<constraint firstItem="kot-ab-erv" firstAttribute="centerY" secondItem="Ys6-Sp-lCM" secondAttribute="centerY" id="UA8-zb-doC"/>
<constraint firstItem="aS0-9b-Vdi" firstAttribute="centerY" secondItem="Ys6-Sp-lCM" secondAttribute="centerY" id="liw-9n-E6B"/>
<constraint firstItem="jWy-uW-8Li" firstAttribute="centerY" secondItem="fdh-Xv-lcd" secondAttribute="centerY" id="DF4-2k-YMl"/>
<constraint firstItem="rsS-Qz-Fg1" firstAttribute="centerY" secondItem="fdh-Xv-lcd" secondAttribute="centerY" id="uWh-Hp-osv"/>
</constraints>
</view>
<connections>
<outlet property="activityIndicatorView" destination="kot-ab-erv" id="gVC-7r-fWS"/>
<outlet property="dragHeightConstarint" destination="seP-m5-Lwg" id="BoP-gD-lsf"/>
<outlet property="goIntoBtn" destination="aS0-9b-Vdi" id="Hkf-ju-EdR"/>
<outlet property="webDragView" destination="jWy-uW-8Li" id="rgh-nZ-KOF"/>
<outlet property="webMenuCollectionView" destination="rsS-Qz-Fg1" id="hfI-CF-2EW"/>
</connections>

View File

@@ -3,17 +3,17 @@
<plist version="1.0">
<dict>
<key>API_KEY</key>
<string>AIzaSyATIvwH62L_K49UnQcJu4ERb1oqKlvGN-0</string>
<string>AIzaSyBvk4Z-g3A9EFyDLcnEroMb_KRuY75_R0U</string>
<key>GCM_SENDER_ID</key>
<string>490341212727</string>
<string>781378266710</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>noti.ppn88</string>
<string>noti.candy916</string>
<key>PROJECT_ID</key>
<string>ppn88-595cd</string>
<string>candy916-c855f</string>
<key>STORAGE_BUCKET</key>
<string>ppn88-595cd.firebasestorage.app</string>
<string>candy916-c855f.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:490341212727:ios:7dc81d9987cfa241cbd5b2</string>
<string>1:781378266710:ios:1dfe279a0d158766f37df7</string>
</dict>
</plist>

View File

@@ -29,7 +29,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.mainUserId = PPN88UserID;
self.mainUserId = Candy916UserID;
[self setupGameURLData];
}
@@ -40,6 +40,7 @@
MainOldViewController *webViewController = [sb instantiateViewControllerWithIdentifier:@"MainOldViewController"];
webViewController.mainURLString = self.mainURLString;
AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
appDelegate.mainURLString = self.mainURLString;
appDelegate.window.rootViewController = webViewController;
}

View File

@@ -15,9 +15,9 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="PPN88" translatesAutoresizingMaskIntoConstraints="NO" id="QOC-Bf-3uG">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="candy916" translatesAutoresizingMaskIntoConstraints="NO" id="QOC-Bf-3uG">
<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="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="QOC-Bf-3uG" secondAttribute="height" multiplier="1:1" id="0UD-2r-nCA"/>
<constraint firstAttribute="width" constant="200" id="lvc-UM-fk2"/>
@@ -25,7 +25,7 @@
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="2Pa-gD-wwk"/>
<color key="backgroundColor" red="0.98781532049999998" green="1" blue="0.99589437250000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="QOC-Bf-3uG" firstAttribute="centerY" secondItem="2Pa-gD-wwk" secondAttribute="centerY" constant="-40" id="B0z-KI-StH"/>
<constraint firstItem="QOC-Bf-3uG" firstAttribute="centerX" secondItem="2Pa-gD-wwk" secondAttribute="centerX" id="lff-ob-mX3"/>
@@ -35,6 +35,6 @@
</viewController>
</objects>
<resources>
<image name="PPN88" width="1024" height="1024"/>
<image name="candy916" width="1024" height="1024"/>
</resources>
</document>

View File

@@ -55,8 +55,34 @@
#define RichpapaUserID @"81"
#define Pms99UserID @"82"
#define Nos138UserID @"83"
#define Candy916UserID @"84"
#define Petro777UserID @"85"
#define Tinju55UserID @"85"
#define KELABUserID @"86"
#define BBJUserID @"87"
#define AGN888UserID @"37"
#define CashSweepUserID @"88"
#define GDSlot888UserID @"89"
#define JackpotAUUserID @"90"
#define JESlot88UserID @"91"
#define JUDY88UserID @"92"
#define KejapjudiUserID @"93"
#define Magnum888UserID @"94"
#define MAHKOTA8UserID @"95"
#define MKO888UserID @"96"
#define Petron777UserID @"97"
#define PETRONAS777UserID @"98"
#define SHELL777UserID @"99"
#define Telur33UserID @"100"
#define Toto88UserID @"101"
#define TTSlot888UserID @"102"
#define LEGAPGUserID @"103"
#define LGH828UserID @"104"
#define POP99AUserID @"105"
#define Royal55UserID @"106"
#define MR88UserID @"107"
// 旧
#define WinwayUserID @"4"
@@ -82,7 +108,6 @@
#define BigWinner8UserID @"34"
#define HariSpinUserID @"35"
#define AudplayUserID @"36"
#define Agn888UserID @"37"
#define MillionKing96UserID @"38"
#define Judi2UUserID @"39"
#define Fachai8hkUserID @"41"

View File

@@ -19,18 +19,17 @@
#import "ConfigData.h"
#import "ConfigDataModel.h"
#import "LinkConfig.h"
@interface MainOldViewController () <WKUIDelegate,WKNavigationDelegate,DSWebMenuDelegate>
@property (strong, nonatomic) WKWebView *webView;
@property (nonatomic,strong) WKUserContentController *wkUController;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicatorView;
@property (weak, nonatomic) IBOutlet DSWebDragView *webDragView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *dragHeightConstarint;
@property (weak, nonatomic) IBOutlet DSWebMenuCollectionView *webMenuCollectionView;
@property (weak, nonatomic) IBOutlet UIButton *goIntoBtn;
@end
@implementation MainOldViewController
@@ -46,8 +45,8 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.mainUserId = PPN88UserID;
self.mainUserId = Candy916UserID;
WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init];
wkWebConfig.preferences.javaScriptCanOpenWindowsAutomatically = YES;
@@ -63,8 +62,31 @@
NSMutableArray *menuArray = @[].mutableCopy;
AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
//
NSInteger height = 60;
[menuArray addObject:[NSNumber numberWithInteger:DSWebMenuHomeType]];
//
height = height + 60;
LinkConfig *config = [[LinkConfig alloc] init];
config.isGoBack = YES;
config.icon = @"";
config.name = @"HOME";
config.linkUrl = appDelegate.mainURLString;
[menuArray addObject:config];
//
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*60;
for (NSDictionary *dic in linkConfigArray) {
LinkConfig *linkModel = [LinkConfig modelWithDictionary:dic];
[menuArray addObject:linkModel];
}
}
}
//
if (!ISNULLSTR(appDelegate.data.fbUrl)) {
height = height + 60;
[menuArray addObject:[NSNumber numberWithInteger:DSWebMenuFacebookType]];
@@ -77,9 +99,15 @@
height = height + 60;
[menuArray addObject:[NSNumber numberWithInteger:DSWebMenuWhatsAppType]];
}
//
height = height + 60;
[menuArray addObject:[NSNumber numberWithInteger:DSWebMenuRefreshType]];
self.webMenuCollectionView.shareArray = menuArray;
self.webMenuCollectionView.webMenuDelegate = self;
if (height > self.view.frame.size.height) {
height = self.view.frame.size.height;
}
self.dragHeightConstarint.constant = height;
self.webDragView.freeRect = CGRectMake(0, 128, self.view.frame.size.width, self.view.frame.size.height-128);
self.webDragView.isKeepBounds = YES;
@@ -127,7 +155,7 @@
}else{
[self intoMainWebView];
[self setupAddContactData];
// [self setupAddContactData];
//
NSUserDefaults *userfault = [NSUserDefaults standardUserDefaults];
@@ -137,32 +165,48 @@
}
}
[self.view bringSubviewToFront:self.webDragView];
[self.view bringSubviewToFront:self.webMenuCollectionView];
}
-(void)webMenuCollectionViewWithMenuType:(DSWebMenuType)webMenuType
-(void)webMenuCollectionViewWithMenuType:(id)webMenuType
{
AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
if (webMenuType == DSWebMenuHomeType) {
if (self.isPresent == YES) {
[self dismissViewControllerAnimated:YES completion:^{}];
if ([webMenuType isKindOfClass:[LinkConfig class]]) {
LinkConfig *link = webMenuType;
if (link.isGoBack == YES) {
if (self.isPresent == YES) {
[self dismissViewControllerAnimated:YES completion:^{}];
}else{
self.mainURLString = link.linkUrl;
self.isPresent = NO;
[self intoMainWebView];
}
}else{
self.mainURLString = link.linkUrl;
self.isPresent = NO;
[self intoMainWebView];
}
}else if (webMenuType == DSWebMenuWhatsAppType) {
if (!ISNULLSTR(appDelegate.data.wsUrl)) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://wa.me/message/%@",appDelegate.data.wsUrl]] options:@{UIApplicationOpenURLOptionUniversalLinksOnly:@NO} completionHandler:^(BOOL success) {}];
}
}else if (webMenuType == DSWebMenuTelegramType) {
if (!ISNULLSTR(appDelegate.data.tgUrl)) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://t.me/%@",appDelegate.data.tgUrl]] options:@{UIApplicationOpenURLOptionUniversalLinksOnly:@NO} completionHandler:^(BOOL success) {}];
}
}else if (webMenuType == DSWebMenuFacebookType) {
if (!ISNULLSTR(appDelegate.data.fbUrl)) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"fb://profile/%@",appDelegate.data.fbUrl]] options:@{UIApplicationOpenURLOptionUniversalLinksOnly:@NO} completionHandler:^(BOOL success) {}];
}else if ([webMenuType isKindOfClass:[NSNumber class]]) {
NSNumber *number = webMenuType;
DSWebMenuType menuType = number.integerValue;
AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
if (menuType == DSWebMenuHomeType) {
}else if (menuType == DSWebMenuRefreshType) {
self.isPresent = NO;
[self intoMainWebView];
}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) {}];
}
}else if (menuType == DSWebMenuTelegramType) {
if (!ISNULLSTR(appDelegate.data.tgUrl)) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",appDelegate.data.tgUrl]] options:@{UIApplicationOpenURLOptionUniversalLinksOnly:@NO} completionHandler:^(BOOL success) {}];
}
}else if (menuType == DSWebMenuFacebookType) {
if (!ISNULLSTR(appDelegate.data.fbUrl)) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",appDelegate.data.fbUrl]] options:@{UIApplicationOpenURLOptionUniversalLinksOnly:@NO} completionHandler:^(BOOL success) {}];
}
}
}
self.webDragView.hidden = NO;
@@ -191,7 +235,9 @@
- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
{
if (navigationAction.request.URL) {
MainOldViewController *view = [[MainOldViewController alloc] init];
UIStoryboard *sb = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
MainOldViewController *view = [sb instantiateViewControllerWithIdentifier:@"MainOldViewController"];
// MainOldViewController *view = [[MainOldViewController alloc] init];
view.gameURLString = navigationAction.request.URL.absoluteString;
view.isPresent = YES;
view.modalPresentationStyle = UIModalPresentationFullScreen;

View File

@@ -10,7 +10,9 @@
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
// self.avatarImageView.layer.cornerRadius = 25.f;
// self.avatarImageView.layer.masksToBounds = YES;
}
@end

View File

@@ -6,10 +6,14 @@
#import <UIKit/UIKit.h>
#import "LinkConfig.h"
#import "MacroDefine.h"
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSInteger, DSWebMenuType) {
DSWebMenuHomeType, // 主页
DSWebMenuHomeType, // 回到菜单
DSWebMenuRefreshType, // 刷新
DSWebMenuTelegramType, // Telegram
DSWebMenuWhatsAppType, // WhatsApp
DSWebMenuFacebookType, // Facebook
@@ -17,7 +21,7 @@ typedef NS_ENUM(NSInteger, DSWebMenuType) {
@protocol DSWebMenuDelegate <NSObject>
-(void)webMenuCollectionViewWithMenuType:(DSWebMenuType)webMenuType;
-(void)webMenuCollectionViewWithMenuType:(id)webMenuType;
@end

View File

@@ -75,16 +75,38 @@ static NSString *identifier = @"AvatarCollectionViewCell";
-(UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
DSAvatarCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:identifier forIndexPath:indexPath];
NSNumber *number = self.shareArray[indexPath.row];
DSWebMenuType type = number.integerValue;
if (type == DSWebMenuHomeType) {
cell.avatarImageView.image = [UIImage imageNamed:@"zhongxindakai"];
}else if (type == DSWebMenuTelegramType) {
cell.avatarImageView.image = [UIImage imageNamed:@"telegram"];
}else if (type == DSWebMenuWhatsAppType) {
cell.avatarImageView.image = [UIImage imageNamed:@"whatsapp"];
}else if (type == DSWebMenuFacebookType) {
cell.avatarImageView.image = [UIImage imageNamed:@"facebook"];
id value = self.shareArray[indexPath.row];
if ([value isKindOfClass:[LinkConfig class]]) {
LinkConfig *link = value;
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];
}
}else if ([value isKindOfClass:[NSNumber class]]) {
NSNumber *number = value;
DSWebMenuType type = number.integerValue;
if (type == DSWebMenuHomeType) {
cell.avatarImageView.image = [UIImage imageNamed:@"menu"];
}else if (type == DSWebMenuRefreshType) {
cell.avatarImageView.image = [UIImage imageNamed:@"refresh"];
}else if (type == DSWebMenuTelegramType) {
cell.avatarImageView.image = [UIImage imageNamed:@"telegram"];
}else if (type == DSWebMenuWhatsAppType) {
cell.avatarImageView.image = [UIImage imageNamed:@"whatsapp"];
}else if (type == DSWebMenuFacebookType) {
cell.avatarImageView.image = [UIImage imageNamed:@"facebook"];
}
}
cell.avatarImageView.contentMode = UIViewContentModeScaleAspectFit;
return cell;
@@ -92,11 +114,48 @@ static NSString *identifier = @"AvatarCollectionViewCell";
-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{
NSNumber *number = self.shareArray[indexPath.row];
DSWebMenuType type = number.integerValue;
id value = self.shareArray[indexPath.row];
if (self.webMenuDelegate && [self.webMenuDelegate respondsToSelector:@selector(webMenuCollectionViewWithMenuType:)]) {
[self.webMenuDelegate webMenuCollectionViewWithMenuType:type];
[self.webMenuDelegate webMenuCollectionViewWithMenuType:value];
}
}
- (UIImage *)circularImageWithText:(NSString *)text {
//
UIFont *font = [UIFont systemFontOfSize:16.0f];
CGSize textSize = [text sizeWithFont:font];
//
CGFloat size = 60.0f;
UIGraphicsBeginImageContextWithOptions(CGSizeMake(size, size), NO, 0.0);
CGContextRef context = UIGraphicsGetCurrentContext();
//
CGRect rect = CGRectMake(0, 0, size, size);
CGContextAddEllipseInRect(context, rect);
CGContextClip(context);
//
CGContextSetRGBFillColor(context, 1.0, 1.0, 1.0, 1.0); //
CGContextFillRect(context, rect);
//
[[UIColor redColor] set];
// 使
CGFloat x = (size - textSize.width) / 2.0f;
CGFloat y = (size - textSize.height) / 2.0f;
//
[text drawAtPoint:CGPointMake(x, y) withFont:font];
// UIImage
UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
//
UIGraphicsEndImageContext();
return image;
}
@end

View File

@@ -25,6 +25,7 @@
@property (nonatomic, strong) NSString *apkUrl;
@property (nonatomic, strong) NSString *downloadUrl;
@property (nonatomic, assign) NSInteger isUse;
@property (nonatomic, strong) NSString *linkConfig;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
- (instancetype)initWithDictionary:(NSDictionary *)dict;

View File

@@ -23,6 +23,7 @@ NSString *const kConfigDataWsUrl = @"wsUrl";
NSString *const kConfigDataApkUrl = @"apkUrl";
NSString *const kConfigDataDownloadUrl = @"downloadUrl";
NSString *const kConfigDataIsUse = @"isUse";
NSString *const kConfigDatalinkConfig = @"linkConfig";
@interface ConfigData ()
@@ -48,6 +49,7 @@ NSString *const kConfigDataIsUse = @"isUse";
@synthesize apkUrl = _apkUrl;
@synthesize downloadUrl = _downloadUrl;
@synthesize isUse = _isUse;
@synthesize linkConfig = _linkConfig;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict {
return [[self alloc] initWithDictionary:dict];
@@ -74,8 +76,7 @@ NSString *const kConfigDataIsUse = @"isUse";
self.apkUrl = [self objectOrNilForKey:kConfigDataApkUrl fromDictionary:dict];
self.downloadUrl = [self objectOrNilForKey:kConfigDataDownloadUrl fromDictionary:dict];
self.isUse = [[self objectOrNilForKey:kConfigDataIsUse fromDictionary:dict] intValue];
}
self.linkConfig = [self objectOrNilForKey:kConfigDatalinkConfig fromDictionary:dict]; }
return self;
}
@@ -96,6 +97,7 @@ NSString *const kConfigDataIsUse = @"isUse";
[mutableDict setValue:self.wsUrl forKey:kConfigDataWsUrl];
[mutableDict setValue:self.apkUrl forKey:kConfigDataApkUrl];
[mutableDict setValue:self.downloadUrl forKey:kConfigDataDownloadUrl];
[mutableDict setValue:self.linkConfig forKey:kConfigDataDownloadUrl];
[mutableDict setValue:[NSNumber numberWithInteger:self.isUse] forKey:kConfigDataIsUse];
return [NSDictionary dictionaryWithDictionary:mutableDict];
}
@@ -129,6 +131,7 @@ NSString *const kConfigDataIsUse = @"isUse";
self.wsUrl = [aDecoder decodeObjectForKey:kConfigDataWsUrl];
self.apkUrl = [aDecoder decodeObjectForKey:kConfigDataApkUrl];
self.downloadUrl = [aDecoder decodeObjectForKey:kConfigDataDownloadUrl];
self.linkConfig = [aDecoder decodeObjectForKey:kConfigDatalinkConfig];
self.isUse = [aDecoder decodeIntegerForKey:kConfigDataIsUse];
return self;
}
@@ -148,6 +151,7 @@ NSString *const kConfigDataIsUse = @"isUse";
[aCoder encodeInteger:_noticeApplyMode forKey:kConfigDataNoticeApplyMode];
[aCoder encodeObject:_wsUrl forKey:kConfigDataWsUrl];
[aCoder encodeObject:_apkUrl forKey:kConfigDataApkUrl];
[aCoder encodeObject:_linkConfig forKey:kConfigDatalinkConfig];
[aCoder encodeObject:_downloadUrl forKey:kConfigDataDownloadUrl];
[aCoder encodeInteger:_isUse forKey:kConfigDataIsUse];
}
@@ -169,6 +173,7 @@ NSString *const kConfigDataIsUse = @"isUse";
copy.noticeApplyMode = self.noticeApplyMode;
copy.wsUrl = [self.wsUrl copyWithZone:zone];
copy.apkUrl = [self.apkUrl copyWithZone:zone];
copy.linkConfig = [self.linkConfig copyWithZone:zone];
copy.downloadUrl = [self.downloadUrl copyWithZone:zone];
copy.isUse = self.isUse;
}

View File

@@ -0,0 +1,21 @@
//
// LinkConfig.h
// ShenQi
//
// Created by Yao on 2024/12/21.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface LinkConfig : NSObject
@property (nonatomic, assign) BOOL isGoBack;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *icon;
@property (nonatomic, strong) NSString *linkUrl;
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,12 @@
//
// LinkConfig.m
// ShenQi
//
// Created by Yao on 2024/12/21.
//
#import "LinkConfig.h"
@implementation LinkConfig
@end