Эх сурвалжийг харах

Crm 锁定竖屏,修改首页测试链接。

Ray Zhang 7 жил өмнө
parent
commit
81c46e7e97

+ 11 - 47
RedAnt CRM/APEX CRM/APEX CRM/Base.lproj/Main.storyboard

@@ -44,66 +44,30 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="1" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JRK-sO-VHR">
-                                <rect key="frame" x="70" y="229" width="30" height="34"/>
+                                <rect key="frame" x="58" y="229" width="55" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <state key="normal" title="SUI"/>
+                                <state key="normal" title="Robert"/>
                                 <connections>
                                     <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="hKk-gP-ugG"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="2" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NuD-BO-7rQ">
-                                <rect key="frame" x="55" y="318" width="57" height="34"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <state key="normal" title="Clouda"/>
-                                <connections>
-                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="dME-96-fra"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" tag="3" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TtI-Xx-MvR">
-                                <rect key="frame" x="34" y="397" width="100" height="34"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <state key="normal" title="Framework7"/>
-                                <connections>
-                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Nz0-Xb-GKp"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" tag="4" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sUV-8n-G5H">
-                                <rect key="frame" x="166" y="143" width="78" height="34"/>
+                            <button opaque="NO" tag="2" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4F7-tz-J3r">
+                                <rect key="frame" x="69" y="319" width="33" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <state key="normal" title="Amaze UI"/>
+                                <state key="normal" title="MUI"/>
                                 <connections>
-                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="wBx-HF-RzR"/>
+                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="YFT-1g-r82"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="5" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U0n-pN-Krw">
-                                <rect key="frame" x="184" y="227" width="48" height="34"/>
+                            <button opaque="NO" tag="3" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BnA-nt-RcU">
+                                <rect key="frame" x="71" y="391" width="30" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <state key="normal" title="Jingle"/>
-                                <connections>
-                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="x6Z-Hf-W5K"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" tag="7" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sls-ZW-KCB">
-                                <rect key="frame" x="184" y="397" width="44" height="34"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <state key="normal" title="WeUI"/>
-                                <connections>
-                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Yd5-XK-zb3"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" tag="6" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ced-gG-hGh">
-                                <rect key="frame" x="188" y="318" width="37" height="34"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <state key="normal" title="腾讯"/>
+                                <state key="normal" title="SUI"/>
                                 <connections>
-                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="OL1-Vg-qSd"/>
+                                    <action selector="onClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="pos-Hr-REZ"/>
                                 </connections>
                             </button>
                         </subviews>
@@ -129,7 +93,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" cocoaTouchSystemColor="lightTextColor"/>
                         <constraints>
                             <constraint firstItem="nSN-pu-SH2" firstAttribute="trailing" secondItem="Wtw-Bc-GH6" secondAttribute="trailing" id="0Uo-vg-5QR"/>
                             <constraint firstItem="Wtw-Bc-GH6" firstAttribute="bottom" secondItem="nSN-pu-SH2" secondAttribute="bottom" id="3Qh-xt-Tdd"/>

+ 9 - 12
RedAnt CRM/APEX CRM/APEX CRM/Info.plist

@@ -20,6 +20,15 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>使用相机拍照</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>访问相册</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -31,8 +40,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
@@ -41,15 +48,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSCameraUsageDescription</key>
-	<string>使用相机拍照</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>访问相册</string>
-    
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>    
 </dict>
 </plist>

+ 2 - 1
RedAnt CRM/APEX CRM/APEX CRM/RAWKWebView.m

@@ -68,13 +68,14 @@
     
     WKPreferences *preferences = [WKPreferences new];
     preferences.javaScriptCanOpenWindowsAutomatically = YES;
-    preferences.minimumFontSize = 40.0;
+//    preferences.minimumFontSize = 40.0;
     
     configuration.preferences = preferences;
     
     self.wkwebView = [[WKWebView alloc] initWithFrame:self.bounds configuration:configuration];
     self.wkwebView.UIDelegate = self;
     self.wkwebView.navigationDelegate = self;
