重庆迈尖科技有限公司
2018-08-20 8241c1ab0f4fac68a66b0aa10db0c355019e71bc
Merge branch 'master' of ssh://193.112.35.168:29418/haicaojie

# Conflicts:
# MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
8个文件已删除
22个文件已修改
2493 ■■■■ 已修改文件
MIduo.xcodeproj/project.pbxproj 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 194 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/Category/UIViewController+Tools.m 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/YTHsharedManger.m 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/Reachability.h 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/Reachability.m 247 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/SGNetObserver.h 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/SGNetObserver.m 183 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/SimplePing.h 272 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/SimplePing.m 785 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/SimplePinger.h 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/lib/SGNetObserver/SimplePinger.m 188 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/SJBaseViewController.m 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/动态/DynamicViewController.m 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/LoginViewController.m 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/SettingViewController.m 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/BalanceViewController.m 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/体现/IncarnateViewController.m 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/体现/IncarnateViewController.xib 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/明细/BalaDetailViewController.m 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/messageLogin/MessageLoginViewController.m 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/userInfoViewController.m 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/搜索/SideSlipPriceTableViewCell.m 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/搜索/searchDetailViewController.m 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/网页视图/XYRWebViewController.m 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/网页视图/商品详情/GoodDeTrViewController.m 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/邀请/商品分享/ShonpingShareViewController.m 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/首页/recommendViewController.m 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcodeproj/project.pbxproj
@@ -539,10 +539,6 @@
        2DEAE78220EC6748003349B4 /* SJNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DEAE78120EC6748003349B4 /* SJNetwork.m */; };
        2DEF568120FF20990071C985 /* SJTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DEF568020FF20990071C985 /* SJTipView.m */; };
        2DEF568420FF36620071C985 /* SJBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DEF568320FF36620071C985 /* SJBaseViewController.m */; };
        2DFBA9CD21217D6F00AB845B /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DFBA9C621217D6F00AB845B /* Reachability.m */; };
        2DFBA9CE21217D6F00AB845B /* SGNetObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DFBA9C821217D6F00AB845B /* SGNetObserver.m */; };
        2DFBA9CF21217D6F00AB845B /* SimplePing.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DFBA9CA21217D6F00AB845B /* SimplePing.m */; };
        2DFBA9D021217D6F00AB845B /* SimplePinger.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DFBA9CC21217D6F00AB845B /* SimplePinger.m */; };
        2DFC813A20E09D4500CCDAB7 /* yw_1222.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2DFC813920E09D4500CCDAB7 /* yw_1222.jpg */; };
        AD52310E1F1B6A24007FCFA1 /* OrderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD52310D1F1B6A24007FCFA1 /* OrderViewController.m */; };
