From 047c25f6b5a4659582123b443ada116b0b49c289 Mon Sep 17 00:00:00 2001 From: 葛建军 <627299690@qq.com> Date: Sat, 24 Mar 2018 11:36:21 +0800 Subject: [PATCH] no message --- ParentAssistant/ParentAssistant/AppDelegate.swift | 12 ++---------- ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift | 16 +++++++++------- ParentAssistant/ParentAssistant/Classes/util/network.swift | 8 ++------ ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift | 7 +++++++ ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/Contents.json | 21 +++++++++++++++++++++ ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/icon.png | Bin 0 -> 3012 bytes ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/Contents.json | 21 +++++++++++++++++++++ ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/baogao_back.jpg | Bin 0 -> 8835 bytes ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard | 16 ++++++++-------- 9 files changed, 70 insertions(+), 31 deletions(-) create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/Contents.json create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/icon.png create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/Contents.json create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/baogao_back.jpg diff --git a/ParentAssistant/ParentAssistant/AppDelegate.swift b/ParentAssistant/ParentAssistant/AppDelegate.swift index 94cd8af..92fc8e9 100644 --- a/ParentAssistant/ParentAssistant/AppDelegate.swift +++ b/ParentAssistant/ParentAssistant/AppDelegate.swift @@ -83,20 +83,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } } }, failHandler: { (error) in - let imageResource = ZLaunchAdImageResourceConfigure() - imageResource.imageNameOrImageURL = "http://chatm-icon.oss-cn-beijing.aliyuncs.com/pic/pic_20170725104352981.jpg" - imageResource.imageDuration = 5 - imageResource.imageFrame = UIScreen.main.bounds - adView.setImageResource(imageResource, action: { - /// 广告点击 - }) - }) }) }else{ // Thread.sleep(forTimeInterval: 5.0)//延长启动页面10秒 let view = UIView(frame: CGRect(x: 0, y: 0, width: getScreenWidth(), height: getScreenHeight())) - view.backgroundColor = UIColor.red + view.backgroundColor = UIColor.white vc.view.addSubview(view) position = 0 let _ = Setting.save("\(AppDelegate.version())", forKey: "isFirst") @@ -110,7 +102,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { for item in json.contentData().arrayValue { NSLog("************\(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)"); images.append(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!) } - LaunchIntroductionView.shared(withImages: images, buttonImage: "icon_image", buttonFrame: CGRect(x: getScreenWidth()/2-551/4, y: getScreenHeight()-150, width: 551/2, height: 45)) + LaunchIntroductionView.shared(withImages: images, buttonImage: "icon_getin", buttonFrame: CGRect(x: getScreenWidth()/2-551/4, y: getScreenHeight()-150, width: 551/2, height: 45)) } } }, failHandler: { (error) in diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift index 808b029..e70570a 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift @@ -20,15 +20,22 @@ class ReportViewController: UIViewController { //设置顶部按钮 setupNavigationBar() //设置日期页面 - setupDateView() +// setupDateView() } // MARK: - 设置顶部按钮 func setupNavigationBar(){ self.navigationController?.navigationBar.barStyle = UIBarStyle.default// UIColorFromRGB(0xC5DAFF) let backImage = UIImage(named: "navigationBar_backgrounImage") self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default) + self.configTheme() self.navigationItem.title = "报告" // setuptitleView() + + } + func setuptitleView(){ + // MARK: - 设置顶部的titleView + titleView = Bundle.main.loadNibNamed("ReportHeaderView", owner: nil, options: nil)![0] as! ReportHeaderView + titleView.delegate = self titleView.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 44) self.navigationItem.titleView = titleView titleView.layoutSubviews() @@ -43,11 +50,6 @@ class ReportViewController: UIViewController { titleView.nameButton.setTitle("未登录", for: UIControlState.normal) } } - func setuptitleView(){ - // MARK: - 设置顶部的titleView - titleView = Bundle.main.loadNibNamed("ReportHeaderView", owner: nil, options: nil)![0] as! ReportHeaderView - titleView.delegate = self - } // MARK: - 设置日期页面 func setupDateView(){ titleView.dateButton.setTitle("\(getCurrentDate())", for: UIControlState.normal) @@ -144,7 +146,7 @@ extension ReportViewController: UICollectionViewDelegate,UICollectionViewDataSou return CGSize(width: getScreenWidth()/7, height: getScreenWidth()/7) } func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return 7 + return 0 } func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { diff --git a/ParentAssistant/ParentAssistant/Classes/util/network.swift b/ParentAssistant/ParentAssistant/Classes/util/network.swift index c1084ed..d0881c9 100644 --- a/ParentAssistant/ParentAssistant/Classes/util/network.swift +++ b/ParentAssistant/ParentAssistant/Classes/util/network.swift @@ -85,14 +85,10 @@ final class HTTPServer{ static let shared = HTTPServer() init() {} - static let WEB_HELP="http://60.190.202.57:8101/FeedBack.aspx?userid=" - static let WEB_ABOUT="http://60.190.202.57:8101/About.html" - - let appsecret="sincere:3a530f39f99411b454e667d69693c127" static var ReleaseHOST:String!="http://campus.myjxt.com"//正式网址 - static var ReleaseHOSTWap:String!="http://hxy.myjxt.com" - static var ReleaseHOSTImage:String!="http://60.190.202.57:8196" + static var ReleaseHOSTWap:String!="http://parent.myjxt.com" + static var ReleaseHOSTImage:String!="http://manage.myjxt.com" static var DebugHOST:String!="http://60.190.202.57:1000"//测试网址 static var DebugHOSTWap:String!="http://60.190.202.57:8101" static var DebugHOSTImage:String!="http://60.190.202.57:8196" diff --git a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift b/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift index 2fd6d14..b417d27 100644 --- a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift +++ b/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift @@ -144,6 +144,13 @@ class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationMa attachItem.ownId = AccountManager.shared.userid attachItem.save() NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil) + }else if info["type"].stringValue=="ordermess"{//订购通知 + let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message + attachItem.date=Date(timeIntervalSince1970: notification.timestamp) + attachItem.content = info["content"].stringValue + attachItem.ownId = AccountManager.shared.userid + attachItem.save() + NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil) } } } diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/Contents.json new file mode 100644 index 0000000..3fbf283 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "icon.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/icon_getin.imageset/icon.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/icon.png new file mode 100644 index 0000000..4d4d45d Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/icon_getin.imageset/icon.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/Contents.json new file mode 100644 index 0000000..1d9aa73 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "baogao_back.jpg", + "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/report/report_none_icon.imageset/baogao_back.jpg b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/baogao_back.jpg new file mode 100644 index 0000000..a8733b7 Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_none_icon.imageset/baogao_back.jpg differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index 6a1bb76..b53af0d 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -851,17 +851,16 @@ - + + + - - + + + + @@ -2260,6 +2259,7 @@ + -- libgit2 0.21.0