From b1214481466284e15f6bd0e8658e0ef5728a7400 Mon Sep 17 00:00:00 2001
From: 葛建军 <627299690@qq.com>
Date: Sat, 24 Mar 2018 17:45:02 +0800
Subject: [PATCH] no message

---
 ParentAssistant/ParentAssistant/AppDelegate.swift                                                                                 |  4 +++-
 ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift                                   |  3 +--
 ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift                                       |  9 +++++++--
 ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MessageViewController.swift                                     |  6 ++++++
 ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift                                  |  7 +++++++
 ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift                                          |  7 ++++---
 ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/OrderDetailViewController.swift                                 |  6 ++++++
 ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift                                    |  2 +-
 ParentAssistant/ParentAssistant/Classes/util/network.swift                                                                        |  2 +-
 ParentAssistant/ParentAssistant/Classes/util/utils.swift                                                                          |  2 +-
 ParentAssistant/ParentAssistant/Classes/util/view/TableEmptyView.xib                                                              |  6 +++---
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/Contents.json      | 21 +++++++++++++++++++++
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/activite1.png      | Bin 0 -> 85323 bytes
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/Contents.json      | 21 +++++++++++++++++++++
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/activite2.png      | Bin 0 -> 103293 bytes
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/Contents.json      | 21 +++++++++++++++++++++
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/activite3.png      | Bin 0 -> 122155 bytes
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/3_01.png      | Bin 0 -> 58627 bytes
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/Contents.json | 21 +++++++++++++++++++++
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/3_02.png       | Bin 0 -> 46581 bytes
 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/Contents.json  | 21 +++++++++++++++++++++
 ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard                                                       | 43 +++++++++++++++++++++++++++++--------------
 22 files changed, 174 insertions(+), 28 deletions(-)
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/Contents.json
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/activite1.png
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/Contents.json
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/activite2.png
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/Contents.json
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/activite3.png
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/3_01.png
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/Contents.json
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/3_02.png
 create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/Contents.json