/* End PBXBuildFile section */
@@ -1536,14 +1532,6 @@
        2DEF568020FF20990071C985 /* SJTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SJTipView.m; sourceTree = "<group>"; };
        2DEF568220FF36620071C985 /* SJBaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SJBaseViewController.h; sourceTree = "<group>"; };
        2DEF568320FF36620071C985 /* SJBaseViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SJBaseViewController.m; sourceTree = "<group>"; };
        2DFBA9C521217D6F00AB845B /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
        2DFBA9C621217D6F00AB845B /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
        2DFBA9C721217D6F00AB845B /* SGNetObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGNetObserver.h; sourceTree = "<group>"; };
        2DFBA9C821217D6F00AB845B /* SGNetObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SGNetObserver.m; sourceTree = "<group>"; };
        2DFBA9C921217D6F00AB845B /* SimplePing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimplePing.h; sourceTree = "<group>"; };
        2DFBA9CA21217D6F00AB845B /* SimplePing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimplePing.m; sourceTree = "<group>"; };
        2DFBA9CB21217D6F00AB845B /* SimplePinger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimplePinger.h; sourceTree = "<group>"; };
        2DFBA9CC21217D6F00AB845B /* SimplePinger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimplePinger.m; sourceTree = "<group>"; };
        2DFC813920E09D4500CCDAB7 /* yw_1222.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = yw_1222.jpg; sourceTree = "<group>"; };
        A10E40577F379E83D85926C6 /* Pods_MIduo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MIduo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
        AB238CE26A4E87752975FA82 /* Pods-MIduo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MIduo.release.xcconfig"; path = "Pods/Target Support Files/Pods-MIduo/Pods-MIduo.release.xcconfig"; sourceTree = "<group>"; };
@@ -3238,7 +3226,6 @@
        18AC538B1E5A9876006D1FDF /* lib */ = {
            isa = PBXGroup;
            children = (
                2DFBA9C421217D6F00AB845B /* SGNetObserver */,
                2D1175AA21199F2700D4CD0F /* FileManger */,
                2D9F157B2117E8E800EFFAFB /* EasyJSWebView-master */,
                1845C239209C562C009C639B /* LBXScan */,
@@ -3498,21 +3485,6 @@
                2D9F15862117E8E800EFFAFB /* test.html */,
            );
            path = "EasyJSWebView-master";
            sourceTree = "<group>";
        };
        2DFBA9C421217D6F00AB845B /* SGNetObserver */ = {
            isa = PBXGroup;
            children = (
                2DFBA9C521217D6F00AB845B /* Reachability.h */,
                2DFBA9C621217D6F00AB845B /* Reachability.m */,
                2DFBA9C721217D6F00AB845B /* SGNetObserver.h */,
                2DFBA9C821217D6F00AB845B /* SGNetObserver.m */,
                2DFBA9C921217D6F00AB845B /* SimplePing.h */,
                2DFBA9CA21217D6F00AB845B /* SimplePing.m */,
                2DFBA9CB21217D6F00AB845B /* SimplePinger.h */,
                2DFBA9CC21217D6F00AB845B /* SimplePinger.m */,
            );
            path = SGNetObserver;
            sourceTree = "<group>";
        };
        3EB2FCBC06FCFF59022C5ECD /* Frameworks */ = {
@@ -3934,7 +3906,6 @@
                1845C450209C562D009C639B /* ZXAddressBookDoCoMoResultParser.m in Sources */,
                1865E43C1EF1112A00333767 /* SectionTopicCollectionViewCell.m in Sources */,
                1845C4C1209C562E009C639B /* ZXRSSExpandedDecodedNumeric.m in Sources */,
                2DFBA9CE21217D6F00AB845B /* SGNetObserver.m in Sources */,
                181ECE271EF369BF00472224 /* ZJSegmentStyle.m in Sources */,
                1892034720BE51C6008C1045 /* LBXZXCapture.m in Sources */,
                1845C45A209C562D009C639B /* ZXGeoParsedResult.m in Sources */,
@@ -3950,7 +3921,6 @@
                1897D9C01E600E94003DF6FE /* ClearCollectionReusableView.m in Sources */,
                2D9F158A2117E8E800EFFAFB /* EasyJSWebViewProxyDelegate.m in Sources */,
                1845C4BE209C562E009C639B /* ZXRSSExpandedCurrentParsingState.m in Sources */,
                2DFBA9CF21217D6F00AB845B /* SimplePing.m in Sources */,
                187522901E654D6900B6AE15 /* SureWebViewController.m in Sources */,
                18D399AD1EA765AD00A01CD3 /* thirdClassificationViewController.m in Sources */,
                1845C514209C562E009C639B /* ZXQRCodeEncoder.m in Sources */,
@@ -4003,7 +3973,6 @@
                182BEB601EAA081400B11FC5 /* LXAlertView.m in Sources */,
                1810FBF91E7FBDBB005B42B3 /* NSString+Utils.m in Sources */,
                1892034320BE51C6008C1045 /* LBXScanView.m in Sources */,
                2DFBA9CD21217D6F00AB845B /* Reachability.m in Sources */,
                2D43E74E211D92790008BA48 /* ALAnomalyNetWorkView.m in Sources */,
                2D6858F420DB5D8B00E4376A /* SJCouponCollectionViewCell.m in Sources */,
                1845C47D209C562D009C639B /* ZXBitMatrix.m in Sources */,
@@ -4058,7 +4027,6 @@
                1896F26D1FD0ED96009D6EEF /* RecommendCouponViewController.m in Sources */,
                18D9541A20AE705C005D5D02 /* FeignGoodsDetaiViewController.m in Sources */,
                1845C4A1209C562E009C639B /* ZXDataMatrixDefaultPlacement.m in Sources */,
                2DFBA9D021217D6F00AB845B /* SimplePinger.m in Sources */,
                1845C4B2209C562E009C639B /* ZXAbstractExpandedDecoder.m in Sources */,
                1845C4D6209C562E009C639B /* ZXEAN13Reader.m in Sources */,
                1845C4B4209C562E009C639B /* ZXAI01320xDecoder.m in Sources */,
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -34,11 +34,11 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/LoginViewController.m"
            timestampString = "555922261.738368"
            timestampString = "556015784.412843"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "560"
            endingLineNumber = "560"
            startingLineNumber = "562"
            endingLineNumber = "562"
            landmarkName = "-WeChatHasLoged:"
            landmarkType = "7">
         </BreakpointContent>
@@ -50,28 +50,12 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/MineViewController.m"
            timestampString = "555582159.340149"
            timestampString = "556193666.6095949"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "679"
            endingLineNumber = "679"
            landmarkName = "-noticeOrderOrShopCarBackWithLoginVc"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x641c;&#x7d22;/searchDetailViewController.m"
            timestampString = "555588815.727831"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "640"
            endingLineNumber = "640"
            landmarkName = "-searchDataWithText:WithPage:WithFilter:WithOrder:WithStartPrice:WithEndPrice:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
@@ -114,7 +98,7 @@
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E6%88%91%E7%9A%84/SJUnbindPhoneViewController.m"
                  timestampString = "555929976.738608"
                  timestampString = "556193672.6899689"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "101"
@@ -129,7 +113,7 @@
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E6%88%91%E7%9A%84/SJUnbindPhoneViewController.m"
                  timestampString = "555929976.740299"
                  timestampString = "556193672.691522"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "101"
@@ -162,126 +146,62 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555929971.643994"
            timestampString = "556015784.412999"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "277"
            endingLineNumber = "277"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555929971.64446"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "276"
            endingLineNumber = "276"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555929971.6446691"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "303"
            endingLineNumber = "303"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
            <Locations>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "-[ShonpingShareViewController webView:shouldStartLoadWithRequest:navigationType:]"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E9%82%80%E8%AF%B7/%E5%95%86%E5%93%81%E5%88%86%E4%BA%AB/ShonpingShareViewController.m"
                  timestampString = "555929976.753899"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "305"
                  endingLineNumber = "305"
                  offsetFromSymbolStart = "3016">
               </Location>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "-[ShonpingShareViewController webView:shouldStartLoadWithRequest:navigationType:]"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E9%82%80%E8%AF%B7/%E5%95%86%E5%93%81%E5%88%86%E4%BA%AB/ShonpingShareViewController.m"
                  timestampString = "555929976.755477"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "305"
                  endingLineNumber = "305"
                  offsetFromSymbolStart = "3068">
               </Location>
            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555929971.644861"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "298"
            endingLineNumber = "298"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555929971.645052"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "290"
            endingLineNumber = "290"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555929971.6452399"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "516"
            endingLineNumber = "516"
            startingLineNumber = "546"
            endingLineNumber = "546"
            landmarkName = "-dealloc"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/message/MineMessageViewController.m"
            timestampString = "556015784.413071"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "77"
            endingLineNumber = "77"
            landmarkName = "-getMessage"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/messageLogin/MessageLoginViewController.m"
            timestampString = "556015784.413177"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "437"
            endingLineNumber = "437"
            landmarkName = "-sendMessage:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/SettingViewController.m"
            timestampString = "556015933.093775"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "82"
            endingLineNumber = "82"
            landmarkName = "-fromBack:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>
MIduo/Info.plist
@@ -17,7 +17,7 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
    <string>1.1.0</string>
    <string>1.1.1</string>
    <key>CFBundleURLTypes</key>
    <array>
        <dict>
@@ -94,7 +94,7 @@
        </dict>
    </array>
    <key>CFBundleVersion</key>
    <string>12</string>
    <string>13</string>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>tbopen</string>
MIduo/Êý¾Ý/Category/UIViewController+Tools.m
@@ -509,12 +509,11 @@
    __block BOOL canUse = NO;
    
    NSString *urlString = @"https://captive.apple.com";
    NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]  cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:10];
    // ä½¿ç”¨ä¿¡å·é‡å®žçްNSURLSession同步请求**
    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
    [[[NSURLSession sharedSession] dataTaskWithURL:[NSURL URLWithString:urlString] completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
    [[[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
        NSString* result = [[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding];
        //解析html页面
        NSString *htmlString = [self filterHTML:result];
@@ -530,8 +529,8 @@
            NSLog(@"手机无法访问互联网: %d",canUse);
        }
        dispatch_semaphore_signal(semaphore);
    }] resume];
    }]resume];
    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
    return canUse;
}
MIduo/Êý¾Ý/YTHsharedManger.m
@@ -234,8 +234,10 @@
        }
    } failureCallback:^(ALBBSession *session, NSError *error) {
        NSLog(@"登录失败!");
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showErrorWithStatus:@"登录失败,请稍候再试"];
//        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
//        [SVProgressHUD showErrorWithStatus:@"登录失败,请稍候再试"];
        ALToastCenter(@"登录失败,请稍候再试");
        [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"TaoBaoLogin"];
        block(NO, nil);
    }];
@@ -254,6 +256,7 @@
    }else{
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showErrorWithStatus:@"您还没有安装微信客户端"];
    }
}
MIduo/Êý¾Ý/lib/SGNetObserver/Reachability.h
File was deleted
MIduo/Êý¾Ý/lib/SGNetObserver/Reachability.m
File was deleted
MIduo/Êý¾Ý/lib/SGNetObserver/SGNetObserver.h
File was deleted
MIduo/Êý¾Ý/lib/SGNetObserver/SGNetObserver.m
File was deleted
MIduo/Êý¾Ý/lib/SGNetObserver/SimplePing.h
File was deleted
MIduo/Êý¾Ý/lib/SGNetObserver/SimplePing.m
File was deleted
MIduo/Êý¾Ý/lib/SGNetObserver/SimplePinger.h
File was deleted
MIduo/Êý¾Ý/lib/SGNetObserver/SimplePinger.m
File was deleted
MIduo/½çÃæ/SJBaseViewController.m
@@ -7,12 +7,10 @@
//
#import "SJBaseViewController.h"
#import "SGNetObserver.h"
//#define TICK   NSDate *startTime = [NSDate date]
//#define TOCK   NSLog(@"Time: %f", -[startTime timeIntervalSinceNow])
@interface SJBaseViewController ()
@property (nonatomic,strong) SGNetObserver *observer;
@end
@@ -33,22 +31,12 @@
    
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(NetWorkStatesChange:) name:@"netWorkChangeEventNotification" object:nil];
    [self .view addSubview:self.noNetworkView];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkError:) name:@"networkError" object:nil];
    self.observer = [SGNetObserver defultObsever];
    [self.observer startNotifier];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkStatusChanged:) name:SGReachabilityChangedNotification object:nil];
//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkError:) name:@"networkError" object:nil];
}
- (void)back:(UIBarButtonItem*)item {
    [self.navigationController popViewControllerAnimated:YES];
}
- (void)networkStatusChanged:(NSNotification *)notify{
    NSLog(@"notify-------%@",notify.userInfo);
//    NSDictionary *dic = notify.userInfo;
//    NSInteger status = [dic[@"status"]integerValue];
//    if (status == 0) {
//        [YTHsharedManger startManger].networkStatus = status;
//    }
}
//毫秒数时间戳转
@@ -117,7 +105,8 @@
}
#pragma mark - ç½‘络状态发生变化通知方法
-(void)NetWorkStatesChange:(NSNotification *)sender{
//    BOOL canThouth = [self checkNetCanUse];
    BOOL canThouth = [self checkNetCanUse];
    NSLog(@"%c",canThouth);
    [YTHsharedManger startManger].isCheckNetCanUse = 0;
    NSDictionary *urlDic = [[NSUserDefaults standardUserDefaults]objectForKey:@"MainUrlArray"];
    BOOL urlRequest = NO;
@@ -187,12 +176,26 @@
                [self loadData];
            }
            
            if (canThouth) {
                if (urlRequest) {
                    [self isJumpTaobao];
                }
                [_noNetworkView setHidden:YES];
                [self loadData];
            }else{
                [YTHsharedManger startManger].isCheckNetCanUse = -2;
                if ([self datasourceIsNull]) {
                    self.noNetworkView.primtTitle.text = @"网络连接异常,请检测网络设置";
                    [self.noNetworkView.iconImage setImage:[UIImage imageNamed:@"网络错误"]];
                    [self loadNoNetworkView];
                    NSLog(@"%d",[self datasourceIsNull]);
                } else {
                    NSLog(@"%d",[self datasourceIsNull]);
                    [_noNetworkView setHidden:YES];
                }
            }
            break;
            
        default:
@@ -204,11 +207,19 @@
    self.noNetworkView.hidden = NO;
}
- (void)ClickConnectBtn:(UIButton *)sender{
    NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
    if( [[UIApplication sharedApplication]canOpenURL:url] ) {
        [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
        }];
    if (iOS10) {
        NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
            }];
        }
    }else{
        NSURL *url= [NSURL URLWithString:@"prefs:root=com.haicaojie-ios"];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url];
        }
    }
}
- (SJNoNetwork *)noNetworkView{
    if (_noNetworkView) {
@@ -231,31 +242,7 @@
    
    return NO;
}
- (void)networkError:(NSNotification *)notice{
    [YTHsharedManger startManger].isCheckNetCanUse = -2;
    if ([self datasourceIsNull]) {
        self.noNetworkView.primtTitle.text = @"网络连接异常,请检测网络设置";
        [self.noNetworkView.iconImage setImage:[UIImage imageNamed:@"网络错误"]];
        [self loadNoNetworkView];
        NSLog(@"%d",[self datasourceIsNull]);
    } else {
        NSLog(@"%d",[self datasourceIsNull]);
        [_noNetworkView setHidden:YES];
    }
    // é¦–页特有
    if ([self homeIsShowNetWorkView]) {
        [self loadNoNetworkView];
        NSLog(@"%d",[self datasourceIsNull]);
    } else {
        [_noNetworkView setHidden:YES];
        [self loadData];
    }
}
- (void)dealloc{
    [[NSNotificationCenter defaultCenter] removeObserver:self];
MIduo/½çÃæ/¶¯Ì¬/DynamicViewController.m
@@ -80,10 +80,17 @@
}
- (void)ClickConnectBtn:(UIButton *)sender{
    NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
    if( [[UIApplication sharedApplication]canOpenURL:url] ) {
        [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
        }];
    if (iOS10) {
        NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
            }];
        }
    }else{
        NSURL *url= [NSURL URLWithString:@"prefs:root=com.haicaojie-ios"];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url];
        }
    }
}
MIduo/½çÃæ/ÎÒµÄ/LoginViewController.m
@@ -403,7 +403,9 @@
        }
    }];
}
- (BOOL)datasourceIsNull{
    return NO;
}
/**
 åˆ¤æ–­æ˜¯å¦åŒæ„ç”¨æˆ·åè®®ï¼Œé»˜è®¤åŒæ„
 
MIduo/½çÃæ/ÎÒµÄ/SettingViewController.m
@@ -89,12 +89,27 @@
 */
-(void)chlickSwitchButton:(UISwitch *)sender{
    if (sender.on) {
        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
        [self jumpToSet];
    }else{
        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
        [self jumpToSet];
    }
}
- (void)jumpToSet{
    if (iOS10) {
        NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
            }];
        }
    }else{
        NSURL *url= [NSURL URLWithString:@"prefs:root=com.haicaojie-ios"];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url];
        }
    }
}
/**
 æ˜¯å¦å¼€å¯äº†é€šçŸ¥
 */
@@ -189,11 +204,11 @@
            
            if ([self isAllowedNotification]) {
                
                [cell.switchButton setOn:YES];
                [cell.switchButton setOn:NO];
                
            }else{
                
                [cell.switchButton setOn:NO];
                [cell.switchButton setOn:YES];
            }
            return cell;
        }
MIduo/½çÃæ/ÎÒµÄ/balance/BalanceViewController.m
@@ -158,7 +158,7 @@
    
    self.blanceLabel = [[UILabel alloc]initWithFrame:CGRectMake(20,  20, KScreenW / 3 * 2, 40)];
    self.blanceLabel.textColor = XYRMainColor;
    self.blanceLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"myHongBao"]];
//    self.blanceLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"myHongBao"]];
    self.blanceLabel.font = [UIFont boldSystemFontOfSize:40];
    [_fanliView addSubview:self.blanceLabel];
    
@@ -228,7 +228,8 @@
    _fanliLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 5, KScreenW / 2, 33)];
    _fanliLabel.textColor = [UIColor blackColor];
    _fanliLabel.font = [UIFont boldSystemFontOfSize:30];
    _fanliLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"totalHongBao"]];
//    _fanliLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"totalHongBao"]];
//    _fanliLabel.text = @"0";
    _fanliLabel.textAlignment = NSTextAlignmentCenter;
    [buttomView addSubview:_fanliLabel];
    UILabel *fanLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_fanliLabel.frame) + 5, KScreenW / 2, 20)];
@@ -241,7 +242,8 @@
    _accountLabel = [[UILabel alloc]initWithFrame:CGRectMake(KScreenW / 2 + 1, 5, KScreenW / 2, 33)];
    _accountLabel.textColor = [UIColor blackColor];
    _accountLabel.font = [UIFont boldSystemFontOfSize:30];
    _accountLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"noOpenHongBao"]];
//    _accountLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"noOpenHongBao"]];
//    _accountLabel.text = @"0";
    _accountLabel.textAlignment = NSTextAlignmentCenter;
    [buttomView addSubview:_accountLabel];
@@ -266,7 +268,8 @@
    _royaltiesedLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 5, KScreenW / 2, 33)];
    _royaltiesedLabel.textColor = [UIColor blackColor];
    _royaltiesedLabel.font = [UIFont boldSystemFontOfSize:30];
    _royaltiesedLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"totalHongBao"]];
//    _royaltiesedLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"totalHongBao"]];
//    _royaltiesedLabel.text = @"0";
    _royaltiesedLabel.textAlignment = NSTextAlignmentCenter;
    [_royaltiesView addSubview:_royaltiesedLabel];
    UILabel *leijiLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_royaltiesedLabel.frame) + 5, KScreenW / 2, 20)];
@@ -279,7 +282,8 @@
    _royaltiesLabel = [[UILabel alloc]initWithFrame:CGRectMake(KScreenW / 2 + 1, 5, KScreenW / 2, 33)];
    _royaltiesLabel.textColor = [UIColor blackColor];
    _royaltiesLabel.font = [UIFont boldSystemFontOfSize:30];
    _royaltiesLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"noOpenHongBao"]];
//    _royaltiesLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"noOpenHongBao"]];
//    _royaltiesLabel.text = @"0";
    _royaltiesLabel.textAlignment = NSTextAlignmentCenter;
    [_royaltiesView addSubview:_royaltiesLabel];
    
@@ -321,7 +325,7 @@
//    _estimateLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];
    
    _estimateLabel.textAlignment = NSTextAlignmentCenter;
    _estimateLabel.text = @"0";
//    _estimateLabel.text = @"0";
    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_estimateLabel.frame)+ 20, CGRectGetMaxY(_estimateLabel.frame), 60, 25)];
    label.font = [UIFont systemFontOfSize:13];
    if (KScreenW > 375) {
@@ -358,7 +362,7 @@
//    _mothLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];
    
    _mothLabel.textAlignment = NSTextAlignmentCenter;
    _mothLabel.text = @"0";
//    _mothLabel.text = @"0";
    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_mothLabel.frame) + 20, CGRectGetMaxY(_mothLabel.frame) ,60, 25)];
    label.font = [UIFont systemFontOfSize:13];
    if (KScreenW > 375) {
@@ -394,7 +398,7 @@
    _lastMonLabel.font = [UIFont boldSystemFontOfSize:30];
//    _lastMonLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];
    _lastMonLabel.textAlignment = NSTextAlignmentCenter;
    _lastMonLabel.text = @"0";
//    _lastMonLabel.text = @"0";
    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_lastMonLabel.frame) + 15, CGRectGetMaxY(_lastMonLabel.frame) , 60, 25)];
    label.font = [UIFont systemFontOfSize:13];
    if (KScreenW > 375) {
MIduo/½çÃæ/ÎÒµÄ/balance/ÌåÏÖ/IncarnateViewController.m
@@ -73,8 +73,7 @@
 */
- (void)initializeInterface {
    
    self.balanLabel.text = [NSString stringWithFormat:@"可提现余额%@元",self.datasource[@"myHongBao"]];
//    self.balanLabel.text = [NSString stringWithFormat:@"可提现余额%@元",self.datasource[@"myHongBao"]];
    _addView.userInteractionEnabled = YES;
    
    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tap:)];
MIduo/½çÃæ/ÎÒµÄ/balance/ÌåÏÖ/IncarnateViewController.xib
@@ -225,7 +225,7 @@
                                <constraint firstAttribute="height" constant="1" id="zt6-x7-dXr"/>
                            </constraints>
                        </view>
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="可提现余额0.00元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AS9-r7-zm0">
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="可提现余额  å…ƒ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AS9-r7-zm0">
                            <rect key="frame" x="20" y="111" width="280" height="21"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="21" id="tHq-Zx-jqk"/>
MIduo/½çÃæ/ÎÒµÄ/balance/Ã÷ϸ/BalaDetailViewController.m
@@ -29,7 +29,7 @@
    [self CreatNavigationBar];
    [self.view addSubview:self.tableview];
    [self.view addSubview:self.backView];
    _page = 1;
    [self getAccountList];
}
- (void)viewWillAppear:(BOOL)animated{
MIduo/½çÃæ/ÎÒµÄ/messageLogin/MessageLoginViewController.m
@@ -477,7 +477,9 @@
               }];
    
}
- (BOOL)datasourceIsNull{
    return NO;
}
#pragma mark - CreateAccountViewDelegate
MIduo/½çÃæ/ÎÒµÄ/userInfoViewController.m
@@ -34,7 +34,7 @@
    [self ConfigurationtableView];
    
    //加载信息
    _userInfo=[NSKeyedUnarchiver unarchiveObjectWithData:[NSData dataWithContentsOfFile:USERINFO]];