+    self.wkwebView.scrollView.bounces = false;
     [self addSubview:self.wkwebView];
 }
 

+ 7 - 6
RedAnt CRM/APEX CRM/APEX CRM/ViewController.m

@@ -37,31 +37,32 @@
         case 0:
             break;
         case 1:
-            vc.url=@"http://m.sui.taobao.org/demos/";
+            vc.url=@"http://192.168.0.124:8081/j/crm/mobile/login";
             break;
         case 2:
-             vc.url=@"http://framework7.io/kitchen-sink/core/?theme=md";
+             vc.url=@"http://www.dcloud.io/hellomui/";
             break;
         case 3:
             
-            vc.url=@"http://framework7.io/kitchen-sink/core/?theme=ios";
+            vc.url=@"http://m.sui.taobao.org/demos/";
             break;
         case 4:
-            vc.url=@"http://www.tingall.com/?index";
+//            vc.url=@"http://www.tingall.com/?index";
             
             break;
         case 5:
-            vc.url=@"http://vycool.com/Jingle/demo/index.html";
+//            vc.url=@"http://vycool.com/Jingle/demo/index.html";
             
             break;
         case 6:
 //            vc.url=@"https://github.com/AlloyTeamDev/Pro";
             break;
         case 7:
-            vc.url=@"https://weui.io";
+//            vc.url=@"https://weui.io";
             break;
 
         default:
+            //http://dev.dcloud.net.cn/mui/
             break;
     }
 //    vc.url = @"http://192.168.0.124:8081/j/crm/mobile/login";

+ 2 - 0
RedAnt CRM/APEX CRM/APEX CRM/WKWebTestViewController.m

@@ -19,6 +19,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    self.navigationController.navigationBar.hidden =true;
+    
     [UIApplication sharedApplication].keyWindow.backgroundColor = [UIColor whiteColor];
     
     if (@available(iOS 11, *)) {

BIN
RedAnt CRM/RedAnt CRM.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 22 - 22
RedAnt CRM/RedAnt CRM.xcworkspace/xcuserdata/ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,13 +10,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565693338.792174"
+            timestampString = "565770271.81768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "489"
-            endingLineNumber = "489"
-            landmarkName = "RAWKWebView"
-            landmarkType = "3">
+            startingLineNumber = "490"
+            endingLineNumber = "490"
+            landmarkName = "-mailComposeController:didFinishWithResult:error:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -26,13 +26,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565693338.792256"
+            timestampString = "565770271.818109"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "718"
-            endingLineNumber = "718"
-            landmarkName = "-webView:didFinishNavigation:"
-            landmarkType = "7">
+            startingLineNumber = "719"
+            endingLineNumber = "719"
+            landmarkName = "RAWKWebView"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -42,12 +42,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565693338.792311"
+            timestampString = "565770271.818174"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "732"
-            endingLineNumber = "732"
-            landmarkName = "-webView:didFailNavigation:withError:"
+            startingLineNumber = "733"
+            endingLineNumber = "733"
+            landmarkName = "-webView:didReceiveAuthenticationChallenge:completionHandler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -58,12 +58,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565693338.792359"
+            timestampString = "565770271.818224"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "739"
-            endingLineNumber = "739"
-            landmarkName = "-webView:decidePolicyForNavigationAction:decisionHandler:"
+            startingLineNumber = "740"
+            endingLineNumber = "740"
+            landmarkName = "-webView:didReceiveAuthenticationChallenge:completionHandler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -74,12 +74,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565693338.792407"
+            timestampString = "565770271.81827"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "753"
-            endingLineNumber = "753"
-            landmarkName = "-webView:decidePolicyForNavigationResponse:decisionHandler:"
+            startingLineNumber = "754"
+            endingLineNumber = "754"
+            landmarkName = "-webView:didReceiveAuthenticationChallenge:completionHandler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>