Homer App

修改model detail 显示

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,54 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
+            timestampString = "536232538.785389"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "340"
+            endingLineNumber = "340"
+            landmarkName = "-addtocart"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
+            timestampString = "536232538.789257"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "110"
+            endingLineNumber = "110"
+            landmarkName = "-generate_information"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
+            timestampString = "536232538.790163"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "107"
+            endingLineNumber = "107"
+            landmarkName = "-generate_information"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -1053,8 +1053,8 @@ self.isrefreshing=false;
             cell.btnaddPortfolio.hidden = YES;
             cell.btnNotifyMe.hidden = YES;
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)
-            cell.hmlg_stock_lb.hidden = NO;
-            cell.hmlg_stock_count_lb.hidden = NO;
+//            cell.hmlg_stock_lb.hidden = NO;
+//            cell.hmlg_stock_count_lb.hidden = NO;
             id hmlg_stock = [section_json objectForKey:@"hmlg_avalability"];
             if (hmlg_stock == nil) {
                 hmlg_stock = @"";
@@ -1208,8 +1208,8 @@ self.isrefreshing=false;
 #endif
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)
             
-            cell.hmlg_stock_lb.hidden = NO;
-            cell.hmlg_stock_count_lb.hidden = NO;
+//            cell.hmlg_stock_lb.hidden = NO;
+//            cell.hmlg_stock_count_lb.hidden = NO;
             id hmlg_stock = [section_json objectForKey:@"hmlg_avalability"];
             if (hmlg_stock == nil) {
                 hmlg_stock = @"";
@@ -1792,6 +1792,9 @@ self.isrefreshing=false;
             [weakself showModelDescription:desc];
         };
         
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
+        [cell generate_information];
+#endif
         return cell;
     }
 //    NSDictionary* related_json = [self.detail_data objectForKey:@"related_model"];

RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.h

@@ -12,6 +12,7 @@
 #import "RTLabel.h"
 #import "NotificationNameCenter.h"
 #import "YTPlayerView.h"
+#import "MDHTMLLabel.h"
 
 
 
@@ -80,7 +81,8 @@
 - (void)Hide_selector:(bool) bhide;
 - (void)ClearPhotos;
 
+-(void) generate_information;
 
-
+@property (weak, nonatomic) IBOutlet UILabel *informationLabel;
 
 @end

RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.m

@@ -43,6 +43,13 @@
     
     self.quantity_text.delegate = self;
     
+    
+//    MDHTMLLabelVerticalAlignmentCenter   = 0,
+//    MDHTMLLabelVerticalAlignmentTop      = 1,
+    
+    self.informationLabel.numberOfLines = 0;
+//    self.informationLabel.verticalAlignment=MDHTMLLabelVerticalAlignmentTop;
+//    self.informationLabel.backgroundColor = [UIColor yellowColor];
 //    self.selector_Button.layer.borderWidth = 0.5;
 //    self.selector_Button.layer.borderColor = [[UIColor lightGrayColor] CGColor];
 //    self.selector_Button.layer.cornerRadius = 0;
@@ -57,7 +64,7 @@
               options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld)
               context:@"content changed"];
     
-    
+    [self generate_information];
 }
 
 -(void) dealloc
@@ -77,6 +84,31 @@
     }
     
 }