//    _userInfo=[NSKeyedUnarchiver unarchiveObjectWithData:[NSData dataWithContentsOfFile:USERINFO]];
    [_userInfoTableView reloadData];
    
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(WeChatReload) name:@"WeChatReload" object:nil];
@@ -130,10 +130,11 @@
#pragma mark -UITableViewDataSource
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
    if (_userInfo) {
        return 2;
    }
    return 0;
//    if (_userInfo) {
//        return 2;
//    }
    return 2;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
@@ -149,35 +150,52 @@
        if (indexPath.row==0) {//用户头像
            userInfoTableViewCellS1 *TableViewCellS1 = [tableView dequeueReusableCellWithIdentifier:@"userInfoTableViewCellS1" forIndexPath:indexPath];
            TableViewCellS1.cellTitle.text=@"头像";
            [TableViewCellS1.cellImage setYthImageWithURL:[_userInfo objectForKey:@"portrait"] placeholderImage:[UIImage imageNamed:@"默认头像"]];
            if (_userInfo) {
                [TableViewCellS1.cellImage setYthImageWithURL:[_userInfo objectForKey:@"portrait"] placeholderImage:[UIImage imageNamed:@"默认头像"]];
            }else{
                TableViewCellS1.cellImage.image = [UIImage imageNamed:@""];
            }
            return TableViewCellS1;
        }else if (indexPath.row == 1){//用户昵称
            userInfoTableViewCellS2 *TableViewCellS2 = [tableView dequeueReusableCellWithIdentifier:@"userInfoTableViewCellS2" forIndexPath:indexPath];
            TableViewCellS2.cellTitle.text = @"昵称";
            TableViewCellS2.cellInfo.text = [_userInfo objectForKey:@"nickName"];
            if (_userInfo) {
                TableViewCellS2.cellInfo.text = [_userInfo objectForKey:@"nickName"];
            }else{
                TableViewCellS2.cellInfo.text = @"";
            }
            return TableViewCellS2;
        }else if (indexPath.row == 2){//用户Uid
            userInfoTableViewCellS2 *TableViewCellS2 = [tableView dequeueReusableCellWithIdentifier:@"userInfoTableViewCellS2" forIndexPath:indexPath];
            TableViewCellS2.cellTitle.text = @"ID";
            TableViewCellS2.cellInfo.text = [NSString stringWithFormat:@"%ld",[[_userInfo objectForKey:@"id"] longValue]];
            if (_userInfo) {
                TableViewCellS2.cellInfo.text = [NSString stringWithFormat:@"%ld",[[_userInfo objectForKey:@"id"] longValue]];
            }else{
                TableViewCellS2.cellInfo.text = @"";
            }
            return TableViewCellS2;
        }else {
            
            userInfoTableViewCellS3 *TableViewCellS2 = [tableView dequeueReusableCellWithIdentifier:@"userInfoTableViewCellS3" forIndexPath:indexPath];
            TableViewCellS2.cellTitle.text = @"等级";
            NSInteger rank = [[_userInfo objectForKey:@"rank"] longValue];
            NSString *gradeString ;
            if (rank == 0) {
                gradeString = @"普通";
            }else if (rank == 1) {
                gradeString = @"铜冠";
            }else if(rank == 2){
                gradeString = @"银冠";
            }else {
                gradeString = @"金冠";
            if (_userInfo) {
                NSInteger rank = [[_userInfo objectForKey:@"rank"] longValue];
                NSString *gradeString ;
                if (rank == 0) {
                    gradeString = @"普通";
                }else if (rank == 1) {
                    gradeString = @"铜冠";
                }else if(rank == 2){
                    gradeString = @"银冠";
                }else {
                    gradeString = @"金冠";
                }
                TableViewCellS2.cellInfo.text = [NSString stringWithFormat:@"%@",gradeString] ;
            }else{
                TableViewCellS2.cellInfo.text = @"";
            }
           TableViewCellS2.cellInfo.text = [NSString stringWithFormat:@"%@",gradeString] ;
            return TableViewCellS2;
@@ -202,7 +220,11 @@
            }else{//状态1
                userInfoTableViewCellS3 *TableViewCellS3 = [tableView dequeueReusableCellWithIdentifier:@"userInfoTableViewCellS3" forIndexPath:indexPath];
                TableViewCellS3.cellTitle.text = @"淘宝账号";
                TableViewCellS3.cellInfo.text = @"去绑定";
                if (_userInfo) {
                    TableViewCellS3.cellInfo.text = @"去绑定";
                }else{
                    TableViewCellS3.cellInfo.text = @"";
                }
                return TableViewCellS3;
            }
        }else if(indexPath.row == 1){//微信登录不存在
@@ -215,17 +237,26 @@
            }else{//未绑定状态
                userInfoTableViewCellS3 *TableViewCellS3 = [tableView dequeueReusableCellWithIdentifier:@"userInfoTableViewCellS3" forIndexPath:indexPath];
                TableViewCellS3.cellTitle.text = @"微信账号";
                TableViewCellS3.cellInfo.text = @"去绑定";
                if (_userInfo) {
                    TableViewCellS3.cellInfo.text = @"去绑定";
                }else{
                    TableViewCellS3.cellInfo.text = @"";
                }
                return TableViewCellS3;
            }
        }else{
            userInfoTableViewCellS3 *TableViewCellS3 = [tableView dequeueReusableCellWithIdentifier:@"userInfoTableViewCellS3" forIndexPath:indexPath];
            TableViewCellS3.cellTitle.text = @"手机号";
            if ([_userInfo[@"phone"] compare:@""] == 0) {
                TableViewCellS3.cellInfo.text = @"去绑定";
            if (_userInfo) {
                if ([_userInfo[@"phone"] compare:@""] == 0) {
                    TableViewCellS3.cellInfo.text = @"去绑定";
                }else{
                    TableViewCellS3.cellInfo.text = _userInfo[@"phone"] ;
                }
            }else{
                TableViewCellS3.cellInfo.text = _userInfo[@"phone"] ;
                TableViewCellS3.cellInfo.text = @"";
            }
            return TableViewCellS3;
        }
    }
