v2.0.3

1. 增加是否记住密码、信任设备的勾选项 2. 切换账号从双点确认改为单击确认切换 3. 修复和完善一些Bug和体验的问题
37MobileTeam · Apr 9, 2022 · d3fb04c · d3fb04c
1 parent 045fd40
commit d3fb04c
Show file tree

Hide file tree

Showing 23 changed files with 129 additions and 635 deletions.
diff --git a/AppleParty.xcodeproj/project.pbxproj b/AppleParty.xcodeproj/project.pbxproj
@@ -291,7 +291,7 @@
 				6D8F182B27F07E97001A30BF /* AppListView */,
 				6D8F183027F07E97001A30BF /* EmailToolView */,
 				6D8F183427F07E97001A30BF /* QRcodeView */,
-				6D8F183127F07E97001A30BF /* SettingView */,
+				6D8F183127F07E97001A30BF /* AppSettingView */,
 				6D8F184227F07E97001A30BF /* Shared */,
 				6D8F187A27F0AC74001A30BF /* Vendors */,
 				6D8F183327F07E97001A30BF /* SparkleUpdate */,
@@ -357,6 +357,8 @@
 				6D3ECCE927F1D6C6005E4597 /* IAPCharge.swift */,
 				6D3ECCE727F1D6BB005E4597 /* IAPModel.swift */,
 				6D3ECCDD27F1D027005E4597 /* XMLModel.swift */,
+				6D8F187D27F0AC83001A30BF /* TierStemParser.swift */,
+				6D8F187E27F0AC83001A30BF /* XLSXParser.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -384,15 +386,14 @@
 		6D8F182B27F07E97001A30BF /* AppListView */ = {
 			isa = PBXGroup;
 			children = (
-				6D3ECCDC27F1D00B005E4597 /* Models */,
-				6D8F183227F07E97001A30BF /* InAppPurchseView */,
-				6D3ECCD127F1CAC5005E4597 /* ScreenShotsView */,
 				6D8F182D27F07E97001A30BF /* APAppListVC.swift */,
 				6D8F185E27F08161001A30BF /* AppList.storyboard */,
 				6D8F186527F081ED001A30BF /* APAppListAdapter.swift */,
 				6D8F186127F081D3001A30BF /* APAppListCell.swift */,
 				6D8F186227F081D3001A30BF /* APAppListCell.xib */,
 				6D8F186727F08201001A30BF /* APAppListModel.swift */,
+				6D8F183227F07E97001A30BF /* InAppPurchseView */,
+				6D3ECCD127F1CAC5005E4597 /* ScreenShotsView */,
 			);
 			path = AppListView;
 			sourceTree = "<group>";
@@ -409,13 +410,13 @@
 			path = EmailToolView;
 			sourceTree = "<group>";
 		};
-		6D8F183127F07E97001A30BF /* SettingView */ = {
+		6D8F183127F07E97001A30BF /* AppSettingView */ = {
 			isa = PBXGroup;
 			children = (
 				6D59A22D27F31E7000C7D8F5 /* APSettingVC.swift */,
 				6D59A22E27F31E7000C7D8F5 /* APSettingVC.xib */,
 			);
-			path = SettingView;
+			path = AppSettingView;
 			sourceTree = "<group>";
 		};
 		6D8F183227F07E97001A30BF /* InAppPurchseView */ = {
@@ -430,6 +431,7 @@
 				6D584B5727F20A8000924BFE /* APInAppPurchseCell.swift */,
 				6D584B5527F20A4D00924BFE /* APInappPurchseCell.xib */,
 				6D59A21A27F2D49000C7D8F5 /* DragView.swift */,
+				6D3ECCDC27F1D00B005E4597 /* Models */,
 			);
 			path = InAppPurchseView;
 			sourceTree = "<group>";
@@ -537,8 +539,6 @@
 			children = (
 				6D8F188627F0ACA5001A30BF /* GDataXMLNode.h */,
 				6D8F188727F0ACA5001A30BF /* GDataXMLNode.m */,
-				6D8F187D27F0AC83001A30BF /* TierStemParser.swift */,
-				6D8F187E27F0AC83001A30BF /* XLSXParser.swift */,
 				6D8F188027F0AC83001A30BF /* XMLManager.swift */,
 			);
 			path = ITMS;
@@ -1077,7 +1077,7 @@
 				CODE_SIGN_ENTITLEMENTS = AppleParty/AppleParty.entitlements;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2022.04.07;
+				CURRENT_PROJECT_VERSION = 2022.04.09;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AppleParty/Info.plist;
@@ -1090,7 +1090,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 2.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.com.37iOS.AppleParty;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1111,7 +1111,7 @@
 				CODE_SIGN_ENTITLEMENTS = AppleParty/AppleParty.entitlements;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2022.04.07;
+				CURRENT_PROJECT_VERSION = 2022.04.09;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AppleParty/Info.plist;
@@ -1124,7 +1124,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 2.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.com.37iOS.AppleParty;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.storyboard b/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.storyboard
@@ -462,6 +462,7 @@
                     <connections>
                         <outlet property="appNameView" destination="RWS-I4-Hj5" id="B2s-1y-ClK"/>
                         <outlet property="outlineView" destination="Yd4-ve-MqM" id="gzd-Pc-XWm"/>
+                        <outlet property="outputIAPListBtn" destination="DoY-Xj-sox" id="evc-Ck-z2C"/>
                     </connections>
                 </viewController>
                 <customObject id="LWD-js-20w" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>

diff --git a/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.swift b/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.swift
@@ -19,6 +19,7 @@ class APInAppPurchseVC: NSViewController {
 
     var iapList: [IAPList.IAP] = []
 
+    @IBOutlet weak var outputIAPListBtn: NSButton!
     @IBOutlet weak var appNameView: NSTextField!
     @IBOutlet weak var outlineView: NSOutlineView!
 
@@ -81,7 +82,7 @@ class APInAppPurchseVC: NSViewController {
                     data.append(contentsOf: iaps.data(using: .utf8) ?? Data())
                     try data.write(to: filePath!)
                 } catch {
-                    // failed to write file (bad permissions, bad filename etc.)
+                    NSAlert.show("导出失败：\(error.localizedDescription)")
                 }
             }
         }
