Skip to content

S
ShorthandMaster
Commit ca98cde2 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

no message

parent ad955c1e
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 12 deletions
ShorthandMaster/Contstants/CRUserDefaults.swift
View file @ ca98cde2
......@@ -97,4 +97,13 @@ struct CRUserDefaults {
return UserDefaults.standard.bool(forKey: "com.app.isFirstExportGuide")
}
}
static var isFirstRecord: Bool {
set {
UserDefaults.standard.set(newValue, forKey: "com.app.isFirstRecord")
}
get {
return UserDefaults.standard.bool(forKey: "com.app.isFirstRecord")
}
}
}
ShorthandMaster/Goods/Goods.storyboard
View file @ ca98cde2
......@@ -72,13 +72,13 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3天免费试用，之后¥498/年，随时取消" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bYQ-iK-LKQ">
<rect key="frame" x="63.333333333333329" y="125.66666666666663" width="248.66666666666669" height="17"/>
<rect key="frame" x="63.333333333333329" y="117.33333333333337" width="248.66666666666669" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zdZ-po-8RK">
<rect key="frame" x="56" y="188.33333333333337" width="48" height="25.333333333333343"/>
<rect key="frame" x="56" y="201.66666666666663" width="48" height="25.333333333333343"/>
<constraints>
<constraint firstAttribute="width" constant="48" id="Huy-Ey-M4D"/>
</constraints>
......@@ -99,7 +99,7 @@
</connections>
</button>
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8CH-Xu-Rvt">
<rect key="frame" x="163.66666666666666" y="188.33333333333337" width="48" height="25.333333333333343"/>
<rect key="frame" x="163.66666666666666" y="201.66666666666663" width="48" height="25.333333333333343"/>
<state key="normal">
<attributedString key="attributedTitle">
<fragment content="恢复购买">
......@@ -117,7 +117,7 @@
</connections>
</button>
<button opaque="NO" tag="102" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="97G-xL-vUR">
<rect key="frame" x="271" y="188.33333333333337" width="48.333333333333314" height="25.333333333333343"/>
<rect key="frame" x="271" y="201.66666666666663" width="48.333333333333314" height="25.333333333333343"/>
<state key="normal">
<attributedString key="attributedTitle">
<fragment content="使用条款">
......@@ -137,12 +137,12 @@
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="zdZ-po-8RK" firstAttribute="centerY" secondItem="paw-ud-pJv" secondAttribute="centerY" multiplier="1.5" id="5mv-Ms-Okb"/>
<constraint firstItem="zdZ-po-8RK" firstAttribute="centerY" secondItem="paw-ud-pJv" secondAttribute="centerY" multiplier="1.6" id="5mv-Ms-Okb"/>
<constraint firstItem="8CH-Xu-Rvt" firstAttribute="leading" secondItem="zdZ-po-8RK" secondAttribute="trailing" constant="59.666666666666657" id="9x4-zX-RjQ"/>
<constraint firstItem="zdZ-po-8RK" firstAttribute="leading" secondItem="7CA-md-1C7" secondAttribute="leading" id="AbC-E6-8RL"/>
<constraint firstItem="97G-xL-vUR" firstAttribute="centerY" secondItem="zdZ-po-8RK" secondAttribute="centerY" id="FHh-jS-ozY"/>
<constraint firstItem="zdZ-po-8RK" firstAttribute="top" secondItem="8CH-Xu-Rvt" secondAttribute="top" id="Ire-xb-j6d"/>
<constraint firstItem="bYQ-iK-LKQ" firstAttribute="centerY" secondItem="paw-ud-pJv" secondAttribute="centerY" id="LrC-6k-V4B"/>
<constraint firstItem="bYQ-iK-LKQ" firstAttribute="top" secondItem="7CA-md-1C7" secondAttribute="bottom" constant="18" id="N7f-WJ-rek"/>
<constraint firstItem="7CA-md-1C7" firstAttribute="centerY" secondItem="paw-ud-pJv" secondAttribute="centerY" multiplier="0.5" id="P8S-Vw-F5z"/>
<constraint firstItem="8CH-Xu-Rvt" firstAttribute="centerX" secondItem="bYQ-iK-LKQ" secondAttribute="centerX" id="PaG-1z-1ya"/>
<constraint firstItem="97G-xL-vUR" firstAttribute="trailing" secondItem="7CA-md-1C7" secondAttribute="trailing" id="TPF-52-ghN"/>
......
ShorthandMaster/Goods/SHGoodsViewController.swift
View file @ ca98cde2
......@@ -65,10 +65,6 @@ class SHGoodsViewController: SHBaseViewController {
guard error == nil else { return }
let goodsList = json["result"]["data"]["goodsList"].arrayValue.map({ SHAPProductModel(json: $0) })
self.pruducts = goodsList
if let yearVip = goodsList.filter({ $0.productId.contains("year") }).first {
self.yearStoreLab.text = yearVip.name
}
}
}
......
ShorthandMaster/Record/SHRecordListViewController.swift
View file @ ca98cde2
......@@ -94,6 +94,7 @@ class SHRecordListViewController: SHBaseViewController {
self.view.bringSubviewToFront(maskView)
self.view.bringSubviewToFront(recorderBtn)
}else {
CRUserDefaults.isFirstRecord = true
self.view.sendSubviewToBack(maskView)
}
}
......@@ -186,8 +187,7 @@ class SHRecordListViewController: SHBaseViewController {
}
@IBAction func goRecord(){
if dataSources.count > 0{
if CRUserDefaults.isFirstRecord == true{
if SHUserAccountManager.shared.isMember == false{
self.goGoods("home_record")
return
......
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