소스 검색

Fix when the Dashboard has no records, no NO RECORD is displayed -- 修复Dashboard 无记录时,没有显示NO RECORD resolve: #15
Fix when the dashboard displays no record, click to pop up a blank detail -- 修复当dashboard显示no record 时,点击弹出空白detail resolve: #17

Ray Zhang 5 년 전
부모
커밋
16165fa418

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 46 - 14
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -122,8 +122,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "711"
-            endingLineNumber = "711"
+            startingLineNumber = "717"
+            endingLineNumber = "717"
             landmarkName = "-loadData"
             landmarkType = "7">
          </BreakpointContent>
@@ -250,8 +250,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "967"
-            endingLineNumber = "967"
+            startingLineNumber = "973"
+            endingLineNumber = "973"
             landmarkName = "-showMoreOrderForSection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -282,8 +282,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "657"
-            endingLineNumber = "657"
+            startingLineNumber = "663"
+            endingLineNumber = "663"
             landmarkName = "-dashModelForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -314,8 +314,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "228"
-            endingLineNumber = "228"
+            startingLineNumber = "234"
+            endingLineNumber = "234"
             landmarkName = "-dashModelForIndex:"
             landmarkType = "7">
          </BreakpointContent>
@@ -394,8 +394,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController+HomeTableDelegate.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "107"
-            endingLineNumber = "107"
+            startingLineNumber = "109"
+            endingLineNumber = "109"
             landmarkName = "-handleRowAction:"
             landmarkType = "7">
          </BreakpointContent>
@@ -410,8 +410,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController+HomeTableDelegate.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "77"
-            endingLineNumber = "77"
+            startingLineNumber = "79"
+            endingLineNumber = "79"
             landmarkName = "-paramsForIndexPath:withAction:"
             landmarkType = "7">
          </BreakpointContent>
@@ -906,8 +906,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "572"
-            endingLineNumber = "572"
+            startingLineNumber = "578"
+            endingLineNumber = "578"
             landmarkName = "-_updateUploadItem:withUploadCount:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1040,5 +1040,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4D159F67-2A20-4417-AADC-D392BA468BC1"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController+HomeTableDataSource.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "62"
+            endingLineNumber = "62"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4B23C66C-BE28-405C-9C03-770D42B3FC25"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "81"
+            endingLineNumber = "81"
+            landmarkName = "-setOrders:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 0
RA TradeFiling/RA TradeFiling/FAKE_DATA/home.json

@@ -183,6 +183,7 @@
         "HBL Close Log"
       ],
       "orders": [
+          
         {
           "sn": "1",
           "primary_ccn": "Primary CCN: 9558THD0608081",

+ 4 - 4
RA TradeFiling/RA TradeFiling/Home/HomeDashEmptyCell.xib

@@ -10,15 +10,15 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" restorationIdentifier="HomeDashEmptyCell" selectionStyle="default" indentationWidth="10" reuseIdentifier="HomeDashEmptyCell" id="KGk-i7-Jjw" customClass="HomeDashEmptyCell">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+        <tableViewCell contentMode="scaleToFill" restorationIdentifier="HomeDashEmptyCell" selectionStyle="default" indentationWidth="10" reuseIdentifier="HomeDashEmptyCell" rowHeight="30" id="KGk-i7-Jjw" customClass="HomeDashEmptyCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="30"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="30"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Record" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x8W-xW-RDZ">
-                        <rect key="frame" x="120" y="11.5" width="80.5" height="21"/>
+                        <rect key="frame" x="120" y="4.5" width="80.5" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>

+ 4 - 2
RA TradeFiling/RA TradeFiling/Home/RAHomeViewController+HomeTableDelegate.m

@@ -22,8 +22,8 @@
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     
     ResultBaseModel *model = [self dashModelForIndexPath:indexPath];
-//    if(model.type==ResultTypeEmpty)
-//        return 44;
+    if(model.type==ResultTypeEmpty)
+        return 30;
      if(model.type>4)
         return 78;
     else if(model.type==DashResultTypeeManifestPending)
@@ -56,6 +56,8 @@
     
     ResultBaseModel *mode = [self dashModelForIndexPath:indexPath];
     
+    if(mode.type==DashResultTypeEmpty)
+        return;
     [self handleRowAction:indexPath];
 //
 //    switch(mode.type)

+ 7 - 1
RA TradeFiling/RA TradeFiling/Home/RAHomeViewController.m

@@ -202,7 +202,13 @@
         }
         
     }
-    
+    if (orders.count==0)
+    {
+//                NSDictionary *order = [orders objectAtIndex:i];
+                ResultBaseModel *dashModel = [ResultBaseModel new];
+//                [dashModel setValuesForKeysWithDictionary:order];
+                [orderArr addObject:dashModel];
+    }
 //    {
 //
 //