Skip to content

K
kt-ios
Commit 77bcef1e by Olzhas Aldabergenov
Options

chat bot open knowledge and service links as respective view controllers

parent a3dbd190
Showing with 194 additions and 127 deletions
kt.xcworkspace/xcuserdata/neox.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -41,38 +41,6 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/BotLeftMessageCell.swift"
timestampString = "522067560.634483"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "65"
endingLineNumber = "65"
landmarkName = "bind(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/MainKnowedgeViewController.swift"
timestampString = "527420051.899478"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "47"
endingLineNumber = "47"
landmarkName = "tableView(tableView:cellForRowAtIndexPath:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/CallbackViewController.swift"
timestampString = "528032989.334432"
startingColumnNumber = "9223372036854775807"
......@@ -182,16 +150,16 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceItemScrollViewController.swift"
timestampString = "530767730.950769"
filePath = "kt/ViewControllers/FastPay/UIFastPayViewController.swift"
timestampString = "530168698.751804"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "287"
endingLineNumber = "287"
landmarkName = "prepareForSegue(segue:sender:)"
startingLineNumber = "89"
endingLineNumber = "89"
landmarkName = "createCellsData()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -201,13 +169,29 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/FastPay/UIFastPayViewController.swift"
timestampString = "530168698.751804"
filePath = "kt/ViewControllers/BotLeftMessageCell.swift"
timestampString = "531209142.403686"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "89"
endingLineNumber = "89"
landmarkName = "createCellsData()"
startingLineNumber = "67"
endingLineNumber = "67"
landmarkName = "bind(nodes:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/BotViewController.swift"
timestampString = "531222126.771091"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "190"
endingLineNumber = "190"
landmarkName = "processService(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......
kt/Facade/Facade+Bot.swift
......@@ -30,6 +30,8 @@ extension Facade {
botNode.text = n["text"].string
botNode.expanded = n["expanded"].int
botNode.isLink = n["isLink"].int
botNode.entityId = n["entity_id"].string
botNode.type = n["type"].string
botNodes.append(botNode)
}
let res = BotResult()
......
kt/Managers/BotManager.swift
......@@ -55,7 +55,7 @@ class BotManager {
return nil
}
func saveStoreFastPay(botResults : [BotResult]) {
func saveBotResults(botResults : [BotResult]) {
let archivedItems = archiveAll(botResults)
NSUserDefaults.standardUserDefaults().setObject(archivedItems, forKey: UserDefaultsBotResultsKey + UserManager.sharedInstance().login!)
NSUserDefaults.standardUserDefaults().synchronize()
......@@ -67,7 +67,11 @@ class BotManager {
items = []
}
items!.append(botResult)
saveStoreFastPay(items!)
saveBotResults(items!)
}
func addAll(items: [BotResult]) {
saveBotResults(items)
}
}
kt/Models/BotNode.swift
......@@ -17,6 +17,8 @@ class BotNode: NSObject, NSCoding {
var text : String?
var expanded : Int?
var isLink : Int?
var entityId : String?
var type : String?
override init() {
super.init()
......@@ -30,6 +32,12 @@ class BotNode: NSObject, NSCoding {
text = aDecoder.decodeObjectForKey("text") as! String?
expanded = aDecoder.decodeObjectForKey("expanded") as! Int?
isLink = aDecoder.decodeObjectForKey("isLink") as! Int?
if ( aDecoder.containsValueForKey("entityId") ) {
entityId = aDecoder.decodeObjectForKey("entityId") as! String?
}
if ( aDecoder.containsValueForKey("type") ) {
type = aDecoder.decodeObjectForKey("type") as! String?
}
}
func encodeWithCoder(aCoder: NSCoder) {
......@@ -40,6 +48,8 @@ class BotNode: NSObject, NSCoding {
aCoder.encodeObject(text, forKey: "text")
aCoder.encodeObject(expanded, forKey: "expanded")
aCoder.encodeObject(isLink, forKey: "isLink")
aCoder.encodeObject(entityId, forKey: "entityId")
aCoder.encodeObject(type, forKey: "type")
}
}
kt/Resources/Base.lproj/Main.storyboard
......@@ -354,7 +354,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8gk-Mh-q6D" id="wRv-ae-1bA">
<frame key="frameInset" width="600" height="80"/>
<frame key="frameInset" width="600" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dul-TF-41F">
......@@ -1151,7 +1151,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="166"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ym-kb-mRZ" id="FGA-mi-AGb">
<frame key="frameInset" width="375" height="166"/>
<frame key="frameInset" width="375" height="165"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Моя семья" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QCj-NY-AqY">
......@@ -1286,7 +1286,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OZp-jL-1bb" id="L76-f9-HLK">
<frame key="frameInset" width="375" height="60"/>
<frame key="frameInset" width="375" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Адрес электронной почты" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OpU-aT-0as">
......@@ -1427,7 +1427,7 @@
<rect key="frame" x="0.0" y="28" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SQN-x5-07i" id="zUj-fk-hK8">
<frame key="frameInset" width="414" height="44"/>
<frame key="frameInset" width="414" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZu-i5-IkV">
......@@ -1951,7 +1951,7 @@
<rect key="frame" x="0.0" y="65" width="375" height="217"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BcJ-QN-cZr" id="2oa-Tb-KB1">
<frame key="frameInset" width="375" height="217"/>
<frame key="frameInset" width="375" height="216"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KRa-O0-3cA">
......@@ -2050,7 +2050,7 @@
<rect key="frame" x="0.0" y="282" width="375" height="359"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ASd-vV-7ps" id="rQ0-MH-iGO">
<frame key="frameInset" width="375" height="359"/>
<frame key="frameInset" width="375" height="358"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Хит продаж" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tHw-4T-nXe">
......@@ -2079,7 +2079,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="top" reuseIdentifier="cell" id="52o-7e-ad7" customClass="FeedCollectionViewCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="9.5" width="300" height="300"/>
<rect key="frame" x="0.0" y="10" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
......@@ -2173,7 +2173,7 @@
<rect key="frame" x="0.0" y="641" width="375" height="191"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="Xc9-jj-Bd1" id="sZn-nh-awp">
<frame key="frameInset" width="375" height="191"/>
<frame key="frameInset" width="375" height="190"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3YG-o0-ctD">
......@@ -2330,7 +2330,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nlE-Nl-vsQ" id="gT9-U4-WIA">
<frame key="frameInset" width="342" height="100"/>
<frame key="frameInset" width="342" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UCI-rb-RNP">
......@@ -2363,7 +2363,7 @@
<rect key="frame" x="0.0" y="192" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Chb-YR-87M" id="h7J-gm-bU3">
<frame key="frameInset" width="375" height="100"/>
<frame key="frameInset" width="375" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rMF-Vb-ftO">
......@@ -2396,7 +2396,7 @@
<rect key="frame" x="0.0" y="292" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="IW2-Os-7eR" id="XaK-1e-1F2">
<frame key="frameInset" width="375" height="100"/>
<frame key="frameInset" width="375" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Td-Wr-Khh" customClass="UIButtonSquaredBlue" customModule="telecom" customModuleProvider="target">
......@@ -2515,7 +2515,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lkv-ut-or5" id="IV2-pe-FBo">
<frame key="frameInset" width="342" height="100"/>
<frame key="frameInset" width="342" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="ЗАЯВКИ НАЧИНАЯ С ДАТЫ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cw9-bL-EoY">
......@@ -2551,7 +2551,7 @@
<rect key="frame" x="0.0" y="128" width="375" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mgU-8z-mk5" id="7cZ-W8-6Bt">
<frame key="frameInset" width="328" height="90"/>
<frame key="frameInset" width="328" height="89"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" ambiguous="YES" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbS-eM-lUP">
......@@ -2677,7 +2677,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vmx-Ap-Zh9" id="q1X-yY-KQg">
<frame key="frameInset" width="600" height="200"/>
<frame key="frameInset" width="600" height="199"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7HI-0O-Glg">
......@@ -2885,7 +2885,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="130"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LJW-S3-YEb" id="jCx-Gc-Dvb">
<frame key="frameInset" width="375" height="130"/>
<frame key="frameInset" width="375" height="129"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZCR-YT-3OG">
......@@ -3060,7 +3060,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AP9-BD-JTo" id="Isd-kD-9HS">
<frame key="frameInset" width="375" height="50"/>
<frame key="frameInset" width="375" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fsq-Q1-em8">
......@@ -3145,7 +3145,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uQQ-J8-UPI" id="d0w-1a-NfH">
<frame key="frameInset" width="375" height="80"/>
<frame key="frameInset" width="375" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R6G-yX-gQ1">
......@@ -3188,7 +3188,7 @@
<rect key="frame" x="0.0" y="108" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lM5-fY-h1s" id="EZR-N0-HGR">
<frame key="frameInset" width="375" height="80"/>
<frame key="frameInset" width="375" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Gy-0e-uKm">
......@@ -3445,7 +3445,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dpj-6y-3dR" id="0Im-f5-utg">
<frame key="frameInset" width="375" height="44"/>
<frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H8t-l8-IAE">
......@@ -3543,7 +3543,7 @@
<rect key="frame" x="0.0" y="28" width="359" height="250"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Zoj-Mv-vlU" id="zZi-o0-cLk">
<frame key="frameInset" width="359" height="250"/>
<frame key="frameInset" width="359" height="249"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vbe-am-xpW">
......@@ -3706,7 +3706,7 @@
<rect key="frame" x="0.0" y="278" width="359" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5nw-DG-5mw" id="KQF-0C-LBJ">
<frame key="frameInset" width="359" height="120"/>
<frame key="frameInset" width="359" height="119"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="duM-2o-GIO">
......@@ -3784,7 +3784,7 @@
<rect key="frame" x="0.0" y="398" width="359" height="80"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="dmh-Hg-JDK" id="OQF-WI-52i">
<frame key="frameInset" width="359" height="80"/>
<frame key="frameInset" width="359" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pqi-tN-QfC">
......@@ -4210,7 +4210,7 @@
<rect key="frame" x="0.0" y="28" width="343" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="QBg-MG-ZSv" id="k1Z-FH-KYY">
<frame key="frameInset" width="343" height="120"/>
<frame key="frameInset" width="343" height="119"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gsf-cj-W08">
......@@ -4265,7 +4265,7 @@
<rect key="frame" x="0.0" y="148" width="343" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Y26-HA-gXR" id="0Nu-EG-OVX">
<frame key="frameInset" width="343" height="150"/>
<frame key="frameInset" width="343" height="149"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qQr-2d-DLG">
......@@ -4380,7 +4380,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="88"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dl5-ti-jpt" id="Bfy-f6-tct">
<frame key="frameInset" width="375" height="88"/>
<frame key="frameInset" width="375" height="87"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H0p-eC-Sik">
......@@ -4633,7 +4633,7 @@
<rect key="frame" x="0.0" y="92" width="561" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C3b-7f-Eis" id="1Ya-7Y-Yhe">
<frame key="frameInset" width="561" height="60"/>
<frame key="frameInset" width="561" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UPt-cT-j6J">
......@@ -4915,7 +4915,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="86"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OPV-kp-TRp" id="lZf-5Q-tHg">
<frame key="frameInset" width="342" height="86"/>
<frame key="frameInset" width="342" height="85"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2016.04.28" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gy0-2L-s6L">
......@@ -5007,7 +5007,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LRy-H4-FPr" id="cfQ-IR-xSw">
<frame key="frameInset" width="600" height="150"/>
<frame key="frameInset" width="600" height="149"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RR7-9R-Oij">
......@@ -5116,7 +5116,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wCL-Bo-ud3" id="V3w-Bg-wQ1">
<frame key="frameInset" width="375" height="60"/>
<frame key="frameInset" width="375" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HuX-QL-KpV">
......@@ -5291,7 +5291,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Rb4-5J-Gyf" id="ZeQ-bB-7Os">
<frame key="frameInset" width="375" height="280"/>
<frame key="frameInset" width="375" height="279"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xqz-Ow-Dsp">
......@@ -5490,7 +5490,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ThT-7B-kzN" id="pok-ft-BvC">
<frame key="frameInset" width="375" height="280"/>
<frame key="frameInset" width="375" height="279"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oG5-sD-tfJ">
......@@ -5770,7 +5770,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="llT-GK-2t1" id="u5C-DY-lHG">
<frame key="frameInset" width="375" height="55"/>
<frame key="frameInset" width="375" height="54"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="GFE-wX-oVv">
......@@ -5855,7 +5855,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="310"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" autoresizesSubviews="NO" opaque="NO" multipleTouchEnabled="YES" contentMode="top" tableViewCell="dVD-RI-2Ub" id="bi1-TT-A70">
<frame key="frameInset" width="375" height="310"/>
<frame key="frameInset" width="375" height="309"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="serviceslist_pack_icon" translatesAutoresizingMaskIntoConstraints="NO" id="k82-E5-QhZ" userLabel="IconView"/>
......@@ -6013,7 +6013,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zt9-cG-Yl5" id="DrX-x9-F77">
<frame key="frameInset" width="375" height="50"/>
<frame key="frameInset" width="375" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="iD TV — Гибкое телевидение для тех, кто не любит себя ограничивать!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="218-f5-tfr">
......@@ -6037,7 +6037,7 @@
<rect key="frame" x="0.0" y="78" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RZk-Cn-MFo" id="wOZ-AU-13f">
<frame key="frameInset" width="375" height="44"/>
<frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3tn-5k-gUY">
......@@ -6061,7 +6061,7 @@
<rect key="frame" x="0.0" y="122" width="375" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vs5-Ob-TlT" id="9ey-Nw-64d">
<frame key="frameInset" width="375" height="220"/>
<frame key="frameInset" width="375" height="219"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BwK-LW-CFm">
......@@ -6086,7 +6086,7 @@
<rect key="frame" x="0.0" y="342" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FRY-cY-ADr" id="1KT-MC-Bpm">
<frame key="frameInset" width="375" height="50"/>
<frame key="frameInset" width="375" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MVS-Kx-4bd">
......@@ -6110,7 +6110,7 @@
<rect key="frame" x="0.0" y="392" width="375" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7wd-hi-8fO" id="oU0-Z4-eSi">
<frame key="frameInset" width="375" height="300"/>
<frame key="frameInset" width="375" height="299"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
......@@ -6118,7 +6118,7 @@
<rect key="frame" x="0.0" y="692" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9FQ-n3-0sl" id="PfR-Ku-Vrv">
<frame key="frameInset" width="342" height="50"/>
<frame key="frameInset" width="342" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X7F-0L-o2F">
......@@ -6222,7 +6222,7 @@
<rect key="frame" x="0.0" y="22" width="600" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sme-g8-b76" id="mkR-0y-Fxz">
<frame key="frameInset" width="600" height="280"/>
<frame key="frameInset" width="600" height="279"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mbo-dN-7Ay">
......@@ -6255,7 +6255,7 @@
<rect key="frame" x="0.0" y="302" width="600" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yAb-Q7-Kgf" id="TyR-W9-p8U">
<frame key="frameInset" width="600" height="300"/>
<frame key="frameInset" width="600" height="299"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<webView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2CW-2A-uJk">
......@@ -6282,7 +6282,7 @@
<rect key="frame" x="0.0" y="602" width="600" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BZ8-y6-3dG" id="qDf-NC-bQj">
<frame key="frameInset" width="600" height="50"/>
<frame key="frameInset" width="600" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D5P-jR-FA5">
......@@ -6306,7 +6306,7 @@
<rect key="frame" x="0.0" y="652" width="600" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pl5-ab-ksy" id="wpC-l4-c5Q">
<frame key="frameInset" width="567" height="50"/>
<frame key="frameInset" width="567" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vxM-1Z-au1">
......@@ -6585,11 +6585,11 @@
<rect key="frame" x="0.0" y="56" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uew-Fr-Rr7" id="O5X-gF-b9W">
<frame key="frameInset" width="375" height="44"/>
<frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7xj-02-2Dw">
<frame key="frameInset" minX="15" width="345" height="43.5"/>
<frame key="frameInset" minX="15" width="345" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -6628,11 +6628,11 @@
<rect key="frame" x="0.0" y="92" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6jH-Cy-sfi" id="x81-dt-Ins">
<frame key="frameInset" width="375" height="44"/>
<frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7fb-gt-KO6">
<frame key="frameInset" minX="15" width="345" height="43.5"/>
<frame key="frameInset" minX="15" width="345" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -6720,7 +6720,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RFo-Gl-pY8" id="ySy-UG-sdV">
<frame key="frameInset" width="567" height="44"/>
<frame key="frameInset" width="567" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bRq-oO-kGg">
......@@ -7041,18 +7041,18 @@
<rect key="frame" x="0.0" y="22" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3uf-i1-R9a" id="AU1-gz-qFB">
<frame key="frameInset" width="600" height="60"/>
<frame key="frameInset" width="600" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C2u-iO-UCj">
<frame key="frameInset" minX="15" minY="10" width="34" height="22"/>
<frame key="frameInset" minX="15" minY="9" width="34" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Bold" family="PT Sans" pointSize="17"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bVU-gq-8l0">
<frame key="frameInset" minX="15" minY="32" width="47" height="18.5"/>
<frame key="frameInset" minX="15" minY="31" width="47" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="14"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -7900,18 +7900,18 @@
<rect key="frame" x="0.0" y="22" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3pk-oN-VCk" id="9dl-5H-NYx">
<frame key="frameInset" width="600" height="60"/>
<frame key="frameInset" width="600" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f3l-ZK-I4R">
<frame key="frameInset" minX="15" minY="10" width="34" height="22"/>
<frame key="frameInset" minX="15" minY="9" width="34" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Bold" family="PT Sans" pointSize="17"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="agj-0P-9r3">
<frame key="frameInset" minX="15" minY="32" width="47" height="18.5"/>
<frame key="frameInset" minX="15" minY="31" width="47" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="14"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -8518,7 +8518,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5B6-eK-flM" id="yJk-qe-Kmj">
<frame key="frameInset" width="375" height="60"/>
<frame key="frameInset" width="375" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="So8-9t-0MR">
......@@ -9367,7 +9367,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P1m-QL-zI0" id="SRv-UP-BuJ">
<frame key="frameInset" width="600" height="60"/>
<frame key="frameInset" width="600" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xji-cJ-5wS">
......@@ -9431,7 +9431,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yNp-lb-Hs5" id="zHX-IS-W9f">
<frame key="frameInset" width="600" height="60"/>
<frame key="frameInset" width="600" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hFm-cX-B99">
......@@ -9495,7 +9495,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2XE-UQ-ssK" id="Vja-gC-n47">
<frame key="frameInset" width="600" height="60"/>
<frame key="frameInset" width="600" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q3b-6m-kNL">
......@@ -9596,11 +9596,11 @@
<rect key="frame" x="0.0" y="22" width="600" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6L0-sG-Xwx" id="5Yj-w5-ur4">
<frame key="frameInset" width="567" height="43"/>
<frame key="frameInset" width="567" height="42"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="iD TV базовый" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8Rb-D8-nW6">
<frame key="frameInset" minX="15" width="550" height="42.5"/>
<frame key="frameInset" minX="15" width="550" height="42"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="15"/>
<color key="textColor" red="0.17968405779999999" green="0.20799672599999999" blue="0.23909254369999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -9684,7 +9684,7 @@
<rect key="frame" x="0.0" y="28" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="I3L-fo-wiq" id="nqP-bD-zze">
<frame key="frameInset" width="414" height="50"/>
<frame key="frameInset" width="414" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="iD TV — Гибкое телевидение для тех, кто не любит себя ограничивать!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P43-2z-q46">
......@@ -9708,7 +9708,7 @@
<rect key="frame" x="0.0" y="78" width="414" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="hgB-UO-dTb" id="fDS-Jh-C4K">
<frame key="frameInset" width="414" height="220"/>
<frame key="frameInset" width="414" height="219"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Me-Gr-PsO">
......@@ -9733,7 +9733,7 @@
<rect key="frame" x="0.0" y="298" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qMR-Sz-bKt" id="xds-Ec-KOg">
<frame key="frameInset" width="414" height="50"/>
<frame key="frameInset" width="414" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SGH-Ci-igu">
......@@ -9757,7 +9757,7 @@
<rect key="frame" x="0.0" y="348" width="414" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fLM-2t-NeZ" id="NAb-k8-kqd">
<frame key="frameInset" width="414" height="300"/>
<frame key="frameInset" width="414" height="299"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<webView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" translatesAutoresizingMaskIntoConstraints="NO" id="snr-GA-iQi">
......@@ -9785,7 +9785,7 @@
<rect key="frame" x="0.0" y="648" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="etf-If-U77" id="1fa-q0-1X7">
<frame key="frameInset" width="381" height="50"/>
<frame key="frameInset" width="381" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7OQ-OS-2TQ">
......@@ -10220,7 +10220,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="54"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CRL-NB-uv2" id="url-DA-apA">
<frame key="frameInset" width="342" height="54"/>
<frame key="frameInset" width="342" height="53"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Pz-e1-Exk">
......@@ -10333,7 +10333,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rJb-XU-r8u" id="2La-8x-EIZ">
<frame key="frameInset" width="375" height="80"/>
<frame key="frameInset" width="375" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2bK-Nu-5ZL">
......@@ -10399,7 +10399,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3Jp-vB-Uxs" id="8qf-ck-wI5">
<frame key="frameInset" width="375" height="100"/>
<frame key="frameInset" width="375" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e7b-uq-fJH">
kt/Resources/en.lproj/Localization.strings
......@@ -621,4 +621,5 @@
"registration_placeholder_login" = "Придумайте Ваш логин";
"registration_placeholder_password" = "Придумайте Ваш пароль";
"help" = "Помощь";
kt/Resources/kk.lproj/Localization.strings
......@@ -620,4 +620,5 @@
"registration_placeholder_login" = "Придумайте Ваш логин";
"registration_placeholder_password" = "Придумайте Ваш пароль";
"help" = "Помощь";
kt/Resources/ru.lproj/Localization.strings
......@@ -623,4 +623,4 @@
"registration_placeholder_login" = "Придумайте Ваш логин";
"registration_placeholder_password" = "Придумайте Ваш пароль";
"help" = "Помощь";
kt/ViewControllers/BotLeftMessageCell.swift
......@@ -8,7 +8,7 @@
import UIKit
class BotLeftMessageCell: UITableViewCell, UIPickerViewDataSource, UIPickerViewDelegate, UITextFieldDelegate {
class BotLeftMessageCell: UITableViewCell, UIPickerViewDataSource, UIPickerViewDelegate, UITextFieldDelegate, UITextViewDelegate {
@IBOutlet weak var container: UIView!
@IBOutlet weak var stackView: UIStackView!
......@@ -43,7 +43,7 @@ class BotLeftMessageCell: UITableViewCell, UIPickerViewDataSource, UIPickerViewD
self.showAbonentForm(UITapGestureRecognizer())
}
} else {
let label = UITextView(frame: CGRectMake(0, 0, 0, 0))
let label = BotNodeUITextView(frame: CGRectMake(0, 0, 0, 0))
label.textAlignment = NSTextAlignment.Left
let attrStr = try! NSAttributedString(data: text.dataUsingEncoding(NSUnicodeStringEncoding, allowLossyConversion: true)!, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil)
label.attributedText = attrStr
......@@ -59,7 +59,13 @@ class BotLeftMessageCell: UITableViewCell, UIPickerViewDataSource, UIPickerViewD
label.textColor = Color.ButtonBlueDefaultColor
}
label.tag = Int(id)!
label.botNode = node
label.delegate = self
self.stackView.addArrangedSubview(label)
if id == "27" {
print(text)
}
}
}
}
......@@ -169,6 +175,27 @@ class BotLeftMessageCell: UITableViewCell, UIPickerViewDataSource, UIPickerViewD
}
}
func textView(textView: UITextView, shouldInteractWithURL URL: NSURL, inRange characterRange: NSRange) -> Bool {
if let textLabel = textView as? BotNodeUITextView {
if textLabel.botNode != nil {
if ( textLabel.botNode?.type == "1" ) {
if let pc = parentViewController as? BotViewController {
pc.processKnowledge(textLabel.botNode!)
}
return false
} else if ( textLabel.botNode?.type == "2" ) {
if let pc = parentViewController as? BotViewController {
pc.processService(textLabel.botNode!)
}
return false
}
}
}
return true;
}
func getBalanceButtonTap(sender:UITapGestureRecognizer) {
if typeForm == 0 {
if let phoneText = phoneTextField.text {
......@@ -220,4 +247,10 @@ class BotLeftMessageCell: UITableViewCell, UIPickerViewDataSource, UIPickerViewD
textField.resignFirstResponder()
return true
}
}
class BotNodeUITextView : UITextView, UITextViewDelegate {
var botNode : BotNode?
}
kt/ViewControllers/BotViewController.swift
......@@ -126,20 +126,21 @@ class BotViewController: UIViewController, UITableViewDataSource, UITableViewDel
}
func addMessage(botResult: BotResult) {
self.tableView.beginUpdates()
self.messagesList.append(botResult)
let indexPath = NSIndexPath(forRow: (self.messagesList.count - 1), inSection: 0)
self.tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: UITableViewRowAnimation.Top)
self.tableView.endUpdates()
// self.tableView.beginUpdates()
// self.messagesList.append(botResult)
// let indexPath = NSIndexPath(forRow: (self.messagesList.count - 1), inSection: 0)
// self.tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: UITableViewRowAnimation.Top)
// self.tableView.endUpdates()
self.messagesList.append(botResult)
self.tableView.reloadData()
self.tableView.scrollToBottom(true)
self.persist(botResult)
self.persist()
}
func persist(botResult: BotResult) {
BotManager.sharedInstance().add(botResult)
func persist() {
BotManager.sharedInstance().addAll(self.messagesList)
}
func reloadTable() {
......@@ -166,6 +167,37 @@ class BotViewController: UIViewController, UITableViewDataSource, UITableViewDel
}
}
func processKnowledge(botNode : BotNode ) {
print(botNode.text)
let vc = self.storyboard!.instantiateViewControllerWithIdentifier("KnowedgeQuestionsViewController") as! KnowedgeQuestionsViewController
vc.id = Int(botNode.entityId!)!
vc.screenName = LS("help")
self.navigationController!.pushViewController(vc, animated: true)
}
func processService(botNode: BotNode) {
let params: [String: AnyObject] = ["service_id": Int(botNode.entityId!)!, "type": "landing" ]
Facade.sharedInstance().getLanding(params, onSuccess: { (serviceItem) in
serviceItem.type = "landing"
let destination = self.storyboard!.instantiateViewControllerWithIdentifier("ServiceItemScrollViewController") as! ServiceItemScrollViewController
destination.serviceItemForLoading = serviceItem
self.navigationController!.pushViewController(destination, animated: true)
}, onError: { (error) in
print(error)
}, onFinish: {
})
// let serviceItem = ServiceItem();
// serviceItem.id = Int(botNode.entityId!)!
// let destination = self.storyboard!.instantiateViewControllerWithIdentifier("ServiceItemScrollViewController") as! ServiceItemScrollViewController
// destination.serviceItemForLoading = serviceItem
// self.navigationController!.pushViewController(destination, animated: true)
}
func getChildNodes(id: Int) {
Facade.sharedInstance().childBot(String(id), onSuccess: { (botResult) in
if botResult.count != 0 {
......@@ -200,7 +232,7 @@ class BotViewController: UIViewController, UITableViewDataSource, UITableViewDel
}
func tableView(tableView: UITableView, estimatedHeightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
let height = self.heightAtIndexPath.objectForKey(indexPath)
let height = self.heightAtIndexPath.objectForKey(indexPath.row)
if ((height) != nil) {
return CGFloat(height!.floatValue)
} else {
......@@ -210,7 +242,7 @@ class BotViewController: UIViewController, UITableViewDataSource, UITableViewDel
func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell, forRowAtIndexPath indexPath: NSIndexPath) {
let height = cell.frame.size.height
self.heightAtIndexPath.setObject(height, forKey: indexPath)
self.heightAtIndexPath.setObject(height, forKey: indexPath.row)
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment