Skip to content

S
SuperCleaner
Commit 2bdc4370 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

Merge branch 'lmj_branch'

parents cab7c5ab 34b6e83d
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 481 deletions
superCleaner.xcodeproj/project.pbxproj
View file @ 2bdc4370
......@@ -40,8 +40,6 @@
A94C0E0B24DA7044007F577D /* ICWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A94C0D1724DA7043007F577D /* ICWebViewController.m */; };
A94C0E0C24DA7044007F577D /* ICGuideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A94C0D1924DA7043007F577D /* ICGuideViewController.m */; };
A94C0E0D24DA7044007F577D /* ICGuideCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A94C0D1B24DA7043007F577D /* ICGuideCollectionViewCell.m */; };
A94C0E0E24DA7044007F577D /* ICGuideTypeTwoViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A94C0D1C24DA7043007F577D /* ICGuideTypeTwoViewCell.m */; };
A94C0E0F24DA7044007F577D /* ICGuideTypeTwoViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A94C0D1E24DA7043007F577D /* ICGuideTypeTwoViewCell.xib */; };
A94C0E1024DA7044007F577D /* ICNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = A94C0D2224DA7043007F577D /* ICNavigationController.m */; };
A94C0E1124DA7044007F577D /* ICDiskKit.m in Sources */ = {isa = PBXBuildFile; fileRef = A94C0D2524DA7043007F577D /* ICDiskKit.m */; };
A94C0E1224DA7044007F577D /* ICGetSimilarity.m in Sources */ = {isa = PBXBuildFile; fileRef = A94C0D2824DA7043007F577D /* ICGetSimilarity.m */; };
......@@ -209,10 +207,7 @@
A94C0D1824DA7043007F577D /* ICBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICBaseViewController.h; sourceTree = "<group>"; };
A94C0D1924DA7043007F577D /* ICGuideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICGuideViewController.m; sourceTree = "<group>"; };
A94C0D1B24DA7043007F577D /* ICGuideCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICGuideCollectionViewCell.m; sourceTree = "<group>"; };
A94C0D1C24DA7043007F577D /* ICGuideTypeTwoViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICGuideTypeTwoViewCell.m; sourceTree = "<group>"; };
A94C0D1D24DA7043007F577D /* ICGuideCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICGuideCollectionViewCell.h; sourceTree = "<group>"; };
A94C0D1E24DA7043007F577D /* ICGuideTypeTwoViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ICGuideTypeTwoViewCell.xib; sourceTree = "<group>"; };
A94C0D1F24DA7043007F577D /* ICGuideTypeTwoViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICGuideTypeTwoViewCell.h; sourceTree = "<group>"; };
A94C0D2024DA7043007F577D /* ICWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICWebViewController.h; sourceTree = "<group>"; };
A94C0D2224DA7043007F577D /* ICNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICNavigationController.m; sourceTree = "<group>"; };
A94C0D2424DA7043007F577D /* ZTUserInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZTUserInfoModel.h; sourceTree = "<group>"; };
......@@ -553,9 +548,6 @@
children = (
A94C0D1D24DA7043007F577D /* ICGuideCollectionViewCell.h */,
A94C0D1B24DA7043007F577D /* ICGuideCollectionViewCell.m */,
A94C0D1F24DA7043007F577D /* ICGuideTypeTwoViewCell.h */,
A94C0D1C24DA7043007F577D /* ICGuideTypeTwoViewCell.m */,
A94C0D1E24DA7043007F577D /* ICGuideTypeTwoViewCell.xib */,
);
path = Views;
sourceTree = "<group>";
......@@ -1067,7 +1059,6 @@
A94C0E2324DA7044007F577D /* BatteryCareUse.plist in Resources */,
A94C0E2D24DA7044007F577D /* BatteryCareUseBackgroundRefresh.plist in Resources */,
A94C0E3924DA7044007F577D /* ICBatteryCareListViewCell.xib in Resources */,
A94C0E0F24DA7044007F577D /* ICGuideTypeTwoViewCell.xib in Resources */,
A94C0E3A24DA7044007F577D /* ICCalendarEventViewCell.xib in Resources */,
A94C0E7524DA7044007F577D /* ICContactsListCell.xib in Resources */,
A94C0E2524DA7044007F577D /* BatteryCareUseWifi.plist in Resources */,
......@@ -1196,7 +1187,6 @@
A94C0E3824DA7044007F577D /* ICDbDashboardView.swift in Sources */,
A94C0E4024DA7044007F577D /* WKClearPhotoViewController.m in Sources */,
A94C0E4524DA7044007F577D /* ICPhotoViewerController.m in Sources */,
A94C0E0E24DA7044007F577D /* ICGuideTypeTwoViewCell.m in Sources */,
A94C0E7124DA7044007F577D /* ICContactIncompleteController.m in Sources */,
A94C0E3524DA7044007F577D /* ICCalendarEventViewCell.m in Sources */,
A94C0E1B24DA7044007F577D /* ZTUserInfoModel.m in Sources */,
......
superCleaner/Assets.xcassets/Guide/guide_image_01.imageset/Contents.json
View file @ 2bdc4370
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "guide_image_01@2x.png",
"filename" : "s@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_image_01@3x.png",
"filename" : "s@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
superCleaner/Assets.xcassets/Guide/guide_image_02.imageset/Contents.json
View file @ 2bdc4370
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "guide_image_02@2x.png",
"filename" : "苹果6.7.8-引导页2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_image_02@3x.png",
"filename" : "苹果6.7.8-引导页2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
superCleaner/Assets.xcassets/Guide/guide_image_03.imageset/Contents.json
View file @ 2bdc4370
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "guide_image_03@2x.png",
"filename" : "苹果6.7.8-引导页-3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_image_03@3x.png",
"filename" : "苹果6.7.8-引导页-3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
superCleaner/Assets.xcassets/Guide/guide_image_x_01.imageset/Contents.json
View file @ 2bdc4370
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "guide_image_x_01@2x.png",
"filename" : "super苹果引导11-1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_image_x_01@3x.png",
"filename" : "super苹果引导11-1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
superCleaner/Assets.xcassets/Guide/guide_image_x_02.imageset/Contents.json
View file @ 2bdc4370
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "guide_image_x_02@2x.png",
"filename" : "ss@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_image_x_02@3x.png",
"filename" : "ss@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
superCleaner/Assets.xcassets/Guide/guide_image_x_03.imageset/Contents.json
View file @ 2bdc4370
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "guide_image_x_03@2x.png",
"filename" : "super苹果引导11-3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_image_x_03@3x.png",
"filename" : "super苹果引导11-3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
superCleaner/Assets.xcassets/New Guide/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_bg_gradual_icon.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_bg_gradual_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_bg_gradual_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_bg_icon.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_bg_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_bg_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_button_bg_icon.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_button_bg_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_button_bg_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_gradual_bg_section_1.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_gradual_bg_section_1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_gradual_bg_section_1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_iphone_icon_1.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_iphone_icon_1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_iphone_icon_1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_iphone_icon_2.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_iphone_icon_2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_iphone_icon_2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_iphone_icon_ch_1.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_iphone_icon_ch_1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_iphone_icon_ch_1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_iphone_icon_en_2.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_iphone_icon_en_2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_iphone_icon_en_2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Assets.xcassets/New Guide/guide_section_1_icon.imageset/Contents.json deleted 100644 → 0
View file @ cab7c5ab
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "guide_section_1_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "guide_section_1_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
superCleaner/Base.lproj/Main.storyboard
View file @ 2bdc4370
......@@ -591,82 +591,20 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="834"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guide_gradual_bg_section_1" translatesAutoresizingMaskIntoConstraints="NO" id="p6b-YW-dyG">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="p6b-YW-dyG">
<rect key="frame" x="0.0" y="0.0" width="414" height="834"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LsO-vc-EoA">
<rect key="frame" x="0.0" y="0.0" width="414" height="500"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guide_section_1_icon" translatesAutoresizingMaskIntoConstraints="NO" id="g6Z-Xt-0Ga">
<rect key="frame" x="0.0" y="0.0" width="394" height="478"/>
<constraints>
<constraint firstAttribute="width" secondItem="g6Z-Xt-0Ga" secondAttribute="height" multiplier="361:438" id="Xs7-z3-CDY"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u4Z-xP-eAE">
<rect key="frame" x="18" y="60" width="238.5" height="76.5"/>
<string key="text">Welcome to
Super Cleaner！</string>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="32"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ekx-G4-eb6">
<rect key="frame" x="18" y="154.5" width="336" height="150.5"/>
<string key="text">Your privacy is our concern. We intend to provide transparency and ensure user privacy. Please learn more about how we process the data that can be obtained about you or your device. By continuing you confirm that you acknowledge and accept our Privacy Policy.</string>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="By continuing you confirm that you acknowledge and accept our Privacy Policy." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DMR-aa-gzz">
<rect key="frame" x="18" y="305" width="286" height="64.5"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="Ekx-G4-eb6" secondAttribute="trailing" constant="60" id="EAI-QJ-ej4"/>
<constraint firstAttribute="height" constant="500" id="Jeo-pZ-Fxz"/>
<constraint firstItem="g6Z-Xt-0Ga" firstAttribute="top" secondItem="LsO-vc-EoA" secondAttribute="top" id="Mqq-i1-RoU"/>
<constraint firstItem="Ekx-G4-eb6" firstAttribute="leading" secondItem="LsO-vc-EoA" secondAttribute="leading" constant="18" id="ONS-nC-WoW"/>
<constraint firstAttribute="trailing" secondItem="g6Z-Xt-0Ga" secondAttribute="trailing" constant="20" id="b0D-vn-Q4M"/>
<constraint firstItem="DMR-aa-gzz" firstAttribute="leading" secondItem="Ekx-G4-eb6" secondAttribute="leading" id="fP2-XE-UXa"/>
<constraint firstItem="DMR-aa-gzz" firstAttribute="top" secondItem="Ekx-G4-eb6" secondAttribute="bottom" id="iYG-oe-v9j"/>
<constraint firstItem="Ekx-G4-eb6" firstAttribute="top" secondItem="u4Z-xP-eAE" secondAttribute="bottom" constant="18" id="irY-XS-i5S"/>
<constraint firstItem="u4Z-xP-eAE" firstAttribute="leading" secondItem="LsO-vc-EoA" secondAttribute="leading" constant="18" id="khm-Vk-6MX"/>
<constraint firstItem="u4Z-xP-eAE" firstAttribute="top" secondItem="LsO-vc-EoA" secondAttribute="top" constant="60" id="oP2-EC-TrU"/>
<constraint firstItem="DMR-aa-gzz" firstAttribute="trailing" secondItem="Ekx-G4-eb6" secondAttribute="trailing" constant="-50" id="uKI-7D-aIK"/>
<constraint firstItem="g6Z-Xt-0Ga" firstAttribute="leading" secondItem="LsO-vc-EoA" secondAttribute="leading" id="wjs-1v-35M"/>
</constraints>
</view>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hgv-od-xdY">
<rect key="frame" x="137" y="740" width="140" height="44"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
<state key="normal" title="Next" backgroundImage="guide_button_bg_icon">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
</button>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="p6b-YW-dyG" secondAttribute="trailing" id="8gY-A4-hYt"/>
<constraint firstItem="Hgv-od-xdY" firstAttribute="centerX" secondItem="lqc-AC-hFh" secondAttribute="centerX" id="GTx-ta-bvj"/>
<constraint firstAttribute="trailing" secondItem="LsO-vc-EoA" secondAttribute="trailing" id="Ju6-Ed-uSZ"/>
<constraint firstItem="p6b-YW-dyG" firstAttribute="leading" secondItem="lqc-AC-hFh" secondAttribute="leading" id="NK2-RX-JVl"/>
<constraint firstItem="LsO-vc-EoA" firstAttribute="top" secondItem="lqc-AC-hFh" secondAttribute="top" id="TTn-15-NdS"/>
<constraint firstItem="p6b-YW-dyG" firstAttribute="top" secondItem="lqc-AC-hFh" secondAttribute="top" id="VMi-Po-gvo"/>
<constraint firstAttribute="bottom" secondItem="p6b-YW-dyG" secondAttribute="bottom" id="kXT-nh-0M3"/>
<constraint firstItem="LsO-vc-EoA" firstAttribute="leading" secondItem="lqc-AC-hFh" secondAttribute="leading" id="x4B-If-iR2"/>
<constraint firstAttribute="bottom" secondItem="Hgv-od-xdY" secondAttribute="bottom" constant="50" id="zEx-YC-XZe"/>
</constraints>
</collectionViewCellContentView>
<size key="customSize" width="414" height="834"/>
<connections>
<outlet property="commitContentLabel" destination="DMR-aa-gzz" id="avr-9E-ytj"/>
<outlet property="guideImageView" destination="p6b-YW-dyG" id="JdQ-PF-MjM"/>
<outlet property="mainContentLabel" destination="Ekx-G4-eb6" id="Zga-Kr-4J3"/>
<outlet property="nextButton" destination="Hgv-od-xdY" id="GjZ-TR-958"/>
<outlet property="welcomeTipLabel" destination="u4Z-xP-eAE" id="Oj0-vh-rcF"/>
</connections>
</collectionViewCell>
</cells>
......@@ -1940,9 +1878,6 @@ Super Cleaner！</string>
<image name="contact_choose" width="22" height="22"/>
<image name="contact_choosed" width="22" height="22"/>
<image name="global_green_btn_bg" width="324" height="62"/>
<image name="guide_button_bg_icon" width="140" height="44"/>
<image name="guide_gradual_bg_section_1" width="375" height="812"/>
<image name="guide_section_1_icon" width="361" height="438"/>
<image name="home_button_bg" width="188" height="50"/>
<image name="home_cycle_bg_img" width="168" height="168"/>
<image name="home_pause_btn_bg" width="26" height="26"/>
......
superCleaner/Base/ICGuideViewController.m
View file @ 2bdc4370
......@@ -11,7 +11,6 @@
#import "ICNavigationController.h"
#import "ICGuideCollectionViewCell.h"
#import "DeviceInfo.h"
#import "ICGuideTypeTwoViewCell.h"
@interface ICGuideViewController () <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout>
......@@ -28,10 +27,7 @@
self.flowLayout.minimumLineSpacing = CGFLOAT_MIN;
self.flowLayout.minimumInteritemSpacing = CGFLOAT_MIN;
[self.collectionView registerNib:[UINib nibWithNibName:@"ICGuideTypeTwoViewCell" bundle:nil] forCellWithReuseIdentifier:@"ICGuideTypeTwoViewCell"];
[self.collectionView reloadData];
}
- (void)viewWillAppear:(BOOL)animated{
......@@ -52,24 +48,13 @@
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
switch (indexPath.row) {
case 0: {
ICGuideCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier: @"ICGuideCollectionViewCell" forIndexPath:indexPath];
// if ([UIScreen mainScreen].bounds.size.height >= 812) {
// cell.guideImageView.image = [UIImage imageNamed: [NSString stringWithFormat:@"guide_image_x_0%ld", (long)indexPath.row + 1]];
// } else {
// cell.guideImageView.image = [UIImage imageNamed: [NSString stringWithFormat:@"guide_image_0%ld", (long)indexPath.row + 1]];
// }
return cell;
break;
}
default: {
ICGuideTypeTwoViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ICGuideTypeTwoViewCell" forIndexPath:indexPath];
[cell configWith:indexPath.row];
return cell;
break;
}
ICGuideCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier: @"ICGuideCollectionViewCell" forIndexPath:indexPath];
if ([UIScreen mainScreen].bounds.size.height >= 812) {
cell.guideImageView.image = [UIImage imageNamed: [NSString stringWithFormat:@"guide_image_x_0%ld", (long)indexPath.row + 1]];
} else {
cell.guideImageView.image = [UIImage imageNamed: [NSString stringWithFormat:@"guide_image_0%ld", (long)indexPath.row + 1]];
}
return cell;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
......
superCleaner/Base/ICIAPViewController.m
View file @ 2bdc4370
......@@ -90,8 +90,8 @@
for (ICIPAProductModel *model in self.products) {
if ([model.productId containsString:@"week"]) {
_currentProduct = model;
break;
}
break;
}
[self startPlanAction:_currentProduct];
}
......@@ -104,8 +104,8 @@
for (ICIPAProductModel *model in self.products) {
if ([model.productId containsString:@"year"]) {
_currentProduct = model;
break;
}
break;
}
[self startPlanAction:_currentProduct];
}
......
superCleaner/Base/Views/ICGuideTypeTwoViewCell.h deleted 100644 → 0
View file @ cab7c5ab
//
// ICGuideTypeTwoViewCell.h
// superCleaner
//
// Created by Mazy on 2020/7/27.
// Copyright © 2020 Mazy. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface ICGuideTypeTwoViewCell : UICollectionViewCell
@property (weak, nonatomic) IBOutlet UIImageView *iPhoneSnapIconView;
@property (weak, nonatomic) IBOutlet UILabel *mainTitleLabel;
@property (weak, nonatomic) IBOutlet UILabel *subTitleLabel;
@property (weak, nonatomic) IBOutlet UIButton *nextButton;
-(void)configWith: (NSInteger) index;
@end
NS_ASSUME_NONNULL_END
superCleaner/Base/Views/ICGuideTypeTwoViewCell.m deleted 100644 → 0
View file @ cab7c5ab
//
// ICGuideTypeTwoViewCell.m
// superCleaner
//
// Created by Mazy on 2020/7/27.
// Copyright © 2020 Mazy. All rights reserved.
//
#import "ICGuideTypeTwoViewCell.h"
@implementation ICGuideTypeTwoViewCell
-(void)configWith: (NSInteger) index {
NSString *language = [[NSLocale preferredLanguages] firstObject];
switch (index) {
case 1:
self.mainTitleLabel.text = ICLocalized(@"WiseCleaning"); //@"智能清理";
self.subTitleLabel.text = ICLocalized(@"CleanUpOneClick"); //@"一键清理您的iPhone";
[self.nextButton setTitle: ICLocalized(@"NextStep") forState: UIControlStateNormal];
if ([language containsString: @"zh"]) {
self.iPhoneSnapIconView.image = [UIImage imageNamed:@"guide_iphone_icon_ch_1"];
} else {
self.iPhoneSnapIconView.image = [UIImage imageNamed:@"guide_iphone_icon_1"];
}
break;
case 2:
self.mainTitleLabel.text = ICLocalized(@"ManualClean"); //@"手动清理";
self.subTitleLabel.text = ICLocalized(@"ManuallyCleanDesc"); //@"手动清理照片、视频、联系人";
if ([language containsString: @"zh"]) {
self.iPhoneSnapIconView.image = [UIImage imageNamed:@"guide_iphone_icon_2"];
} else {
self.iPhoneSnapIconView.image = [UIImage imageNamed:@"guide_iphone_icon_en_2"];
}
default:
break;
}
}
@end
superCleaner/Base/Views/ICGuideTypeTwoViewCell.xib deleted 100644 → 0
View file @ cab7c5ab
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ICGuideTypeTwoViewCell" id="gTV-IL-0wX" customClass="ICGuideTypeTwoViewCell">
<rect key="frame" x="0.0" y="0.0" width="375" height="696"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="375" height="696"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guide_bg_gradual_icon" translatesAutoresizingMaskIntoConstraints="NO" id="ZfC-1w-bKV">
<rect key="frame" x="0.0" y="0.0" width="375" height="696"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guide_bg_icon" translatesAutoresizingMaskIntoConstraints="NO" id="u31-5y-ugV">
<rect key="frame" x="0.0" y="0.0" width="375" height="696"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guide_iphone_icon_1" translatesAutoresizingMaskIntoConstraints="NO" id="WBg-gb-fac">
<rect key="frame" x="80" y="60" width="215" height="398"/>
</imageView>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h2R-tR-ayW">
<rect key="frame" x="117.5" y="602" width="140" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="8GH-5d-vFq"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="Next" backgroundImage="guide_button_bg_icon">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wise Cleaning" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KrY-16-RTn">
<rect key="frame" x="79.5" y="478" width="216" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="Az0-yh-Foc"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="34"/>
<color key="textColor" red="0.13333333333333333" green="0.16078431372549018" blue="0.23921568627450979" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Manually clean up your photos, video and contacts" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6y-qO-Y9p">
<rect key="frame" x="30" y="534" width="315" height="43"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.1333333333" green="0.16078431369999999" blue="0.23921568630000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</view>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="u31-5y-ugV" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="2br-dG-jgB"/>
<constraint firstItem="d6y-qO-Y9p" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="30" id="2lc-0R-jif"/>
<constraint firstAttribute="bottom" secondItem="h2R-tR-ayW" secondAttribute="bottom" constant="50" id="31T-6B-x4S"/>
<constraint firstItem="WBg-gb-fac" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="60" id="571-Dy-kIK"/>
<constraint firstItem="h2R-tR-ayW" firstAttribute="top" secondItem="KrY-16-RTn" secondAttribute="bottom" constant="80" id="8wP-rf-Itj"/>
<constraint firstItem="WBg-gb-fac" firstAttribute="centerX" secondItem="u31-5y-ugV" secondAttribute="centerX" id="C3C-2d-aAG"/>
<constraint firstItem="ZfC-1w-bKV" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="C5t-Ga-AFp"/>
<constraint firstItem="d6y-qO-Y9p" firstAttribute="centerX" secondItem="KrY-16-RTn" secondAttribute="centerX" id="Eek-Qn-2Wj"/>
<constraint firstAttribute="trailing" secondItem="u31-5y-ugV" secondAttribute="trailing" id="H9A-NQ-WR8"/>
<constraint firstItem="KrY-16-RTn" firstAttribute="top" secondItem="WBg-gb-fac" secondAttribute="bottom" constant="20" id="OCy-EO-2T8"/>
<constraint firstAttribute="bottom" secondItem="ZfC-1w-bKV" secondAttribute="bottom" id="PeT-Qh-joU"/>
<constraint firstItem="ZfC-1w-bKV" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="RSx-lf-8rw"/>
<constraint firstItem="u31-5y-ugV" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="U3i-J1-Mfn"/>
<constraint firstItem="WBg-gb-fac" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="80" id="UCA-Ts-Q9U"/>
<constraint firstItem="d6y-qO-Y9p" firstAttribute="top" secondItem="KrY-16-RTn" secondAttribute="bottom" constant="12" id="V2V-MZ-0uw"/>
<constraint firstAttribute="trailing" secondItem="ZfC-1w-bKV" secondAttribute="trailing" id="Veb-VV-YVb"/>
<constraint firstItem="KrY-16-RTn" firstAttribute="centerX" secondItem="ZTg-uK-7eu" secondAttribute="centerX" id="lez-1k-UnF"/>
<constraint firstItem="h2R-tR-ayW" firstAttribute="centerX" secondItem="ZTg-uK-7eu" secondAttribute="centerX" id="rQa-bg-xtS"/>
<constraint firstAttribute="bottom" secondItem="u31-5y-ugV" secondAttribute="bottom" id="uj1-ka-0d3"/>
</constraints>
<viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
<size key="customSize" width="314" height="625"/>
<connections>
<outlet property="iPhoneSnapIconView" destination="WBg-gb-fac" id="IEV-8d-o5M"/>
<outlet property="mainTitleLabel" destination="KrY-16-RTn" id="6pM-Ra-tTu"/>
<outlet property="nextButton" destination="h2R-tR-ayW" id="IYl-vh-C2g"/>
<outlet property="subTitleLabel" destination="d6y-qO-Y9p" id="9gt-Fp-Zm7"/>
</connections>
<point key="canvasLocation" x="326.81159420289856" y="317.41071428571428"/>
</collectionViewCell>
</objects>
<resources>
<image name="guide_bg_gradual_icon" width="375" height="812"/>
<image name="guide_bg_icon" width="375" height="812"/>
<image name="guide_button_bg_icon" width="140" height="44"/>
<image name="guide_iphone_icon_1" width="248" height="492"/>
</resources>
</document>
superCleaner/Home/Controller/ICPhotoManageViewController.m
View file @ 2bdc4370
......@@ -122,11 +122,13 @@
return;
}
__weak typeof(self) weakSelf = self;
[MBProgressHUD showLoading:@"正在查询，请稍后..." toView:self.view];
[self.photoMgr loadLocationPhotoWithProcess:^(NSInteger current, NSInteger total) {
NSLog(@"loadLocationPhotoWithProcess %ld", (long)current);
cell.progressView.strokeStart = ((CGFloat)current / (CGFloat)(total / 4));
cell.countLabel.text = [NSString stringWithFormat:@"%lu", (unsigned long)weakSelf.photoMgr.locationArray.count];
} completionHandler:^(BOOL success, NSError *error) {
[MBProgressHUD hideHUDForView:self.view];
cell.progressView.strokeStart = 0;
}];
}
......@@ -269,7 +271,8 @@
- (void)loadPhotoData: (BOOL)isFirstLoad {
[self.tableView reloadData];
[MBProgressHUD showLoading:@"正在查询，请稍后..." toView:self.view];
if (self.photoMgr.currentIndex <= 0) {
self.photoMgr.pauseAction = false;
__weak typeof(self) weakSelf = self;
......@@ -324,6 +327,7 @@
self.screenshotArray = self.photoMgr.snapshotArray;
self.similarPhotoArray = self.photoMgr.similarArray;
self.similarLiveArray = self.photoMgr.similarLiveArray;
[MBProgressHUD hideHUDForView:self.view];
[self loadLocationAssets];
[self.tableView reloadData];
}];
......@@ -363,6 +367,7 @@
self.screenshotArray = self.photoMgr.snapshotArray;
self.similarPhotoArray = self.photoMgr.similarArray;
self.similarLiveArray = self.photoMgr.similarLiveArray;
[MBProgressHUD hideHUDForView:self.view];
[self loadLocationAssets];
[self.tableView reloadData];
return;
......@@ -426,6 +431,7 @@
self.screenshotArray = self.photoMgr.snapshotArray;
self.similarPhotoArray = self.photoMgr.similarArray;
self.similarLiveArray = self.photoMgr.similarLiveArray;
[MBProgressHUD hideHUDForView:self.view];
[self loadLocationAssets];
[self.tableView reloadData];
}];
......
superCleaner/Manager/Network/ZTNetworkTools.m
View file @ 2bdc4370
......@@ -293,7 +293,7 @@ static ZTNetworkTools* _tools = nil;
[dict setValue: UIDevice.currentDevice.systemVersion forKey:@"svn"];
//appLs
[dict setValue: @"58be4768aad83b97" forKey: @"appLs"];
[dict setValue: @"71b221c60431edfa" forKey: @"appLs"];
// LANGUAGE //lang=en_US
NSString *language = [[NSLocale preferredLanguages] firstObject];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment