Steven 11 months ago
parent
commit
e3c5ebb4e1
16 changed files with 85 additions and 32 deletions
  1. 4 4
      KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj
  2. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_trainRecord.imageset/mine_trainRecord@2x.png
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_trainRecord.imageset/mine_trainRecord@3x.png
  4. 0 3
      KulexiuForStudent/KulexiuForStudent/Common/Base/WebView/KSBaseWKWebViewController.m
  5. 12 0
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantSwitchAlbum/AlbumSwitchCell.m
  6. 3 0
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantSwitchAlbum/AlbumSwitchCell.xib
  7. 10 0
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/INSSettingBodyView.xib
  8. 9 9
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineNavView.xib
  9. 3 3
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/TenantNotiferNavView.xib
  10. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/View/NotiferNavView.xib
  11. 17 0
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/Controller/FeedbackViewController.m
  12. 4 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackBodyView.m
  13. 5 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackBodyView.xib
  14. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackListNavView.xib
  15. 12 2
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/AboutUsBodyView.xib
  16. BIN
      KulexiuForStudent/KulexiuForStudent/ToolKit/KSToolLibrary.framework/KSToolLibrary

+ 4 - 4
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -178,7 +178,6 @@
 		7ED0E7B1704A93EF8D10E5E6 /* libPods-KulexiuForStudent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 75A6EF369C91D11DAF0A6D45 /* libPods-KulexiuForStudent.a */; };
 		AD7BEC2B25F75B750CC7F1DD /* libPods-KulexiuForStudentTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 95C2692D619D5966546A5F19 /* libPods-KulexiuForStudentTests.a */; };
 		BC0078712BCD17ED0076CD22 /* GroupAlbumModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC00786F2BCD17EC0076CD22 /* GroupAlbumModel.m */; };
-		BC0078732BCE59210076CD22 /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC0078722BCE59210076CD22 /* KSToolLibrary.framework */; };
 		BC00A6612BB58FDC00231B74 /* LLPhotoBrowse.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BC00A65F2BB58FDB00231B74 /* LLPhotoBrowse.bundle */; };
 		BC00A6622BB58FDC00231B74 /* WMPlayer.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BC00A6602BB58FDC00231B74 /* WMPlayer.bundle */; };
 		BC0212F727FC4A080040569F /* SubjectImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC0212F527FC4A080040569F /* SubjectImageCell.m */; };
@@ -378,6 +377,7 @@
 		BC3300182BBAB623003D4921 /* CoursewareDownloadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3300122BBAB623003D4921 /* CoursewareDownloadManager.m */; };
 		BC3300192BBAB623003D4921 /* KnowledgePointListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3300142BBAB623003D4921 /* KnowledgePointListModel.m */; };
 		BC33001A2BBAB623003D4921 /* MaterialList.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3300162BBAB623003D4921 /* MaterialList.m */; };
+		BC3332172BCFDFFC004093C4 /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3332162BCFDFFB004093C4 /* KSToolLibrary.framework */; };
 		BC36A5082AB406A5002FEFB1 /* GroupOwnerTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC36A5072AB406A5002FEFB1 /* GroupOwnerTagView.m */; };
 		BC36A50A2AB406AB002FEFB1 /* GroupOwnerTagView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC36A5092AB406AB002FEFB1 /* GroupOwnerTagView.xib */; };
 		BC38C3E82AF893B400ABFCC2 /* KSPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC38C3D52AF893B300ABFCC2 /* KSPlayerView.m */; };