diff --git a/ParentAssistant/ParentAssistant/AppDelegate.swift b/ParentAssistant/ParentAssistant/AppDelegate.swift
index 92fc8e9..3e69871 100644
--- a/ParentAssistant/ParentAssistant/AppDelegate.swift
+++ b/ParentAssistant/ParentAssistant/AppDelegate.swift
@@ -73,6 +73,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
                     if json["status"] == 1 && error == nil{
                         if json.contentData().arrayValue.count>0 {
+                            NSLog("************\(HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)")
                             let imageResource = ZLaunchAdImageResourceConfigure()
                             imageResource.imageNameOrImageURL = HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
                             imageResource.imageDuration = 5
@@ -80,13 +81,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                             adView.setImageResource(imageResource, action: {
                                 /// 广告点击
                             })
+                        }else{
+                            NSLog("************\(json.contentData())");
                         }
                     }
                 }, failHandler: { (error) in
                 })
             })
         }else{
-//            Thread.sleep(forTimeInterval: 5.0)//延长启动页面10秒
             let view = UIView(frame: CGRect(x: 0, y: 0, width: getScreenWidth(), height: getScreenHeight()))
             view.backgroundColor = UIColor.white
             vc.view.addSubview(view)
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
index 76cd037..2c5825b 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
@@ -31,8 +31,7 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
         searchView.placeholder = "请输入搜索内容"
         searchView.showsCancelButton = false
         self.navigationItem.titleView = searchView
-        self.configTheme()
-        
+        self.navigationController?.navigationBar.tintColor=UIColor.white
     }
     
     func getData(){
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift
index 906264c..cea9bd4 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift
@@ -18,14 +18,19 @@ class LoginViewController: UIViewController,UITextFieldDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         layoutSubViews()
+
+    }
+    override func loadView() {
+        super.loadView()
+        //防止tabbar隐藏导致页面跳一下
+        self.tabBarController?.tabBar.isHidden = true
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        self.navigationController?.navigationBar.isHidden = false
     }
     // MARK: - 设置控件属性
     func layoutSubViews(){
-        self.navigationController?.navigationBar.isHidden = false
         self.navigationItem.title = "登录"
         topView.constant = (getScreenHeight()-325)/3
         passwordHiddenBtn.setImage(UIImage(named: "my_password_look"), for: UIControlState.selected)
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MessageViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MessageViewController.swift
index 155191c..541c717 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MessageViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MessageViewController.swift
@@ -17,6 +17,12 @@ class MessageViewController: UIViewController {
         setupWithModel()
         NotificationCenter.default.addObserver(self, selector: #selector(MessageViewController.receivedNewNotificationAction), name: NSNotification.Name(rawValue: MessageNotification.receiveMessage), object: nil)
     }
+    override func loadView() {
+        super.loadView()
+        //防止tabbar隐藏导致页面跳一下
+        self.tabBarController?.tabBar.isHidden = true
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
+    }
     //本地数据查找并赋值显示
     func setupWithModel(){
         dataSet = NSManagedObject.fetchModel(identifier: "Message", ownid: AccountManager.shared.id()) as! [Message]
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
index 92aef7a..fed9ef1 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
@@ -16,6 +16,12 @@ class MyChildrenViewController: UIViewController{
         super.viewDidLoad()
         layoutSubViews()
     }
+    override func loadView() {
+        super.loadView()
+        //防止tabbar隐藏导致页面跳一下
+        self.tabBarController?.tabBar.isHidden = true
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
+    }
     // MARK: - 设置控件属性
     func layoutSubViews(){
         self.childrenTableView.emptyDataSetSource = self
@@ -27,6 +33,7 @@ class MyChildrenViewController: UIViewController{
         for j in AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue {
             myChildrens.append(StudentClassInfo(json: j))
         }
+        
     }
     // MARK: - 添加绑定账号
     @IBAction func addChildrenAction(_ sender: UIButton) {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
index fbe12a0..39f1d33 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
@@ -49,14 +49,14 @@ class MyViewController: UIViewController {
     // MARK: - 页面将要显示时隐藏navigationbar显示自定义的顶部view
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        self.navigationController?.isNavigationBarHidden = true
+        self.navigationController?.setNavigationBarHidden(true, animated: true)
         // MARK: - 设置是否登录及个人信息
         setupCurrentInfo()
     }
     // MARK: - 页面将要消失时显示navigationbar
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        self.navigationController?.isNavigationBarHidden = false
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
     }
     // MARK: - 设置是否登录及个人信息
     func setupCurrentInfo() {
@@ -180,7 +180,8 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
             if !AccountManager.shared.isOnline() {
                 return 0
             }
-            if AccountManager.shared.isOnline() && AccountManager.shared.name()=="葛建军" && (indexPath.row == 1 || indexPath.row == 2){//隐藏支付相关功能
+            //"zy105428"
+            if AccountManager.shared.isOnline() && AccountManager.shared.id()=="zy10542" && (indexPath.row == 1 || indexPath.row == 2){//隐藏支付相关功能
                 return 0
             }else{
                 return 44
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/OrderDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/OrderDetailViewController.swift
index 07c4458..a441f1e 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/OrderDetailViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/OrderDetailViewController.swift
@@ -15,6 +15,12 @@ class OrderDetailViewController: UIViewController {
         super.viewDidLoad()
         setUpWithModel()
     }
+    override func loadView() {
+        super.loadView()
+        //防止tabbar隐藏导致页面跳一下
+        self.tabBarController?.tabBar.isHidden = true
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
+    }
     // MARK: - 获取数据并刷新页面
     func setUpWithModel(){
         SVProgressHUD.show()
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift
index 96921a6..d85cb8c 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift
@@ -112,7 +112,6 @@ class RegisterViewController: UIViewController,UITextFieldDelegate {
                             self.navigationController?.popViewController(animated: true)
                         }
                         let showBtn = UIAlertAction(title: "进入首页", style: UIAlertActionStyle.default) { (action) in
-                            self.navigationController?.popToRootViewController(animated: true)
                             //登录
                             SVProgressHUD.show(withStatus: "登录中...")
                             HTTPServer.shared.login(completionHandler: { (str, error) in
@@ -151,6 +150,7 @@ class RegisterViewController: UIViewController,UITextFieldDelegate {
                                                         AccountManager.shared.logOut()
                                                         appDelegate.window!.makeToast("聊天服务登录失败，请连接网络重试")
                                                     }else{
+                                                        self.navigationController?.popToRootViewController(animated: true)
                                                         //云信登录成功
                                                         self.dismiss(animated: true, completion: nil)
                                                     }
diff --git a/ParentAssistant/ParentAssistant/Classes/util/network.swift b/ParentAssistant/ParentAssistant/Classes/util/network.swift
index d0881c9..3c67f27 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/network.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/network.swift
@@ -111,7 +111,7 @@ final class HTTPServer{
     static var URL_IDENTITYCONFRIM = HOST+"/api/Account/IdentityConfrim"
     
     static var URL_PARENTREGISTER = HOST+"/api/ParentHelper/ParentRegister"//家长注册
-    static var URL_CAPTCHA=HOST+"/api/Account/Captcha"//获取注册验证码
+    static var URL_CAPTCHA=HOST+"/api/Account/ChangePhoneCaptcha"//获取注册验证码
     static var URL_GETPARENTINFO = HOST+"/api/ParentHelper/GetParentInfo"//登录获取家长信息（包括关联的孩子信息区分绑定状态)
     static var URL_UPDATEPARENTINFO = HOST+"/api/ParentHelper/UpdateParentInfo"//更新姓名和性别
     static var URL_GETORDERLIST = HOST+"/api/ParentHelper/GetOrderList"//获取我的短信包列表
diff --git a/ParentAssistant/ParentAssistant/Classes/util/utils.swift b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
index 51362c9..94afb9f 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/utils.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
@@ -12,7 +12,7 @@ import Photos
 //MARK: - 服务器和log打印设置
 class Debug{
     static let enable=false//是否打印log
-    static let isFormal=false//是否是正式服务器
+    static let isFormal=true//是否是正式服务器
     class func log(_ msg:String){
         if(!Debug.enable){
             return
diff --git a/ParentAssistant/ParentAssistant/Classes/util/view/TableEmptyView.xib b/ParentAssistant/ParentAssistant/Classes/util/view/TableEmptyView.xib
index 17a227b..b3ac940 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/view/TableEmptyView.xib
+++ b/ParentAssistant/ParentAssistant/Classes/util/view/TableEmptyView.xib
@@ -18,8 +18,8 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r6f-bH-pWm">
                     <rect key="frame" x="10" y="149" width="300" height="230"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" image="emptyset_2" translatesAutoresizingMaskIntoConstraints="NO" id="h6u-NQ-lUD">
-                            <rect key="frame" x="83" y="8" width="134" height="179"/>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="h6u-NQ-lUD">
+                            <rect key="frame" x="142" y="8" width="16" height="179"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8YM-oz-SdO">
                             <rect key="frame" x="129" y="205" width="42" height="21"/>
@@ -68,6 +68,6 @@
         </view>
     </objects>
     <resources>
-        <image name="emptyset_2" width="134" height="133"/>
+        <image name="icon" width="16" height="16"/>
     </resources>
 </document>
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/Contents.json
new file mode 100644
index 0000000..9eb4a57
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "activite1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/activite1.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/activite1.png
new file mode 100644
index 0000000..ab0cc4c
Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/activite1.png differ
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/Contents.json
new file mode 100644
index 0000000..4379d94
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "activite2.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/activite2.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/activite2.png
new file mode 100644
index 0000000..c5d71f9
Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/activite2.png differ
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/Contents.json
new file mode 100644
index 0000000..40ad0b6
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "activite3.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/activite3.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/activite3.png
new file mode 100644
index 0000000..72cf698
Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/activite3.png differ
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/3_01.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/3_01.png
new file mode 100644
index 0000000..915b5cb
Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/3_01.png differ
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/Contents.json
new file mode 100644
index 0000000..8ee4dde
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "3_01.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/3_02.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/3_02.png
new file mode 100644
index 0000000..f9113f8
Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/3_02.png differ
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/Contents.json
new file mode 100644
index 0000000..06c1350
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "3_02.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
index 9683b9d..84367e7 100644
--- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
@@ -64,14 +64,17 @@
                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7">
                                                                         <rect key="frame" x="14.5" y="49.5" width="150" height="150"/>
                                                                         <subviews>
-                                                                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training" translatesAutoresizingMaskIntoConstraints="NO" id="jM3-pe-HNZ">
+                                                                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training_back" translatesAutoresizingMaskIntoConstraints="NO" id="Ck8-NZ-jI4">
+                                                                                <rect key="frame" x="0.0" y="-0.5" width="150" height="150"/>
+                                                                            </imageView>
+                                                                            <imageView hidden="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training" translatesAutoresizingMaskIntoConstraints="NO" id="jM3-pe-HNZ">
                                                                                 <rect key="frame" x="50" y="50" width="50" height="50"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="width" secondItem="jM3-pe-HNZ" secondAttribute="height" multiplier="1:1" id="9C5-F1-Q52"/>
                                                                                     <constraint firstAttribute="width" constant="50" id="OAh-S9-pJU"/>
                                                                                 </constraints>
                                                                             </imageView>
-                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="专项训练" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lMI-9m-Zal">
+                                                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="专项训练" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lMI-9m-Zal">
                                                                                 <rect key="frame" x="44.5" y="121" width="61.5" height="21"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="21" id="Ygr-K0-eFk"/>
@@ -87,7 +90,7 @@
                                                                                 </connections>
                                                                             </button>
                                                                         </subviews>
-                                                                        <color key="backgroundColor" red="0.39705835388445299" green="1" blue="0.97920779819417048" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                         <constraints>
                                                                             <constraint firstItem="lMI-9m-Zal" firstAttribute="top" secondItem="jM3-pe-HNZ" secondAttribute="bottom" constant="21" id="2yg-E5-PY1"/>
                                                                             <constraint firstItem="DjB-iQ-LaT" firstAttribute="leading" secondItem="CKI-XD-Eo7" secondAttribute="leading" id="4dA-Mq-Ul4"/>
@@ -95,10 +98,14 @@
                                                                             <constraint firstItem="jM3-pe-HNZ" firstAttribute="centerY" secondItem="CKI-XD-Eo7" secondAttribute="centerY" id="HP1-hk-di8"/>
                                                                             <constraint firstAttribute="trailing" secondItem="DjB-iQ-LaT" secondAttribute="trailing" id="OIA-L4-g1n"/>
                                                                             <constraint firstAttribute="width" constant="150" id="RGQ-Uh-sQh"/>
+                                                                            <constraint firstItem="Ck8-NZ-jI4" firstAttribute="leading" secondItem="CKI-XD-Eo7" secondAttribute="leading" id="Spi-nv-14s"/>
+                                                                            <constraint firstAttribute="trailing" secondItem="Ck8-NZ-jI4" secondAttribute="trailing" id="cgp-Iz-RSU"/>
                                                                             <constraint firstItem="jM3-pe-HNZ" firstAttribute="centerX" secondItem="CKI-XD-Eo7" secondAttribute="centerX" id="fPw-Rq-f06"/>
                                                                             <constraint firstItem="lMI-9m-Zal" firstAttribute="centerX" secondItem="CKI-XD-Eo7" secondAttribute="centerX" id="mOJ-4Z-xW1"/>
                                                                             <constraint firstAttribute="bottom" secondItem="DjB-iQ-LaT" secondAttribute="bottom" id="pta-jf-lKE"/>
                                                                             <constraint firstAttribute="width" secondItem="CKI-XD-Eo7" secondAttribute="height" multiplier="1:1" id="qLV-s3-y6S"/>
+                                                                            <constraint firstAttribute="bottom" secondItem="Ck8-NZ-jI4" secondAttribute="bottom" id="r5M-3o-ycB"/>
+                                                                            <constraint firstItem="Ck8-NZ-jI4" firstAttribute="top" secondItem="CKI-XD-Eo7" secondAttribute="top" id="tG5-lG-ekP"/>
                                                                         </constraints>
                                                                         <userDefinedRuntimeAttributes>
                                                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -121,7 +128,10 @@
                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7">
                                                                         <rect key="frame" x="15" y="49.5" width="150" height="150"/>
                                                                         <subviews>
-                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="学情检测" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2RT-ZA-65V">
+                                                                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_detection_back" translatesAutoresizingMaskIntoConstraints="NO" id="ApZ-G6-QJ9">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="150" height="150"/>
+                                                                            </imageView>
+                                                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="学情检测" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2RT-ZA-65V">
                                                                                 <rect key="frame" x="45" y="121" width="61.5" height="21"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="21" id="6RD-Df-Mm4"/>
@@ -130,7 +140,7 @@
                                                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
-                                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_learningManagement" translatesAutoresizingMaskIntoConstraints="NO" id="9ln-nr-VzA">
+                                                                            <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_learningManagement" translatesAutoresizingMaskIntoConstraints="NO" id="9ln-nr-VzA">
                                                                                 <rect key="frame" x="50.5" y="50" width="50" height="50"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="width" constant="50" id="4wp-cr-ltM"/>
@@ -144,13 +154,17 @@
                                                                                 </connections>
                                                                             </button>
                                                                         </subviews>
-                                                                        <color key="backgroundColor" red="0.61174042456188515" green="0.82746609543490623" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                         <constraints>
+                                                                            <constraint firstItem="ApZ-G6-QJ9" firstAttribute="leading" secondItem="1z3-Uc-my7" secondAttribute="leading" id="05A-25-nEo"/>
                                                                             <constraint firstItem="9ln-nr-VzA" firstAttribute="centerX" secondItem="1z3-Uc-my7" secondAttribute="centerX" id="KfB-Qi-0ZA"/>
                                                                             <constraint firstItem="ROd-Hw-Km6" firstAttribute="leading" secondItem="1z3-Uc-my7" secondAttribute="leading" id="TCz-AY-Zqd"/>
                                                                             <constraint firstItem="9ln-nr-VzA" firstAttribute="centerY" secondItem="1z3-Uc-my7" secondAttribute="centerY" id="Tfz-CR-wHW"/>
                                                                             <constraint firstItem="2RT-ZA-65V" firstAttribute="top" secondItem="9ln-nr-VzA" secondAttribute="bottom" constant="21" id="Vq7-Vh-JcW"/>
+                                                                            <constraint firstAttribute="trailing" secondItem="ApZ-G6-QJ9" secondAttribute="trailing" id="Wex-Un-omp"/>
+                                                                            <constraint firstItem="ApZ-G6-QJ9" firstAttribute="top" secondItem="1z3-Uc-my7" secondAttribute="top" id="Zup-39-h6x"/>
                                                                             <constraint firstAttribute="bottom" secondItem="ROd-Hw-Km6" secondAttribute="bottom" id="l1w-4Q-Zlk"/>
+                                                                            <constraint firstAttribute="bottom" secondItem="ApZ-G6-QJ9" secondAttribute="bottom" id="mZC-Vg-luo"/>
                                                                             <constraint firstAttribute="width" constant="150" id="mdM-Dj-z5q"/>
                                                                             <constraint firstItem="2RT-ZA-65V" firstAttribute="centerX" secondItem="1z3-Uc-my7" secondAttribute="centerX" id="nTc-V9-qbv"/>
                                                                             <constraint firstAttribute="width" secondItem="1z3-Uc-my7" secondAttribute="height" multiplier="1:1" id="otI-Su-s6E"/>
@@ -253,7 +267,7 @@
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK">
                                                         <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
                                                         <subviews>
-                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo">
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite1" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo">
                                                                 <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
                                                             </imageView>
                                                             <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI">
@@ -305,7 +319,7 @@
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r">
                                                         <rect key="frame" x="183.5" y="92" width="175.5" height="83.5"/>
                                                         <subviews>
-                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3">
+                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3">
                                                                 <rect key="frame" x="0.0" y="0.0" width="175.5" height="83.5"/>
                                                             </imageView>
                                                             <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw">
@@ -356,7 +370,7 @@
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW">
                                                         <rect key="frame" x="183.5" y="0.0" width="175.5" height="84"/>
                                                         <subviews>
-                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
+                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite2" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
                                                                 <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
                                                             </imageView>
                                                             <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB">
@@ -2148,10 +2162,15 @@
         <image name="Information_bar_icon_select" width="22" height="20"/>
         <image name="evaluation_bar_icon" width="22" height="21"/>
         <image name="evaluation_bar_icon_select" width="22" height="21"/>
+        <image name="evaluation_icon_activite1" width="200" height="300"/>
+        <image name="evaluation_icon_activite2" width="200" height="100"/>
+        <image name="evaluation_icon_activite3" width="200" height="100"/>
         <image name="evaluation_icon_camera" width="32" height="32"/>
+        <image name="evaluation_icon_detection_back" width="150" height="140"/>
         <image name="evaluation_icon_learningManagement" width="45" height="47"/>
         <image name="evaluation_icon_play" width="59" height="59"/>
         <image name="evaluation_icon_training" width="47" height="47"/>
+        <image name="evaluation_icon_training_back" width="150" height="140"/>
         <image name="moral_bg" width="690" height="430"/>
         <image name="my_bar_icon" width="19" height="22"/>
         <image name="my_bar_icon_select" width="19" height="22"/>
@@ -2162,11 +2181,7 @@
         <image name="navigationBar_backgrounImage" width="375" height="139"/>
         <image name="report_bar_icon" width="22" height="20"/>
         <image name="report_bar_icon_select" width="22" height="20"/>
-        <image name="report_teacher" width="130" height="155"/>
         <image name="report_none_icon" width="250" height="250"/>
-        <image name="test001" width="540" height="278"/>
-        <image name="test002" width="216" height="282"/>
-        <image name="test003" width="732" height="388"/>
-
+        <image name="report_teacher" width="130" height="155"/>
     </resources>
 </document>
--
libgit2 0.21.0