Fix compatibility issues between xcode 13 and iOS 15 -- 修复xcode 13和iOS 15 兼容性问题(resolve: #14680)

Add description display for common editor switch cell -- common editor switch cell 增加 description 显示(resolve: #14681)

RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -2121,7 +2121,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 49466;
+				CURRENT_PROJECT_VERSION = 49511;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
@@ -2142,7 +2142,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 49466;
+				CURRENT_PROJECT_VERSION = 49511;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";

RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -78,8 +78,8 @@
             filePath = "RA TradeFiling/TFNavigationController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "144"
-            endingLineNumber = "144"
+            startingLineNumber = "146"
+            endingLineNumber = "146"
             landmarkName = "-receiveHandleKickoutNotification:"
             landmarkType = "7">
          </BreakpointContent>
@@ -94,8 +94,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5898"
-            endingLineNumber = "5898"
+            startingLineNumber = "5899"
+            endingLineNumber = "5899"
             landmarkName = "-textField:shouldChangeCharactersInRange:replacementString:"
             landmarkType = "7">
          </BreakpointContent>
@@ -196,5 +196,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C1ED3A60-C284-4D90-A57C-EDF01283B9B2"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/TFNavigationController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "52"
+            endingLineNumber = "52"
+            landmarkName = "-initglayer"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B4CDF5E7-3071-4C64-87D6-1793995ABB6C"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/TFNavigationController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "78"
+            endingLineNumber = "78"
+            landmarkName = "-setupColor"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA TradeFiling/RA TradeFiling/FAKE_DATA/edit_notification_setting.json

@@ -29,13 +29,13 @@
       "value": "true",
       "control": "switch",
       "aname": "HOLD",
-      "detail": "status 01,03,05",
+      "desc": "status 01,03,05",
       "name": "isf_n_hold"
     },
     "item_1": {
       "value": "true",
       "control": "switch",
-      "detail": "status 02,04,06",
+      "desc": "status 02,04,06",
       "aname": "FAIL",
       "name": "isf_n_fail"
     }
@@ -46,7 +46,7 @@
     "item_0": {
       "value": "true",
       "control": "switch",
-      "detail": "status 011,031,051",
+      "desc": "status 011,031,051",
       "aname": "HOLD",
       "name": "isf_n_hold"
     }
@@ -54,4 +54,4 @@
   "up_params": {
     "count": 0
   }
-} 
+}

RA TradeFiling/RA TradeFiling/TFNavigationController.m

@@ -44,6 +44,8 @@
 //}
 -(void) initglayer
 {
+//    return;
+    
     if(_gradientView!=nil)
         return;
     

common/customUI/commoneditor/CommonEditorCellSwitch.h

@@ -11,6 +11,7 @@
 @interface CommonEditorCellSwitch : UITableViewCell
 @property (strong, nonatomic) IBOutlet UILabel *labelTitle;
 @property (strong, nonatomic) IBOutlet UISwitch *switchCtrl;
+@property (weak, nonatomic) IBOutlet UILabel *labelDesc;
 
 @property (strong, nonatomic) IBOutlet UILabel *starMark;
 

common/customUI/commoneditor/CommonEditorViewController.m

@@ -3992,9 +3992,10 @@ if(!self.alert.isBeingDismissed)
             CommonEditorCellSwitch * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
             NSString* title = [item_json valueForKey:@"aname"];
             NSString* value =[item_json valueForKey:@"value"];
-            
+            NSString* desc = [item_json valueForKey:@"desc"];
             
             cell.labelTitle.text=title;
+            cell.labelDesc.text=desc;
             
             int disabble = [[item_json objectForKey:@"disable"] intValue];
             if (disabble==1 || readonly) {

common/customUI/commoneditor/Phone_Switch_Cell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -32,6 +32,13 @@
                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="69X-PI-jlV">
                         <rect key="frame" x="709" y="40" width="51" height="31"/>
                     </switch>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gcL-Te-pNl">
+                        <rect key="frame" x="15" y="48" width="686" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstItem="evX-qc-gHA" firstAttribute="top" secondItem="Ppl-ym-uvS" secondAttribute="top" constant="-5" id="1pR-Y4-tUN"/>
@@ -44,11 +51,12 @@
                 </constraints>
             </tableViewCellContentView>
             <connections>
+                <outlet property="labelDesc" destination="gcL-Te-pNl" id="FZ9-RJ-8eQ"/>
                 <outlet property="labelTitle" destination="Ppl-ym-uvS" id="gpN-EX-fwQ"/>
                 <outlet property="starMark" destination="evX-qc-gHA" id="KPw-jo-gWW"/>
                 <outlet property="switchCtrl" destination="69X-PI-jlV" id="6CI-He-97N"/>
             </connections>
-            <point key="canvasLocation" x="-30" y="60"/>
+            <point key="canvasLocation" x="-30.399999999999999" y="59.370314842578715"/>
         </tableViewCell>
     </objects>
     <resources>