@@ -1308,7 +1308,6 @@
 		AA1C681F4E10FA17C7F2DB87 /* Pods-KulexiuForStudentTests.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KulexiuForStudentTests.test.xcconfig"; path = "Target Support Files/Pods-KulexiuForStudentTests/Pods-KulexiuForStudentTests.test.xcconfig"; sourceTree = "<group>"; };
 		BC00786F2BCD17EC0076CD22 /* GroupAlbumModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupAlbumModel.m; sourceTree = "<group>"; };
 		BC0078702BCD17ED0076CD22 /* GroupAlbumModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupAlbumModel.h; sourceTree = "<group>"; };
-		BC0078722BCE59210076CD22 /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BC00A65F2BB58FDB00231B74 /* LLPhotoBrowse.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = LLPhotoBrowse.bundle; sourceTree = "<group>"; };
 		BC00A6602BB58FDC00231B74 /* WMPlayer.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WMPlayer.bundle; sourceTree = "<group>"; };
 		BC0212F427FC4A080040569F /* SubjectImageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SubjectImageCell.h; sourceTree = "<group>"; };
@@ -1658,6 +1657,7 @@
 		BC3300142BBAB623003D4921 /* KnowledgePointListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KnowledgePointListModel.m; sourceTree = "<group>"; };
 		BC3300152BBAB623003D4921 /* MaterialList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaterialList.h; sourceTree = "<group>"; };
 		BC3300162BBAB623003D4921 /* MaterialList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MaterialList.m; sourceTree = "<group>"; };
+		BC3332162BCFDFFB004093C4 /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BC36A5062AB406A5002FEFB1 /* GroupOwnerTagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupOwnerTagView.h; sourceTree = "<group>"; };
 		BC36A5072AB406A5002FEFB1 /* GroupOwnerTagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroupOwnerTagView.m; sourceTree = "<group>"; };
 		BC36A5092AB406AB002FEFB1 /* GroupOwnerTagView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupOwnerTagView.xib; sourceTree = "<group>"; };
@@ -2552,7 +2552,7 @@
 				BCFEE1932AD15C0E000E888F /* SoundpipeAudioKit in Frameworks */,
 				BC3A556D2BAA7B1A002E1616 /* CloudAccompanyLibrary.framework in Frameworks */,
 				BCFEE18D2AD15BD4000E888F /* AudioKitEX in Frameworks */,
-				BC0078732BCE59210076CD22 /* KSToolLibrary.framework in Frameworks */,
+				BC3332172BCFDFFC004093C4 /* KSToolLibrary.framework in Frameworks */,
 				BC8B6E152856E20800866917 /* WebKit.framework in Frameworks */,
 				BC8A45CB283DDEA100094BBB /* AVFoundation.framework in Frameworks */,
 				BCD9294F28F8FCA4006793E4 /* AudioKit in Frameworks */,
@@ -4631,7 +4631,7 @@
 				BC00A65F2BB58FDB00231B74 /* LLPhotoBrowse.bundle */,
 				BC00A6602BB58FDC00231B74 /* WMPlayer.bundle */,
 				BC3A556A2BAA7B1A002E1616 /* CloudAccompanyLibrary.framework */,
-				BC0078722BCE59210076CD22 /* KSToolLibrary.framework */,
+				BC3332162BCFDFFB004093C4 /* KSToolLibrary.framework */,
 				BC3A55682BAA7B19002E1616 /* KSTunerLibrary.framework */,
 				BC3BF62F2B9EAFC800831494 /* client.p12 */,
 			);

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_trainRecord.imageset/mine_trainRecord@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_trainRecord.imageset/mine_trainRecord@3x.png


+ 0 - 3
KulexiuForStudent/KulexiuForStudent/Common/Base/WebView/KSBaseWKWebViewController.m

@@ -545,9 +545,6 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
                 [content setValue:status forKey:@"status"];
                 [sendParm setValue:content forKey:@"content"];
                 [self postMessage:sendParm];
-                if ([status isEqualToString:@"1"]) {
-                    [LOADING_MANAGER MBShowAUTOHidingInWindow:@"为了保证数据安全,请不要录屏"];
-                }
             });
         }
     }

+ 12 - 0
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantSwitchAlbum/AlbumSwitchCell.m

@@ -21,6 +21,12 @@
 
 @property (weak, nonatomic) IBOutlet UIView *lockView;
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *chooseImgWidth;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *chooseImageRight;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *chooseImageLert;
+
 @end
 
 @implementation AlbumSwitchCell
@@ -36,6 +42,9 @@
     self.selectedBgView.hidden = YES;
     self.chooseImage.hidden = YES;
     self.expiredTime.textColor = HexRGBAlpha(0xFFFFFF, 0.5f);