@@ -107,7 +108,8 @@ extension APInAppPurchseVC {
     func fetchIAPs() {
         APClient.iaps(appid: currentApp!.adamId).request(showLoading: true, inView: self.view) { [weak self] result, response, error in
             guard let err = error else {
-                let iapL = IAPList(body:result, app: (self?.currentApp!)!)
+                guard let app = self?.currentApp else { return } //请求过程关闭页面可能导致为空
+                let iapL = IAPList(body:result, app: app)
                 self?.iapList = iapL.iapList
                 self?.outlineView.reloadData()
                 self?.updateRowInfo()
@@ -122,6 +124,7 @@ extension APInAppPurchseVC {
             return
         }
 
+        outputIAPListBtn.isEnabled = false
         let group = DispatchGroup()
         for i in 0..<self.iapList.count {
             group.enter()
@@ -139,6 +142,7 @@ extension APInAppPurchseVC {
             }
         }
         group.notify(queue: .main) {
+            self.outputIAPListBtn.isEnabled = true
             self.outlineView.reloadData()
         }
     }
@@ -159,7 +163,8 @@ extension APInAppPurchseVC {
         let dps = xlsx[4]
         let types = xlsx[5]
         let scrs = xlsx[6]
-        let langs = (xlsx.count >= 8 && xlsx[7].count > 0 ) ? xlsx[7] : [String](repeating: "zh-Hans", count: ids.count)
+        // 如果没有填写，默认用简中
+        let langs = xlsx[7].count > 0 ? xlsx[7].map { $0.count > 0 ? $0 : "zh-Hans" } : [String](repeating: "zh-Hans", count: ids.count)
 
         // 检查行数
         guard ids.count == names.count, pris.count == levs.count, dps.count == types.count, types.count == ids.count, names.count == langs.count else {

diff --git a/...eParty/AppListView/Models/IAPCharge.swift → ...w/InAppPurchseView/Models/IAPCharge.swift b/...eParty/AppListView/Models/IAPCharge.swift → ...w/InAppPurchseView/Models/IAPCharge.swift
diff --git a/AppleParty/AppListView/Models/IAPModel.swift → ...ew/InAppPurchseView/Models/IAPModel.swift b/AppleParty/AppListView/Models/IAPModel.swift → ...ew/InAppPurchseView/Models/IAPModel.swift
diff --git a/AppleParty/Vendors/ITMS/TierStemParser.swift → ...ppPurchseView/Models/TierStemParser.swift b/AppleParty/Vendors/ITMS/TierStemParser.swift → ...ppPurchseView/Models/TierStemParser.swift
diff --git a/AppleParty/Vendors/ITMS/XLSXParser.swift → .../InAppPurchseView/Models/XLSXParser.swift b/AppleParty/Vendors/ITMS/XLSXParser.swift → .../InAppPurchseView/Models/XLSXParser.swift
@@ -83,7 +83,7 @@ struct XLSXParser {
                         return column.filter { (value) -> Bool in
                             value == "语言"
                         }.isNotEmpty
-                    }.first ?? []
+                    }.first ?? xlsx[7]
 
                     return [pris.filter({ $0 != "金额" }),
                             prods.filter({ $0 != "Product ID" }),

diff --git a/AppleParty/AppListView/Models/XMLModel.swift → ...ew/InAppPurchseView/Models/XMLModel.swift b/AppleParty/AppListView/Models/XMLModel.swift → ...ew/InAppPurchseView/Models/XMLModel.swift
diff --git a/AppleParty/SettingView/APSettingVC.swift → AppleParty/AppSettingView/APSettingVC.swift b/AppleParty/SettingView/APSettingVC.swift → AppleParty/AppSettingView/APSettingVC.swift
@@ -18,6 +18,7 @@ class APSettingVC: NSViewController {
         }
     }
 
+    @IBOutlet weak var trusDeviceBtn: NSButton!
     @IBOutlet weak var sPasswordBtn: NSButton!
     @IBOutlet weak var clearCacheBtn: NSButton!
 
@@ -46,6 +47,7 @@ class APSettingVC: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         title = "App设置"
+        trusDeviceBtn.state = InfoCenter.shared.trusDevice ? .on : .off
     }
 
 }
diff --git a/AppleParty/SettingView/APSettingVC.xib → AppleParty/AppSettingView/APSettingVC.xib b/AppleParty/SettingView/APSettingVC.xib → AppleParty/AppSettingView/APSettingVC.xib
@@ -10,6 +10,7 @@
             <connections>
                 <outlet property="clearCacheBtn" destination="CIQ-yY-qAH" id="Mk4-R7-k6m"/>
                 <outlet property="sPasswordBtn" destination="OeI-Rx-XtW" id="qOB-78-ZuO"/>
+                <outlet property="trusDeviceBtn" destination="nK7-5f-UIm" id="bjH-fk-npo"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>

diff --git a/AppleParty/LoginView/APLogin2FAVC.swift b/AppleParty/LoginView/APLogin2FAVC.swift
@@ -18,6 +18,7 @@ class APLogin2FAVC: NSViewController {
     @IBOutlet weak var voiceCodeBtn: NSButton!
     @IBOutlet weak var phoneCodeView: NSTextField!
     @IBOutlet weak var tipsWarningView: NSTextField!
+    @IBOutlet weak var trusDeviceBtn: NSButton!
     @IBOutlet weak var indicatorView: NSProgressIndicator!
     @IBOutlet weak var verifyBtn: NSButton!
 
@@ -31,6 +32,7 @@ class APLogin2FAVC: NSViewController {
         super.viewDidLoad()
         phoneCodeView.delegate = self
         fetchPhoneList()
+        trusDeviceBtn.state = InfoCenter.shared.trusDevice ? .on : .off
     }
 
     @IBAction func clickedCancelBtn(_ sender: NSButton) {

diff --git a/AppleParty/LoginView/APLogin2FAVC.xib b/AppleParty/LoginView/APLogin2FAVC.xib
@@ -13,6 +13,7 @@
                 <outlet property="phoneListBtn" destination="YPd-lO-U4e" id="Sg5-Hb-iUb"/>
                 <outlet property="sendCodeBtn" destination="rx9-Oh-Gtq" id="cYT-hl-Kc7"/>
                 <outlet property="tipsWarningView" destination="ijo-CH-sfg" id="PLO-uS-eBh"/>
+                <outlet property="trusDeviceBtn" destination="8SV-WX-fvn" id="kyK-aJ-vJK"/>
                 <outlet property="verifyBtn" destination="E5o-kz-kvG" id="kcn-Ez-LwY"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
                 <outlet property="voiceCodeBtn" destination="kff-Qr-scI" id="khK-sS-hCc"/>
@@ -151,6 +152,17 @@ DQ
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8SV-WX-fvn">
+                    <rect key="frame" x="283" y="20" width="80" height="16"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="16" id="mX6-l7-rZj"/>
+                        <constraint firstAttribute="width" constant="78" id="vDy-Dk-GSE"/>
+                    </constraints>
+                    <buttonCell key="cell" type="check" title="信任设备" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="VBA-AP-I7T">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" size="13" name="STSongti-SC-Regular"/>
+                    </buttonCell>
+                </button>
             </subviews>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="BiF-4T-JA0" secondAttribute="bottom" constant="15" id="1Fq-AL-3Ws"/>
@@ -159,6 +171,8 @@ DQ
                 <constraint firstAttribute="trailing" secondItem="rx9-Oh-Gtq" secondAttribute="trailing" constant="60" id="Euw-SM-wUx"/>
                 <constraint firstItem="YPd-lO-U4e" firstAttribute="leading" secondItem="vqk-uI-9AU" secondAttribute="trailing" constant="10" id="G4u-U5-hRW"/>
                 <constraint firstItem="vqk-uI-9AU" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="60" id="Kat-r9-QXI"/>
+                <constraint firstItem="8SV-WX-fvn" firstAttribute="centerY" secondItem="E5o-kz-kvG" secondAttribute="centerY" id="Pfn-8j-tgF"/>
+                <constraint firstItem="E5o-kz-kvG" firstAttribute="leading" secondItem="8SV-WX-fvn" secondAttribute="trailing" constant="8" id="Q3C-bW-QSW"/>
                 <constraint firstAttribute="trailing" secondItem="kff-Qr-scI" secondAttribute="trailing" constant="60" id="Sxo-QH-rVU"/>
                 <constraint firstAttribute="trailing" secondItem="npy-jX-GQb" secondAttribute="trailing" constant="60" id="WBf-2q-NVj"/>
                 <constraint firstItem="npy-jX-GQb" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="60" id="WxQ-Kb-Jj4"/>

diff --git a/AppleParty/LoginView/APLoginVC.swift b/AppleParty/LoginView/APLoginVC.swift
@@ -20,6 +20,7 @@ class APLoginVC: NSViewController {
     @IBOutlet weak var tableView: NSTableView!
 
     @IBOutlet weak var tipsWarningView: NSTextField!
+    @IBOutlet weak var autoLoginBtn: NSButton!
     @IBOutlet weak var indicatorView: NSProgressIndicator!
     @IBOutlet weak var loginBtn: NSButton!
 
@@ -29,12 +30,10 @@ class APLoginVC: NSViewController {
         passwordView.delegate = self
         tipsWarningView.maximumNumberOfLines = 5
 
-        tableView.delegate = self
-        tableView.dataSource = self
-
         // 最近登录的账号
-        let name = UserCenter.shared.loginedUser.appleid
-        let pwd = UserCenter.shared.loginedUser.password
+        let user = UserCenter.shared.loginedUser
+        let name = user.appleid
+        let pwd = user.password
         guard name.count > 0, pwd.count > 0 else { return }
         accountView.stringValue = name
         passwordView.stringValue = pwd
@@ -54,6 +53,11 @@ class APLoginVC: NSViewController {
 
 
     @IBAction func showAccountHistoryList(_ sender: Any) {
+        if historyBox.isHidden {
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.reloadData()
+        }
         historyBox.isHidden = !historyBox.isHidden
     }
 
@@ -88,8 +92,11 @@ extension APLoginVC {
                 case .notAuthorized:
                     self?.showTips("Apple ID 或密码不正确")
                 case .twoStepOrFactor:
-                    // 账号密码正确
-                    UserCenter.shared.loginedUser = User(appleid: account, password: pwd)
+                    // 保存账号密码
+                    if self?.autoLoginBtn.state == .on {
+                        UserCenter.shared.isAutoLogin = true
+                        UserCenter.shared.loginedUser = User(appleid: account, password: pwd)
+                    }
                     // 双重认证
                     let vc = APLogin2FAVC()
                     vc.cancelHandle = { [weak self] in
@@ -111,8 +118,11 @@ extension APLoginVC {
             let code = response?.statusCode
             // 登陆态有效
             if code == 200 {
-                // 账号密码正确
-                UserCenter.shared.loginedUser = User(appleid: account, password: pwd)
+                // 保存账号密码
+                if self?.autoLoginBtn.state == .on {
+                    UserCenter.shared.isAutoLogin = true
+                    UserCenter.shared.loginedUser = User(appleid: account, password: pwd)
+                }
                 self?.validateSession()
             } else {
                 self?.showTips("\(code ?? 0),\(error.debugDescription)")
@@ -140,6 +150,8 @@ extension APLoginVC {
     }
 
     func trusDevice() {
+        guard InfoCenter.shared.trusDevice else { return}
+
         APClient.trusDevice(isTrus: true).request { result, response, error in
             if response?.statusCode == 204 {
                 debugPrint("信任设备成功~")
@@ -166,6 +178,7 @@ extension APLoginVC {
     func viewEnabled(_ isEnabled: Bool) {
         showTips("")
         loginBtn.isEnabled = isEnabled
+        historyBox.isHidden = true
         isEnabled ? indicatorView.stopAnimation(nil) : indicatorView.startAnimation(nil)
     }