+-(void) generate_information
+{
+    NSMutableArray* arr_addr = [[NSMutableArray alloc] init];
+    [arr_addr addObject:[NSString stringWithFormat:@"<font style='font-size:15px;font-family:Helvetica' ><b>Availability:</b> %@</font>",self.count_Label.text]];
+    if(self.incomingcount_Label.text.length>0)
+        [arr_addr addObject:[NSString stringWithFormat:@"<font style='font-size:15px;font-family:Helvetica' ><b>Incoming stock:</b> %@</font>",self.incomingcount_Label.text]];
+    if(self.etaval_label.text.length>0)
+    [arr_addr addObject:[NSString stringWithFormat:@"<font style='font-size:15px;font-family:Helvetica' ><b>Next Arrival Date:</b> %@</font>",self.etaval_label.text]];
+    [arr_addr addObject:[NSString stringWithFormat:@"<font style='font-size:15px;font-family:Helvetica' ><b>Availability in 7-10 days:</b> %@</font>",self.hmlg_stock_count_lb.text]];
+    if(self.cqyt_label.text.length>0)
+    [arr_addr addObject:[NSString stringWithFormat:@"<font style='font-size:15px;color:red';font-family:Helvetica><b>%@</b></font>",self.cqyt_label.text]];
+    
+   
+    NSString * information_str = [RAConvertor arr2string:arr_addr separator:@"<br>" trim:true];
+    
+//    UIFont *font=[UIFont systemFontOfSize:14];
+////    label.font=font;
+    NSDictionary *optoins=@{NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType};
+   
+    
+    NSAttributedString * attrStr = [[NSAttributedString alloc] initWithData:[information_str dataUsingEncoding:NSUnicodeStringEncoding] options:optoins documentAttributes:nil error:nil];
+    
+    
+    self.informationLabel.attributedText=attrStr;
+}
 - (IBAction)add_toPortfolio:(id)sender {
     
     UIApplication * app = [UIApplication sharedApplication];

RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -36,42 +36,42 @@
                         <color key="pageIndicatorTintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="currentPageIndicatorTintColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </pageControl>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Availability" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mgQ-BO-nX9">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Availability" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mgQ-BO-nX9">
                         <rect key="frame" x="448" y="230" width="181" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Incoming stock" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5VL-X9-WjJ">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Incoming stock" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5VL-X9-WjJ">
                         <rect key="frame" x="448" y="261" width="181" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="count" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fjq-bO-m1H">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="count" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fjq-bO-m1H">
                         <rect key="frame" x="637" y="230" width="115" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Availability in 7-10 days" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zx9-0T-NX4">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Availability in 7-10 days" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zx9-0T-NX4">
                         <rect key="frame" x="448" y="322" width="181" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="count" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N2k-Q3-MsT">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="count" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N2k-Q3-MsT">
                         <rect key="frame" x="637" y="322" width="115" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="count" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2CX-bB-G2v">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="count" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2CX-bB-G2v">
                         <rect key="frame" x="637" y="261" width="115" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
@@ -119,7 +119,7 @@
                         </connections>
                     </button>
                     <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="CCe-eu-ria">
-                        <rect key="frame" x="624" y="385" width="92" height="29"/>
+                        <rect key="frame" x="624" y="384" width="92" height="29"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     </stepper>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7U2-88-bEi">
@@ -128,21 +128,21 @@
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                     </textField>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Next Arrival Date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZbP-b2-gc7">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Next Arrival Date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZbP-b2-gc7">
                         <rect key="frame" x="448" y="292" width="181" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <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="e7C-FU-4pu">
+                    <label hidden="YES" 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="e7C-FU-4pu">
                         <rect key="frame" x="637" y="292" width="115" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Model QTY in Cart" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YVH-XA-mPg">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Model QTY in Cart" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YVH-XA-mPg">
                         <rect key="frame" x="448" y="353" width="264" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -215,7 +215,7 @@
                         </connections>
                     </button>
                     <view hidden="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rOn-ih-C46" customClass="YTPlayerView">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="554"/>
+                        <rect key="frame" x="-10000" y="0.0" width="768" height="554"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Video player will show here" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dlx-wR-QB7">
@@ -243,6 +243,13 @@
                         <color key="textColor" red="1" green="0.1047433005" blue="0.075207091899999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <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="TGZ-pl-Y5r">
+                        <rect key="frame" x="448" y="169" width="272" height="207"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
             </tableViewCellContentView>
             <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -261,6 +268,7 @@
                 <outlet property="hmlg_stock_lb" destination="Zx9-0T-NX4" id="Xzs-WX-clZ"/>
                 <outlet property="incoming_stock_label" destination="5VL-X9-WjJ" id="z3f-wQ-AxH"/>
                 <outlet property="incomingcount_Label" destination="2CX-bB-G2v" id="4Lc-Mt-VF0"/>
+                <outlet property="informationLabel" destination="TGZ-pl-Y5r" id="tah-hW-QTO"/>
                 <outlet property="introduceBtn" destination="mss-jN-aaG" id="09e-ts-8Ii"/>
                 <outlet property="model_label" destination="sIm-Dr-Yf1" id="CmT-fv-Sh5"/>
                 <outlet property="on_sale_lb" destination="mvn-Q4-VfR" id="daB-z8-yQP"/>

RedAnt ERP Mobile/iSales-HOMER.xcodeproj/project.pbxproj

@@ -286,6 +286,7 @@
 		71EFCA081FF3733600F8D511 /* CommonEditorAutoCompleteView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71EFCA051FF3733600F8D511 /* CommonEditorAutoCompleteView.m */; };
 		71EFCA091FF3733600F8D511 /* CommonEditorAutoCompleteView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 71EFCA061FF3733600F8D511 /* CommonEditorAutoCompleteView.xib */; };
 		71EFCA0B1FF3735900F8D511 /* homerUI.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71EFCA0A1FF3735800F8D511 /* homerUI.storyboard */; };
