openlockPPP 1 жил өмнө
parent
commit
4cad54413d

+ 2 - 2
JiaPeiManage.xcodeproj/project.pbxproj

@@ -1467,7 +1467,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071301;
+				CURRENT_PROJECT_VERSION = 1202023071401;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1504,7 +1504,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071301;
+				CURRENT_PROJECT_VERSION = 1202023071401;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;

BIN
JiaPeiManage/Assets.xcassets/Launch/launch_background.imageset/launch_background@3x.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/1242X2208.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/320×480.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/640X1136-1.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/640X1136.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/640X960-1.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/640X960.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/750X1334.png


BIN
JiaPeiManage/Assets.xcassets/LaunchImage.launchimage/js_stu.png


+ 25 - 5
JiaPeiManage/Base.lproj/LaunchScreen.storyboard

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -11,10 +14,21 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_background" translatesAutoresizingMaskIntoConstraints="NO" id="ZEc-eN-trx">
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="818"/>
+                            </imageView>
+                        </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="ZEc-eN-trx" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="TAh-9F-W4p"/>
+                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="ZEc-eN-trx" secondAttribute="bottom" id="WcB-2H-y9A"/>
+                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="ZEc-eN-trx" secondAttribute="trailing" id="oRW-d5-fkm"/>
+                            <constraint firstItem="ZEc-eN-trx" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="uH0-78-5bX"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -22,4 +36,10 @@
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="launch_background" width="414" height="736"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

+ 1 - 0
JiaPeiManage/Sources/Modulars/Splash/SplashViewController.swift

@@ -17,6 +17,7 @@ final class SplashViewController: BaseViewController {
     
     private let splashImageView = UIImageView().then{
         $0.image = NYImage.Launch.splash
+        $0.isHidden = true
     }
 
     override func setupConstraints() {

+ 6 - 0
JiaPeiManage/Sources/Modulars/Statistics/ViewModel/StatisticsPageViewModel.swift

@@ -142,9 +142,11 @@ class StatisticsPageViewModel: NSObject {
     }
     //重置
     func resetHandledo(){
+        self.vc!.selectDateView.showCount = 0
         self.vc!.selectDateView.startdate_button.setTitle(getButtonDate(date: self.startDate), for: .normal)
         self.vc!.selectDateView.enddate_button.setTitle(getButtonDate(date: self.endDate), for: .normal)
         self.vc!.selectDateView.setDateType(type: dateType)
+        self.vc!.selectDateView.selectItemIndex(index: self.vc!.selectDateView.current_button.tag-99)
     }
     
     func getButtonDate(date:String)->String{
@@ -289,11 +291,15 @@ extension StatisticsPageViewModel:UITableViewDataSource {
         if (type == .presell){
             if stuTotalCountDataModel != nil {
                 vc!.headerView.setStuTotalCountDataModel(stuTotalCountDataModel: stuTotalCountDataModel!)
+            }else{
+                return UIView()
             }
             return vc!.headerView
         }
         if stuTotalCountDataModel != nil {
             vc!.officialheaderView.setStuTotalCountDataModel(stuTotalCountDataModel: stuTotalCountDataModel!)
+        }else{
+            return UIView()
         }
         return vc!.officialheaderView
     }

+ 1 - 1
JiaPeiManage/Sources/Modulars/Statistics/Views/StatisticsSelectDateView.swift

@@ -84,8 +84,8 @@ final class StatisticsSelectDateView: UIView,NibLoadable {
             current_button.backgroundColor = UIColor("#0B2B4D")!
             button.backgroundColor = UIColor("#597CA1")!
             current_button = button
-            datehandledo()
         }
+        datehandledo()
     }
     //计算 - 日期
     func datehandledo(){