IOSGroup / ParentAssistant

Download as
Browse Code »

Commit b1214481466284e15f6bd0e8658e0ef5728a7400

Authored by 葛建军
1 parent 62b816d3
Exists in parentassistant

no message

Showing 22 changed files with 174 additions and 28 deletions   Show diff stats
ParentAssistant/ParentAssistant/AppDelegate.swift
  Diff comments   View file @b121448
... ... @@ -73,6 +73,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
73 73 httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
74 74 if json["status"] == 1 && error == nil{
75 75 if json.contentData().arrayValue.count>0 {
  76 + NSLog("************\(HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)")
76 77 let imageResource = ZLaunchAdImageResourceConfigure()
77 78 imageResource.imageNameOrImageURL = HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
78 79 imageResource.imageDuration = 5
... ... @@ -80,13 +81,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
80 81 adView.setImageResource(imageResource, action: {
81 82 /// 广告点击
82 83 })
  84 + }else{
  85 + NSLog("************\(json.contentData())");
83 86 }
84 87 }
85 88 }, failHandler: { (error) in
86 89 })
87 90 })
88 91 }else{
89   -// Thread.sleep(forTimeInterval: 5.0)//延长启动页面10秒
90 92 let view = UIView(frame: CGRect(x: 0, y: 0, width: getScreenWidth(), height: getScreenHeight()))
91 93 view.backgroundColor = UIColor.white
92 94 vc.view.addSubview(view)
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
  Diff comments   View file @b121448
... ... @@ -31,8 +31,7 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
31 31 searchView.placeholder = "请输入搜索内容"
32 32 searchView.showsCancelButton = false
33 33 self.navigationItem.titleView = searchView
34   - self.configTheme()
35   -
  34 + self.navigationController?.navigationBar.tintColor=UIColor.white
36 35 }
37 36  
38 37 func getData(){
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift
  Diff comments   View file @b121448
... ... @@ -18,14 +18,19 @@ class LoginViewController: UIViewController,UITextFieldDelegate {
18 18 override func viewDidLoad() {
19 19 super.viewDidLoad()
20 20 layoutSubViews()
  21 +
  22 + }
  23 + override func loadView() {
  24 + super.loadView()
  25 + //防止tabbar隐藏导致页面跳一下
  26 + self.tabBarController?.tabBar.isHidden = true
  27 + self.navigationController?.setNavigationBarHidden(false, animated: true)
21 28 }
22 29 override func viewWillAppear(_ animated: Bool) {
23 30 super.viewWillAppear(animated)
24   - self.navigationController?.navigationBar.isHidden = false
25 31 }
26 32 // MARK: - 设置控件属性
27 33 func layoutSubViews(){
28   - self.navigationController?.navigationBar.isHidden = false
29 34 self.navigationItem.title = "登录"
30 35 topView.constant = (getScreenHeight()-325)/3
31 36 passwordHiddenBtn.setImage(UIImage(named: "my_password_look"), for: UIControlState.selected)
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MessageViewController.swift
  Diff comments   View file @b121448
... ... @@ -17,6 +17,12 @@ class MessageViewController: UIViewController {
17 17 setupWithModel()
18 18 NotificationCenter.default.addObserver(self, selector: #selector(MessageViewController.receivedNewNotificationAction), name: NSNotification.Name(rawValue: MessageNotification.receiveMessage), object: nil)
19 19 }
  20 + override func loadView() {
  21 + super.loadView()
  22 + //防止tabbar隐藏导致页面跳一下
  23 + self.tabBarController?.tabBar.isHidden = true
  24 + self.navigationController?.setNavigationBarHidden(false, animated: true)
  25 + }
20 26 //本地数据查找并赋值显示
21 27 func setupWithModel(){
22 28 dataSet = NSManagedObject.fetchModel(identifier: "Message", ownid: AccountManager.shared.id()) as! [Message]
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
  Diff comments   View file @b121448
... ... @@ -16,6 +16,12 @@ class MyChildrenViewController: UIViewController{
16 16 super.viewDidLoad()
17 17 layoutSubViews()
18 18 }
  19 + override func loadView() {
  20 + super.loadView()
  21 + //防止tabbar隐藏导致页面跳一下
  22 + self.tabBarController?.tabBar.isHidden = true
  23 + self.navigationController?.setNavigationBarHidden(false, animated: true)
  24 + }
19 25 // MARK: - 设置控件属性
20 26 func layoutSubViews(){
21 27 self.childrenTableView.emptyDataSetSource = self
... ... @@ -27,6 +33,7 @@ class MyChildrenViewController: UIViewController{
27 33 for j in AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue {
28 34 myChildrens.append(StudentClassInfo(json: j))
29 35 }
  36 +
30 37 }
31 38 // MARK: - 添加绑定账号
32 39 @IBAction func addChildrenAction(_ sender: UIButton) {
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
  Diff comments   View file @b121448
... ... @@ -49,14 +49,14 @@ class MyViewController: UIViewController {
49 49 // MARK: - 页面将要显示时隐藏navigationbar显示自定义的顶部view
50 50 override func viewWillAppear(_ animated: Bool) {
51 51 super.viewWillAppear(animated)
52   - self.navigationController?.isNavigationBarHidden = true
  52 + self.navigationController?.setNavigationBarHidden(true, animated: true)
53 53 // MARK: - 设置是否登录及个人信息
54 54 setupCurrentInfo()
55 55 }
56 56 // MARK: - 页面将要消失时显示navigationbar
57 57 override func viewWillDisappear(_ animated: Bool) {
58 58 super.viewWillDisappear(animated)
59   - self.navigationController?.isNavigationBarHidden = false
  59 + self.navigationController?.setNavigationBarHidden(false, animated: true)
60 60 }
61 61 // MARK: - 设置是否登录及个人信息
62 62 func setupCurrentInfo() {
... ... @@ -180,7 +180,8 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
180 180 if !AccountManager.shared.isOnline() {
181 181 return 0
182 182 }
183   - if AccountManager.shared.isOnline() && AccountManager.shared.name()=="葛建军" && (indexPath.row == 1 || indexPath.row == 2){//隐藏支付相关功能
  183 + //"zy105428"
  184 + if AccountManager.shared.isOnline() && AccountManager.shared.id()=="zy10542" && (indexPath.row == 1 || indexPath.row == 2){//隐藏支付相关功能
184 185 return 0
185 186 }else{
186 187 return 44
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/OrderDetailViewController.swift
  Diff comments   View file @b121448
... ... @@ -15,6 +15,12 @@ class OrderDetailViewController: UIViewController {
15 15 super.viewDidLoad()
16 16 setUpWithModel()
17 17 }
  18 + override func loadView() {
  19 + super.loadView()
  20 + //防止tabbar隐藏导致页面跳一下
  21 + self.tabBarController?.tabBar.isHidden = true
  22 + self.navigationController?.setNavigationBarHidden(false, animated: true)
  23 + }
18 24 // MARK: - 获取数据并刷新页面
19 25 func setUpWithModel(){
20 26 SVProgressHUD.show()
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift
  Diff comments   View file @b121448
... ... @@ -112,7 +112,6 @@ class RegisterViewController: UIViewController,UITextFieldDelegate {
112 112 self.navigationController?.popViewController(animated: true)
113 113 }
114 114 let showBtn = UIAlertAction(title: "进入首页", style: UIAlertActionStyle.default) { (action) in
115   - self.navigationController?.popToRootViewController(animated: true)
116 115 //登录
117 116 SVProgressHUD.show(withStatus: "登录中...")
118 117 HTTPServer.shared.login(completionHandler: { (str, error) in
... ... @@ -151,6 +150,7 @@ class RegisterViewController: UIViewController,UITextFieldDelegate {
151 150 AccountManager.shared.logOut()
152 151 appDelegate.window!.makeToast("聊天服务登录失败，请连接网络重试")
153 152 }else{
  153 + self.navigationController?.popToRootViewController(animated: true)
154 154 //云信登录成功
155 155 self.dismiss(animated: true, completion: nil)
156 156 }
... ...
ParentAssistant/ParentAssistant/Classes/util/network.swift
  Diff comments   View file @b121448
... ... @@ -111,7 +111,7 @@ final class HTTPServer{
111 111 static var URL_IDENTITYCONFRIM = HOST+"/api/Account/IdentityConfrim"
112 112  
113 113 static var URL_PARENTREGISTER = HOST+"/api/ParentHelper/ParentRegister"//家长注册
114   - static var URL_CAPTCHA=HOST+"/api/Account/Captcha"//获取注册验证码
  114 + static var URL_CAPTCHA=HOST+"/api/Account/ChangePhoneCaptcha"//获取注册验证码
115 115 static var URL_GETPARENTINFO = HOST+"/api/ParentHelper/GetParentInfo"//登录获取家长信息（包括关联的孩子信息区分绑定状态)
116 116 static var URL_UPDATEPARENTINFO = HOST+"/api/ParentHelper/UpdateParentInfo"//更新姓名和性别
117 117 static var URL_GETORDERLIST = HOST+"/api/ParentHelper/GetOrderList"//获取我的短信包列表
... ...
ParentAssistant/ParentAssistant/Classes/util/utils.swift
  Diff comments   View file @b121448
... ... @@ -12,7 +12,7 @@ import Photos
12 12 //MARK: - 服务器和log打印设置
13 13 class Debug{
14 14 static let enable=false//是否打印log
15   - static let isFormal=false//是否是正式服务器
  15 + static let isFormal=true//是否是正式服务器
16 16 class func log(_ msg:String){
17 17 if(!Debug.enable){
18 18 return
... ...
ParentAssistant/ParentAssistant/Classes/util/view/TableEmptyView.xib
  Diff comments   View file @b121448
... ... @@ -18,8 +18,8 @@
18 18 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r6f-bH-pWm">
19 19 <rect key="frame" x="10" y="149" width="300" height="230"/>
20 20 <subviews>
21   - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" image="emptyset_2" translatesAutoresizingMaskIntoConstraints="NO" id="h6u-NQ-lUD">
22   - <rect key="frame" x="83" y="8" width="134" height="179"/>
  21 + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="h6u-NQ-lUD">
  22 + <rect key="frame" x="142" y="8" width="16" height="179"/>
23 23 </imageView>
24 24 <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">
25 25 <rect key="frame" x="129" y="205" width="42" height="21"/>
... ... @@ -68,6 +68,6 @@
68 68 </view>
69 69 </objects>
70 70 <resources>
71   - <image name="emptyset_2" width="134" height="133"/>
  71 + <image name="icon" width="16" height="16"/>
72 72 </resources>
73 73 </document>
... ...
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/Contents.json 0 → 100644
  Diff comments   View file @b121448
... ... @@ -0,0 +1,21 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "activite1.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite1.imageset/activite1.png 0 → 100644
View file @b121448

83.3 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/Contents.json 0 → 100644
  Diff comments   View file @b121448
... ... @@ -0,0 +1,21 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "activite2.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite2.imageset/activite2.png 0 → 100644
View file @b121448

101 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/Contents.json 0 → 100644
  Diff comments   View file @b121448
... ... @@ -0,0 +1,21 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "activite3.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_activite3.imageset/activite3.png 0 → 100644
View file @b121448

119 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/3_01.png 0 → 100644
View file @b121448

57.3 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_detection_back.imageset/Contents.json 0 → 100644
  Diff comments   View file @b121448
... ... @@ -0,0 +1,21 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "3_01.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/3_02.png 0 → 100644
View file @b121448

45.5 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_training_back.imageset/Contents.json 0 → 100644
  Diff comments   View file @b121448
... ... @@ -0,0 +1,21 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "3_02.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
  Diff comments   View file @b121448
... ... @@ -64,14 +64,17 @@
64 64 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7">
65 65 <rect key="frame" x="14.5" y="49.5" width="150" height="150"/>
66 66 <subviews>
67   - <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training" translatesAutoresizingMaskIntoConstraints="NO" id="jM3-pe-HNZ">
  67 + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training_back" translatesAutoresizingMaskIntoConstraints="NO" id="Ck8-NZ-jI4">
  68 + <rect key="frame" x="0.0" y="-0.5" width="150" height="150"/>
  69 + </imageView>
  70 + <imageView hidden="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training" translatesAutoresizingMaskIntoConstraints="NO" id="jM3-pe-HNZ">
68 71 <rect key="frame" x="50" y="50" width="50" height="50"/>
69 72 <constraints>
70 73 <constraint firstAttribute="width" secondItem="jM3-pe-HNZ" secondAttribute="height" multiplier="1:1" id="9C5-F1-Q52"/>
71 74 <constraint firstAttribute="width" constant="50" id="OAh-S9-pJU"/>
72 75 </constraints>
73 76 </imageView>
74   - <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">
  77 + <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">
75 78 <rect key="frame" x="44.5" y="121" width="61.5" height="21"/>
76 79 <constraints>
77 80 <constraint firstAttribute="height" constant="21" id="Ygr-K0-eFk"/>
... ... @@ -87,7 +90,7 @@
87 90 </connections>
88 91 </button>
89 92 </subviews>
90   - <color key="backgroundColor" red="0.39705835388445299" green="1" blue="0.97920779819417048" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  93 + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
91 94 <constraints>
92 95 <constraint firstItem="lMI-9m-Zal" firstAttribute="top" secondItem="jM3-pe-HNZ" secondAttribute="bottom" constant="21" id="2yg-E5-PY1"/>
93 96 <constraint firstItem="DjB-iQ-LaT" firstAttribute="leading" secondItem="CKI-XD-Eo7" secondAttribute="leading" id="4dA-Mq-Ul4"/>
... ... @@ -95,10 +98,14 @@
95 98 <constraint firstItem="jM3-pe-HNZ" firstAttribute="centerY" secondItem="CKI-XD-Eo7" secondAttribute="centerY" id="HP1-hk-di8"/>
96 99 <constraint firstAttribute="trailing" secondItem="DjB-iQ-LaT" secondAttribute="trailing" id="OIA-L4-g1n"/>
97 100 <constraint firstAttribute="width" constant="150" id="RGQ-Uh-sQh"/>
  101 + <constraint firstItem="Ck8-NZ-jI4" firstAttribute="leading" secondItem="CKI-XD-Eo7" secondAttribute="leading" id="Spi-nv-14s"/>
  102 + <constraint firstAttribute="trailing" secondItem="Ck8-NZ-jI4" secondAttribute="trailing" id="cgp-Iz-RSU"/>
98 103 <constraint firstItem="jM3-pe-HNZ" firstAttribute="centerX" secondItem="CKI-XD-Eo7" secondAttribute="centerX" id="fPw-Rq-f06"/>
99 104 <constraint firstItem="lMI-9m-Zal" firstAttribute="centerX" secondItem="CKI-XD-Eo7" secondAttribute="centerX" id="mOJ-4Z-xW1"/>
100 105 <constraint firstAttribute="bottom" secondItem="DjB-iQ-LaT" secondAttribute="bottom" id="pta-jf-lKE"/>
101 106 <constraint firstAttribute="width" secondItem="CKI-XD-Eo7" secondAttribute="height" multiplier="1:1" id="qLV-s3-y6S"/>
  107 + <constraint firstAttribute="bottom" secondItem="Ck8-NZ-jI4" secondAttribute="bottom" id="r5M-3o-ycB"/>
  108 + <constraint firstItem="Ck8-NZ-jI4" firstAttribute="top" secondItem="CKI-XD-Eo7" secondAttribute="top" id="tG5-lG-ekP"/>
102 109 </constraints>
103 110 <userDefinedRuntimeAttributes>
104 111 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
... ... @@ -121,7 +128,10 @@
121 128 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7">
122 129 <rect key="frame" x="15" y="49.5" width="150" height="150"/>
123 130 <subviews>
124   - <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">
  131 + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_detection_back" translatesAutoresizingMaskIntoConstraints="NO" id="ApZ-G6-QJ9">
  132 + <rect key="frame" x="0.0" y="0.0" width="150" height="150"/>
  133 + </imageView>
  134 + <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">
125 135 <rect key="frame" x="45" y="121" width="61.5" height="21"/>
126 136 <constraints>
127 137 <constraint firstAttribute="height" constant="21" id="6RD-Df-Mm4"/>
... ... @@ -130,7 +140,7 @@
130 140 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
131 141 <nil key="highlightedColor"/>
132 142 </label>
133   - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_learningManagement" translatesAutoresizingMaskIntoConstraints="NO" id="9ln-nr-VzA">
  143 + <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_learningManagement" translatesAutoresizingMaskIntoConstraints="NO" id="9ln-nr-VzA">
134 144 <rect key="frame" x="50.5" y="50" width="50" height="50"/>
135 145 <constraints>
136 146 <constraint firstAttribute="width" constant="50" id="4wp-cr-ltM"/>
... ... @@ -144,13 +154,17 @@
144 154 </connections>
145 155 </button>
146 156 </subviews>
147   - <color key="backgroundColor" red="0.61174042456188515" green="0.82746609543490623" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  157 + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
148 158 <constraints>
  159 + <constraint firstItem="ApZ-G6-QJ9" firstAttribute="leading" secondItem="1z3-Uc-my7" secondAttribute="leading" id="05A-25-nEo"/>
149 160 <constraint firstItem="9ln-nr-VzA" firstAttribute="centerX" secondItem="1z3-Uc-my7" secondAttribute="centerX" id="KfB-Qi-0ZA"/>
150 161 <constraint firstItem="ROd-Hw-Km6" firstAttribute="leading" secondItem="1z3-Uc-my7" secondAttribute="leading" id="TCz-AY-Zqd"/>
151 162 <constraint firstItem="9ln-nr-VzA" firstAttribute="centerY" secondItem="1z3-Uc-my7" secondAttribute="centerY" id="Tfz-CR-wHW"/>
152 163 <constraint firstItem="2RT-ZA-65V" firstAttribute="top" secondItem="9ln-nr-VzA" secondAttribute="bottom" constant="21" id="Vq7-Vh-JcW"/>
  164 + <constraint firstAttribute="trailing" secondItem="ApZ-G6-QJ9" secondAttribute="trailing" id="Wex-Un-omp"/>
  165 + <constraint firstItem="ApZ-G6-QJ9" firstAttribute="top" secondItem="1z3-Uc-my7" secondAttribute="top" id="Zup-39-h6x"/>
153 166 <constraint firstAttribute="bottom" secondItem="ROd-Hw-Km6" secondAttribute="bottom" id="l1w-4Q-Zlk"/>
  167 + <constraint firstAttribute="bottom" secondItem="ApZ-G6-QJ9" secondAttribute="bottom" id="mZC-Vg-luo"/>
154 168 <constraint firstAttribute="width" constant="150" id="mdM-Dj-z5q"/>
155 169 <constraint firstItem="2RT-ZA-65V" firstAttribute="centerX" secondItem="1z3-Uc-my7" secondAttribute="centerX" id="nTc-V9-qbv"/>
156 170 <constraint firstAttribute="width" secondItem="1z3-Uc-my7" secondAttribute="height" multiplier="1:1" id="otI-Su-s6E"/>
... ... @@ -253,7 +267,7 @@
253 267 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK">
254 268 <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
255 269 <subviews>
256   - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo">
  270 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite1" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo">
257 271 <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
258 272 </imageView>
259 273 <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 @@
305 319 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r">
306 320 <rect key="frame" x="183.5" y="92" width="175.5" height="83.5"/>
307 321 <subviews>
308   - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3">
  322 + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3">
309 323 <rect key="frame" x="0.0" y="0.0" width="175.5" height="83.5"/>
310 324 </imageView>
311 325 <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 @@
356 370 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW">
357 371 <rect key="frame" x="183.5" y="0.0" width="175.5" height="84"/>
358 372 <subviews>
359   - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
  373 + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite2" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
360 374 <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
361 375 </imageView>
362 376 <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 @@
2148 2162 <image name="Information_bar_icon_select" width="22" height="20"/>
2149 2163 <image name="evaluation_bar_icon" width="22" height="21"/>
2150 2164 <image name="evaluation_bar_icon_select" width="22" height="21"/>
  2165 + <image name="evaluation_icon_activite1" width="200" height="300"/>
  2166 + <image name="evaluation_icon_activite2" width="200" height="100"/>
  2167 + <image name="evaluation_icon_activite3" width="200" height="100"/>
2151 2168 <image name="evaluation_icon_camera" width="32" height="32"/>
  2169 + <image name="evaluation_icon_detection_back" width="150" height="140"/>
2152 2170 <image name="evaluation_icon_learningManagement" width="45" height="47"/>
2153 2171 <image name="evaluation_icon_play" width="59" height="59"/>
2154 2172 <image name="evaluation_icon_training" width="47" height="47"/>
  2173 + <image name="evaluation_icon_training_back" width="150" height="140"/>
2155 2174 <image name="moral_bg" width="690" height="430"/>
2156 2175 <image name="my_bar_icon" width="19" height="22"/>
2157 2176 <image name="my_bar_icon_select" width="19" height="22"/>
... ... @@ -2162,11 +2181,7 @@
2162 2181 <image name="navigationBar_backgrounImage" width="375" height="139"/>
2163 2182 <image name="report_bar_icon" width="22" height="20"/>
2164 2183 <image name="report_bar_icon_select" width="22" height="20"/>
2165   - <image name="report_teacher" width="130" height="155"/>
2166 2184 <image name="report_none_icon" width="250" height="250"/>
2167   - <image name="test001" width="540" height="278"/>
2168   - <image name="test002" width="216" height="282"/>
2169   - <image name="test003" width="732" height="388"/>
2170   -
  2185 + <image name="report_teacher" width="130" height="155"/>
2171 2186 </resources>
2172 2187 </document>
... ...