@@ -235,7 +266,16 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
    [tableView deselectRowAtIndexPath:indexPath animated:YES];
    BOOL cannect = [self checkNetCanUse];
    if (!cannect) {
        if ([YTHsharedManger startManger].networkStatus == 0) {
            ALToastBottom(@"网络未连接,请检查网络设置");
        }else{
            ALToastBottom(@"网络连接异常,请检查网络设置");
        }
        return;
    }
    if (indexPath.section == 0 && indexPath.row == 3) {
        ShonpingShareViewController *SureWebVC=[[ShonpingShareViewController alloc] init];
MIduo/½çÃæ/ËÑË÷/SideSlipPriceTableViewCell.m
@@ -35,11 +35,28 @@
    cell.selectionStyle = UITableViewCellSelectionStyleNone;
    cell.minTextField.delegate = cell;
    cell.maxTextField.delegate = cell;
    [cell.minTextField addTarget:self
                               action:@selector(textFieldEditChanged:)
                     forControlEvents:UIControlEventEditingChanged];
    [cell.maxTextField addTarget:self
                               action:@selector(textFieldEditChanged:)
                     forControlEvents:UIControlEventEditingChanged];
    [cell configureKeyboard];
    return cell;
}
+ (void)textFieldEditChanged:(UITextField *)textField {
    if ([textField.text floatValue] == 0 && textField.text.length > 1) {
        textField.text = @"0";
    }
    if (textField.text.length > 1) {
        NSString *str2 = [textField.text substringWithRange:NSMakeRange(0,1)];
        if ([str2 integerValue] == 0) {
            textField.text = [textField.text substringWithRange:NSMakeRange(1,textField.text.length - 1)];
        }
    }
}
- (void)configureKeyboard {
    UIView *keyBoardAccessoryView = [self createKeyBoardAccessoryView];
    _minTextField.inputAccessoryView = keyBoardAccessoryView;
@@ -118,7 +135,9 @@
    [super awakeFromNib];
    // Initialization code
}
- (void)dealloc{
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
    [super setSelected:selected animated:animated];
MIduo/½çÃæ/ËÑË÷/searchDetailViewController.m
@@ -470,6 +470,15 @@
}
- (void)textFieldEditChanged:(UITextField *)textField {
    if ([textField.text floatValue] == 0 && textField.text.length > 1) {
        textField.text = @"0";
    }
    if (textField.text.length > 1) {
        NSString *str2 = [textField.text substringWithRange:NSMakeRange(0,1)];
        if ([str2 integerValue] == 0) {
            textField.text = [textField.text substringWithRange:NSMakeRange(1,textField.text.length - 1)];
        }
    }
    
    if (textField.text.length != 0) {
        NSArray *array = [textField.text componentsSeparatedByString:@"."];
@@ -996,7 +1005,7 @@
                    }
                }else if(_isFirstZero&&!_isHaveDian){
                    //首位有0没点
                    return NO;
                    return YES;
                    
                } else  if (textField.text.length >= 8) {
                    
MIduo/½çÃæ/ÍøÒ³ÊÓͼ/XYRWebViewController.m
@@ -357,10 +357,12 @@
    if (![self.url hasPrefix:@"http"]) {//是否具有http前缀
        self.url = [NSString stringWithFormat:@"http://%@",self.url];
    }
    NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL URLWithString:self.url]  cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:10];
    if ([[[UIDevice currentDevice]systemVersion]floatValue] >= 8.0) {
        [_wk_WebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.url]]];
        [_wk_WebView loadRequest:request];
    } else {
        [_webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.url]]];
        [_webView loadRequest:request];
    }
}
MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/GoodDeTrViewController.m
@@ -620,7 +620,6 @@
#pragma mark - ButtomCarViewDelegate
- (void)shareClicked:(ButtomCarView *)view {
    if ([YTHsharedManger startManger].networkStatus == 0) {
        
        ALToastBottom(@"网络未连接,请检测网络设置");
@@ -632,6 +631,8 @@
         ALToastBottom(@"网络连接异常,请检测网络设置");
        return ;
    }
    self.buttomView.shareButton.userInteractionEnabled = NO;
    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]) {
        self.isSharelogin = YES;
        LoginViewController *LoginVC = [[LoginViewController alloc] init];
@@ -639,6 +640,8 @@
        LoginVC.isShopCar = YES;
        LoginVC.isGoodDeTr = YES;
        [SVProgressHUD showInfoWithStatus:@"尚未登录,请先登录"];
        self.buttomView.shareButton.userInteractionEnabled = YES;
        [self.navigationController pushViewController:LoginVC animated:YES];
        
    } else {
@@ -656,7 +659,8 @@
    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"share/getGoodsShareUrl"]
                 param:dictionary
               success:^(NSDictionary *object) {
                   self.buttomView.shareButton.userInteractionEnabled = YES;
                   ShonpingShareViewController *shopVC = [[ShonpingShareViewController alloc]init];
                   shopVC.urlString = object[@"data"];
                   shopVC.isshareType = YES;
@@ -664,7 +668,8 @@
                   [self.navigationController pushViewController:shopVC animated:YES];
                   
               } fail:^(id object) {
                   self.buttomView.shareButton.userInteractionEnabled = YES;
               }];
}
MIduo/½çÃæ/ÑûÇë/ÉÌÆ··ÖÏí/ShonpingShareViewController.m
@@ -23,6 +23,7 @@
@property (nonatomic, strong) UIProgressView *loadingProgressView;
@property (nonatomic,assign)BOOL isField;
@property (nonatomic)BOOL isHelpBack;
@property (nonatomic,assign)BOOL isNeedIntercept;
@end
@@ -53,7 +54,9 @@
        [self.view addSubview:self.webView];
        _interface = [MyJSInterface new];
        [self.webView addJavascriptInterfaces:_interface WithName:@"yestv"];
        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]]];
        NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]  cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:10];
        [self.webView loadRequest:request];
        self.isHelpBack = NO;
        return;
    }