+		71EFCA0E1FF617C100F8D511 /* MDHTMLLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71EFCA0D1FF617C100F8D511 /* MDHTMLLabel.m */; };
 		71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FFBBE61C60894900D91DC2 /* iSalesDB.m */; };
 		71FFBBEA1C60894900D91DC2 /* RANetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FFBBE81C60894900D91DC2 /* RANetwork.m */; };
 /* End PBXBuildFile section */
@@ -799,6 +800,8 @@
 		71EFCA061FF3733600F8D511 /* CommonEditorAutoCompleteView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditorAutoCompleteView.xib; path = ../../common/customUI/commoneditor/CommonEditorAutoCompleteView.xib; sourceTree = "<group>"; };
 		71EFCA071FF3733600F8D511 /* CommonEditorAutoCompleteView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommonEditorAutoCompleteView.h; path = ../../common/customUI/commoneditor/CommonEditorAutoCompleteView.h; sourceTree = "<group>"; };
 		71EFCA0A1FF3735800F8D511 /* homerUI.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = homerUI.storyboard; sourceTree = "<group>"; };
+		71EFCA0C1FF617C100F8D511 /* MDHTMLLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MDHTMLLabel.h; path = common/customUI/MDHTMLLabel.h; sourceTree = SOURCE_ROOT; };
+		71EFCA0D1FF617C100F8D511 /* MDHTMLLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MDHTMLLabel.m; path = common/customUI/MDHTMLLabel.m; sourceTree = SOURCE_ROOT; };
 		71FFBBE51C60894900D91DC2 /* iSalesDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iSalesDB.h; path = common/data_provider/iSalesDB.h; sourceTree = SOURCE_ROOT; };
 		71FFBBE61C60894900D91DC2 /* iSalesDB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iSalesDB.m; path = common/data_provider/iSalesDB.m; sourceTree = SOURCE_ROOT; };
 		71FFBBE71C60894900D91DC2 /* RANetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RANetwork.h; path = common/data_provider/RANetwork.h; sourceTree = SOURCE_ROOT; };
@@ -1130,6 +1133,8 @@
 		42EC1CA31FA02014008B0325 /* Homer */ = {
 			isa = PBXGroup;
 			children = (
+				71EFCA0C1FF617C100F8D511 /* MDHTMLLabel.h */,
+				71EFCA0D1FF617C100F8D511 /* MDHTMLLabel.m */,
 				42EC1CA41FA02078008B0325 /* HomerModelDetailHeaderCell.h */,
 				42EC1CA51FA02078008B0325 /* HomerModelDetailHeaderCell.m */,
 				42EC1CA61FA02078008B0325 /* HomerModelDetailHeaderCell.xib */,
@@ -2139,6 +2144,7 @@
 				71DF745C1C575E7900F2789C /* CommonEditorCellEdit.m in Sources */,
 				7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */,
 				71DF74691C575E7900F2789C /* MonthPickerViewController.m in Sources */,
+				71EFCA0E1FF617C100F8D511 /* MDHTMLLabel.m in Sources */,
 				71DF74371C575D6600F2789C /* CommonGridViewController.m in Sources */,
 				71C1D8511F456CB400CEA1C9 /* HWWeakTimer.m in Sources */,
 				71C1D85A1F456DE200CEA1C9 /* CategoryCellNPD.m in Sources */,

RedAnt ERP Mobile/iSales-HOMER/config.h

@@ -20,7 +20,7 @@
 #define MPACK
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1

RedAnt Mobile/RedAnt Mobile/config.h

@@ -31,7 +31,7 @@
 #define PDF_DEBUG false
 
 
-#define FAKE_DATA
+//#define FAKE_DATA
 
 #define PROJ_RAMOBILE