+    self.chooseImgWidth.constant = 0.0f;
+    self.chooseImageRight.constant = 10.0f;
+    self.chooseImageLert.constant = 0.0f;
 }
 
 - (void)configWithSource:(GroupAlbumModel *)model {
@@ -43,6 +52,9 @@
         self.selectedBgView.hidden = NO;
         self.chooseImage.hidden = NO;
         self.expiredTime.textColor = HexRGB(0xFFFFFF);
+        self.chooseImgWidth.constant = 18.0f;
+        self.chooseImageRight.constant = 20.0f;
+        self.chooseImageLert.constant = 20.0f;
     }
     else {
         [self resetDefaultStatus];

+ 3 - 0
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantSwitchAlbum/AlbumSwitchCell.xib

@@ -120,6 +120,9 @@
                 <outlet property="albumImage" destination="NfZ-Wk-dKR" id="b8I-qz-jSq"/>
                 <outlet property="albumName" destination="J7B-Ce-Ny3" id="3OK-wp-K40"/>
                 <outlet property="chooseImage" destination="OJc-yx-QBL" id="nFL-4g-vRo"/>
+                <outlet property="chooseImageLert" destination="XbO-B7-lKj" id="2Vx-g0-2xA"/>
+                <outlet property="chooseImageRight" destination="qPA-2L-hZD" id="fSV-oG-KVC"/>
+                <outlet property="chooseImgWidth" destination="Gfn-v7-1T0" id="ieE-sV-afB"/>
                 <outlet property="expiredTime" destination="kwL-hK-x7q" id="HBk-kw-Udp"/>
                 <outlet property="lockView" destination="XWA-vY-hQN" id="Pti-5D-nvN"/>
                 <outlet property="selectedBgView" destination="JsI-4t-iX8" id="JeY-h1-ZN3"/>

+ 10 - 0
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/INSSettingBodyView.xib

@@ -514,6 +514,13 @@
                                     <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rdJ-qQ-s1a">
+                                    <rect key="frame" x="12" y="57" width="347" height="1"/>
+                                    <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="cki-Fa-wvY"/>
+                                    </constraints>
+                                </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <gestureRecognizers/>
@@ -524,8 +531,11 @@
                                 <constraint firstAttribute="trailing" secondItem="PWH-eD-VeF" secondAttribute="trailing" constant="12" id="VNL-ID-rtY"/>
                                 <constraint firstItem="PWH-eD-VeF" firstAttribute="centerY" secondItem="nek-ia-9Au" secondAttribute="centerY" id="WAj-UR-uzS"/>
                                 <constraint firstItem="Gpz-5t-uYf" firstAttribute="centerY" secondItem="nek-ia-9Au" secondAttribute="centerY" id="XfR-RG-qCc"/>
+                                <constraint firstAttribute="bottom" secondItem="rdJ-qQ-s1a" secondAttribute="bottom" id="YVZ-ad-LAf"/>
                                 <constraint firstAttribute="height" constant="58" id="h6E-Mi-zXW"/>
+                                <constraint firstAttribute="trailing" secondItem="rdJ-qQ-s1a" secondAttribute="trailing" constant="12" id="hAG-Ag-bdI"/>
                                 <constraint firstItem="4R4-OR-B6f" firstAttribute="leading" secondItem="nek-ia-9Au" secondAttribute="leading" constant="12" id="hGo-Vl-0mj"/>
+                                <constraint firstItem="rdJ-qQ-s1a" firstAttribute="leading" secondItem="nek-ia-9Au" secondAttribute="leading" constant="12" id="zFP-zs-RcQ"/>
                             </constraints>
                             <connections>
                                 <outletCollection property="gestureRecognizers" destination="mnL-fc-p8b" appends="YES" id="SWI-f6-itb"/>

+ 9 - 9
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,9 +20,9 @@
                             <rect key="frame" x="0.0" y="44" width="393" height="44"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i9Z-nS-HTl">
-                                    <rect key="frame" x="345" y="2" width="40" height="40"/>
+                                    <rect key="frame" x="350" y="2" width="30" height="40"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" constant="40" id="RUe-fm-F92"/>
+                                        <constraint firstAttribute="width" constant="30" id="RUe-fm-F92"/>
                                         <constraint firstAttribute="height" constant="40" id="f88-EA-Yk1"/>
                                     </constraints>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -39,9 +39,9 @@
                                     </constraints>
                                 </view>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tAW-JD-scX">
-                                    <rect key="frame" x="300" y="2" width="40" height="40"/>
+                                    <rect key="frame" x="311" y="2" width="30" height="40"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" constant="40" id="ZeB-Tg-9ku"/>
+                                        <constraint firstAttribute="width" constant="30" id="ZeB-Tg-9ku"/>
                                         <constraint firstAttribute="height" constant="40" id="miw-QQ-O1U"/>
                                     </constraints>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -51,7 +51,7 @@
                                     </connections>
                                 </button>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ewR-Ap-6SH">
-                                    <rect key="frame" x="324.66666666666669" y="10" width="15" height="15"/>
+                                    <rect key="frame" x="325.66666666666669" y="10" width="15" height="15"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nJu-gF-rv4">
                                             <rect key="frame" x="4" y="0.0" width="7" height="15"/>
@@ -86,9 +86,9 @@
                             <constraints>
                                 <constraint firstItem="ewR-Ap-6SH" firstAttribute="top" secondItem="tAW-JD-scX" secondAttribute="top" constant="8" id="41i-7K-12d"/>
                                 <constraint firstItem="i9Z-nS-HTl" firstAttribute="centerY" secondItem="8bj-IM-ZrU" secondAttribute="centerY" id="4Tu-xn-BLJ"/>
-                                <constraint firstAttribute="trailing" secondItem="i9Z-nS-HTl" secondAttribute="trailing" constant="8" id="4Vr-rS-9Zc"/>
+                                <constraint firstAttribute="trailing" secondItem="i9Z-nS-HTl" secondAttribute="trailing" constant="13" id="4Vr-rS-9Zc"/>
                                 <constraint firstItem="ewR-Ap-6SH" firstAttribute="centerX" secondItem="tAW-JD-scX" secondAttribute="trailing" constant="-8" id="5vI-xl-Ceq"/>
-                                <constraint firstItem="i9Z-nS-HTl" firstAttribute="leading" secondItem="tAW-JD-scX" secondAttribute="trailing" constant="5" id="Djb-kb-b1v"/>
+                                <constraint firstItem="i9Z-nS-HTl" firstAttribute="leading" secondItem="tAW-JD-scX" secondAttribute="trailing" constant="9" id="Djb-kb-b1v"/>
                                 <constraint firstItem="tAW-JD-scX" firstAttribute="centerY" secondItem="8bj-IM-ZrU" secondAttribute="centerY" id="aKL-y0-trw"/>
                                 <constraint firstAttribute="height" constant="44" id="cAd-fz-cWk"/>
                                 <constraint firstItem="uBH-qe-Dun" firstAttribute="leading" secondItem="8bj-IM-ZrU" secondAttribute="leading" id="cEw-66-In8"/>

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/TenantNotiferNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -46,7 +46,7 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="消息盒子" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dhz-NW-nkR">
                             <rect key="frame" x="159.66666666666666" y="11" width="74" height="22"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部已读" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0YO-CY-enM">

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/View/NotiferNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -52,7 +52,7 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="消息盒子" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SoU-sN-Ahv">
                             <rect key="frame" x="170" y="11" width="74" height="22"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>

+ 17 - 0
KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/Controller/FeedbackViewController.m

@@ -53,6 +53,23 @@
     [self configUI];
     [self requestData];
     [self requestFeedbackType];
+    [self requestConfig];
+}
+
+- (void)requestConfig {
+    [KSNetworkingManager queryConfigRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
+        if ([dic ks_integerValueForKey:@"code"] == 200) {
+            NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
+            NSString *phone = [result ks_stringValueForKey:@"customerServicePhone"];
+            NSString *email = [result ks_stringValueForKey:@"customerServiceEmail"];
+            [self.bodyView configWithPhone:phone email:email];
+        }
+        else {
+            
+        }
+    } faliure:^(NSError * _Nonnull error) {
+        
+    }];
 }
 
 - (void)configUI {

+ 4 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackBodyView.m

@@ -11,7 +11,7 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *tipsLabel;
 @property (weak, nonatomic) IBOutlet UITextField *contactField;
-@property (weak, nonatomic) IBOutlet UILabel *wxContract;
+@property (weak, nonatomic) IBOutlet UILabel *phoneContract;
 @property (weak, nonatomic) IBOutlet UILabel *emailContract;
 @property (weak, nonatomic) IBOutlet UIButton *sureButton;
 @property (weak, nonatomic) IBOutlet UITextField *feedbacktype;
@@ -50,6 +50,9 @@
 
     NSString *orgEmail = [NSString stringWithFormat:@"邮箱:%@", [NSString returnNoNullStringWithString:email]];
     _emailContract.text = orgEmail;
+    
+    NSString *phoneString = [NSString stringWithFormat:@"客服电话:%@", [NSString returnNoNullStringWithString:phone]];
+    _phoneContract.text = phoneString;
 }
 
 - (void)configFeedbackType:(NSString *)desc {

+ 5 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,7 +23,7 @@
                             <constraints>
                                 <constraint firstAttribute="height" constant="166" id="sHc-QR-cFJ"/>
                             </constraints>
-                            <color key="textColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
                         </textView>
@@ -124,6 +124,7 @@
                     <subviews>
                         <textField opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="反馈类型(必选)" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ID8-4h-cal">
                             <rect key="frame" x="12" y="10" width="338" height="21"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
@@ -193,9 +194,9 @@
                 <outlet property="feedbacktype" destination="ID8-4h-cal" id="COl-4M-SIV"/>
                 <outlet property="imageContainer" destination="g6h-Pf-q1h" id="rI4-vW-G9e"/>
                 <outlet property="inputText" destination="Tc3-oC-ieM" id="sWS-s2-Bp8"/>
+                <outlet property="phoneContract" destination="h4X-Xm-3Ji" id="mVP-nF-AJO"/>
                 <outlet property="sureButton" destination="P1V-KW-hig" id="Bk8-cW-lEr"/>
                 <outlet property="tipsLabel" destination="42t-hr-WLQ" id="XoD-kY-m1K"/>
-                <outlet property="wxContract" destination="h4X-Xm-3Ji" id="zaN-Ae-5j1"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="57.589285714285708"/>
         </view>

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackListNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -36,7 +36,7 @@
                                 <constraint firstAttribute="width" constant="75" id="P0u-7P-e5O"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="筛选" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fmd-vA-gcd">

+ 12 - 2
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/AboutUsBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -49,13 +49,23 @@
                                     <color key="textColor" red="0.070588235294117646" green="0.074509803921568626" blue="0.078431372549019607" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fPz-q6-iAc">
+                                    <rect key="frame" x="10" y="59" width="394" height="1"/>
+                                    <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="oMj-2V-uNj"/>
+                                    </constraints>
+                                </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
+                                <constraint firstItem="fPz-q6-iAc" firstAttribute="leading" secondItem="Llz-E9-UuO" secondAttribute="leading" constant="10" id="21g-vt-Tpx"/>
+                                <constraint firstAttribute="trailing" secondItem="fPz-q6-iAc" secondAttribute="trailing" constant="10" id="6zd-Ka-DRR"/>
                                 <constraint firstItem="zan-am-t8E" firstAttribute="centerY" secondItem="Llz-E9-UuO" secondAttribute="centerY" id="J0e-zN-IpI"/>
                                 <constraint firstAttribute="height" constant="60" id="M1m-bo-gOH"/>
                                 <constraint firstItem="cnn-JH-ETQ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="zan-am-t8E" secondAttribute="trailing" constant="12" id="T2E-p6-3sf"/>
                                 <constraint firstItem="zan-am-t8E" firstAttribute="leading" secondItem="Llz-E9-UuO" secondAttribute="leading" constant="16" id="XIq-kX-qbY"/>
+                                <constraint firstAttribute="bottom" secondItem="fPz-q6-iAc" secondAttribute="bottom" id="dxW-Vh-MBr"/>
                                 <constraint firstItem="cnn-JH-ETQ" firstAttribute="centerY" secondItem="Llz-E9-UuO" secondAttribute="centerY" id="xyz-wD-GMm"/>
                                 <constraint firstAttribute="trailing" secondItem="cnn-JH-ETQ" secondAttribute="trailing" constant="16" id="zTa-6I-9Hc"/>
                             </constraints>

BIN
KulexiuForStudent/KulexiuForStudent/ToolKit/KSToolLibrary.framework/KSToolLibrary