@@ -68,23 +71,39 @@
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jumpGoodsDETAIL:) name:@"jumpGoodsDETAIL" object:nil];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jumpLoginVc:) name:@"jumpLoginVc" object:nil];
//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkError:) name:@"networkError" object:nil];
    [self.view addSubview:self.webView];
    [self.view addSubview:self.loadingProgressView];
     _interface = [MyJSInterface new];
    [self.webView addJavascriptInterfaces:_interface WithName:@"yestv"];
    NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]  cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:10];
    [self.webView loadRequest:request];
    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]]];
}
- (void)viewWillDisappear:(BOOL)animated {
    [super viewWillDisappear:animated];
    NSHTTPCookie *cookie;
    NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
    for (cookie in [storage cookies])
    {
        [storage deleteCookie:cookie];
    }
    //  Â  æ¸…除webView的缓存
    [[NSURLCache sharedURLCache] removeAllCachedResponses];
}
/**
根据通知信息挑战不同的界面
@@ -293,12 +312,14 @@
        return NO;
    }
    //拦截url
    if ([url containsString:@"help_item"]) {
        self.isHelpBack = YES;
        self.isNeedIntercept = YES;
    }
    
    if ([url rangeOfString:@"yestv://"].location !=NSNotFound || [url rangeOfString:@"fanli://"].location !=NSNotFound ) {
        self.isNeedIntercept = YES;
        NSArray *array = [url componentsSeparatedByString:@"#"];
        if ([array[0] isEqualToString:@"yestv://copy"]) {
            NSLog(@"%@",array);
@@ -331,6 +352,9 @@
            }
        }
    }
    if (!url) {
        self.isNeedIntercept = NO;
    }
    return YES;
}
@@ -437,10 +461,15 @@
}
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
    NSLog(@"%@",error);
    self.isField = YES;
    self.title = @"网页无法打开";
    NSNotification *notice = [[NSNotification alloc]initWithName:@"netWorkChangeEventNotification" object:@([YTHsharedManger startManger].networkStatus) userInfo:nil];
    [self NetWorkStatesChange:notice];
    if (self.isNeedIntercept) {
        self.isNeedIntercept = NO;
    }else{
        self.isField = YES;
        self.title = @"网页无法打开";
        NSNotification *notice = [[NSNotification alloc]initWithName:@"netWorkChangeEventNotification" object:@([YTHsharedManger startManger].networkStatus) userInfo:nil];
        [self NetWorkStatesChange:notice];
    }
}
- (void)loadData {
    
MIduo/½çÃæ/Ê×Ò³/recommendViewController.m
@@ -127,8 +127,11 @@
    }else{
        [self getPasteboard];
    }
    [self.navigationController.navigationBar setShadowImage:[UIImage new]];
}
- (void)viewWillDisappear:(BOOL)animated{
    [super viewWillDisappear:animated];
    [_Gifts dismiss];
}
/**
@@ -153,7 +156,9 @@
-(void)ShowNewUser{
    //判断当前用户是否登录
    BOOL bor = [[NSUserDefaults standardUserDefaults] boolForKey:@"islogined"];
    if(([[NSUserDefaults standardUserDefaults] objectForKey:@"userId"])&&(self.navigationController.viewControllers.count==1 && !bor )){
    NSLog(@"%ld",self.navigationController.viewControllers.count);
    NSLog(@"%@",[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]);
    if(([[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] == nil)&&(self.navigationController.viewControllers.count==1 && !bor )){
        if (_Gifts) {
            
        }
@@ -913,10 +918,17 @@
}
- (void)ClickConnectBtn:(UIButton *)sender{
    NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
    if( [[UIApplication sharedApplication]canOpenURL:url] ) {
        [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
        }];
    if (iOS10) {
        NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
            }];
        }
    }else{
        NSURL *url= [NSURL URLWithString:@"prefs:root=com.haicaojie-ios"];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url];
        }
    }
}