From ed74e82ac599be6406bbb9e9c55bba164e581eff Mon Sep 17 00:00:00 2001
From: 葛建军 <jun@gejianjundeMac-mini.local>
Date: Fri, 26 May 2017 11:19:58 +0800
Subject: [PATCH] no message

---
 YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard                              |  2 +-
 YouerLiveVideo/YouerLiveVideo/Info.plist                                              |  2 +-
 YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift  |  1 +
 YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift | 23 +++++++++++++++++++++++
 YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard                        |  4 ++--
 YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift           |  4 ++++
 6 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
index 911db97..6eb23e2 100644
--- a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
@@ -869,7 +869,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bvl-OP-Mho">
                                 <rect key="frame" x="0.0" y="79" width="375" height="90"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defphoto.png" translatesAutoresizingMaskIntoConstraints="NO" id="brI-5l-hmz">
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defphoto.png" translatesAutoresizingMaskIntoConstraints="NO" id="brI-5l-hmz">
                                         <rect key="frame" x="16" y="20" width="47" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="VpN-jf-Kgx"/>
diff --git a/YouerLiveVideo/YouerLiveVideo/Info.plist b/YouerLiveVideo/YouerLiveVideo/Info.plist
index bbb28a4..62f7034 100644
--- a/YouerLiveVideo/YouerLiveVideo/Info.plist
+++ b/YouerLiveVideo/YouerLiveVideo/Info.plist
@@ -56,7 +56,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>mqqopensdkapiV2</string>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift
index 11f09a2..5030b87 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift
@@ -29,6 +29,7 @@ class MainHomeTableViewController: UITableViewController {
         photo.sd_setImage(with: URL(string: user.photo()), placeholderImage: UIImage(named: "defphoto"))
         photo.layer.cornerRadius=35/2
         photo.layer.masksToBounds=true
+        photo.contentMode=UIViewContentMode.scaleAspectFill
         let btn=UIButton(type: UIButtonType.custom)
         btn.frame=CGRect(x: 0, y: 0, width: 35, height: 35)
         btn.addTarget(self, action: #selector(MainHomeTableViewController.userInfo), for: UIControlEvents.touchUpInside)
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift
index 01fe14a..1f5c570 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift
@@ -272,5 +272,28 @@ class MicroCourseViewControllerTableViewCell:UITableViewCell{
         player.player = AVPlayer(url: url!)
         player.videoGravity = AVLayerVideoGravityResizeAspect
         self.superVC.present(player, animated: true, completion: nil)
+        AppDelegate.instance().httpServer.updatePv(parameters: ["f_id":item.f_Id as AnyObject]) { (str, error) in
+            if error==nil {
+                if JSON.fromString(jsonString: str)!["status"].intValue == 1{
+                    //更新阅读量成功刷新页面
+                    self.superVC.currentPage=1
+                    self.superVC.resourceData.removeAll()
+                    var p:Dictionary<String,AnyObject>=["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.superVC.currentPage as AnyObject,"pageSize":10 as AnyObject]
+                    if self.superVC.parameter != nil {
+                        self.superVC.parameter!.updateValue(self.superVC.currentPage as AnyObject, forKey: "pageIndex")
+                        p=self.superVC.parameter!
+                    }
+                    self.superVC.refreshLivesAction(parameters: p, completionHandler: { (success) in
+                        if success{
+                            self.superVC.tableView.reloadData()
+                        }
+                    })
+                }
+            }
+        }
+        AppDelegate.instance().httpServer.addHistoryView(parameters: ["f_ViewType":0 as AnyObject,
+                                                                      "f_ViewId":item.f_Id as AnyObject,
+                                                                      "f_ViewName":item.f_Title as AnyObject]) { (str, error) in
+        }
     }
 }
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
index fc5efae..4ff47c6 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
@@ -13,7 +13,7 @@
         <!--User Edit View Controller-->
         <scene sceneID="pS1-j4-eWs">
             <objects>
-                <viewController storyboardIdentifier="UserEditViewControllerVC" id="e3H-9T-9vN" customClass="UserEditViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="UserEditViewControllerVC" hidesBottomBarWhenPushed="YES" id="e3H-9T-9vN" customClass="UserEditViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="FSu-Pn-e9e"/>
                         <viewControllerLayoutGuide type="bottom" id="xWX-Qt-Zg4"/>
@@ -107,7 +107,7 @@
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uzU-Fp-mNB">
                                                     <rect key="frame" x="0.0" y="0.0" width="375" height="140"/>
                                                     <subviews>
-                                                        <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="MvT-1n-2RV">
+                                                        <imageView contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="MvT-1n-2RV">
                                                             <rect key="frame" x="147" y="29.5" width="80" height="80"/>
                                                             <gestureRecognizers/>
                                                             <constraints>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift
index 2bb50e7..ce4fb43 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift
@@ -100,6 +100,8 @@ class UserEditViewController: UIViewController ,UIImagePickerControllerDelegate,
                                 }else{
                                     self.view.makeToast("头像修改失败")
                                 }
+                            }else{
+                                self.view.makeToast("头像修改失败")
                             }
                         })
                     }, failHandler: { (error) in
@@ -108,6 +110,8 @@ class UserEditViewController: UIViewController ,UIImagePickerControllerDelegate,
                 }else{
                     self.view.makeToast("图片上传失败")
                 }
+            }else{
+                self.view.makeToast("图片上传失败")
             }
         }
     }
--
libgit2 0.21.0