Merge branch 'main' of http://git.imoreme.com/lushaoxiong/DrWater

DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -219,6 +219,38 @@
             endingLineNumber = "1559"
             endingLineNumber = "1559"
             landmarkName = "-changePumpSpeedWithSize:"
             landmarkName = "-changePumpSpeedWithSize:"
             landmarkType = "7">
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - ff6afef0fc66f760"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[DXHFXVC changePumpSpeedWithSize:]"
+                  moduleName = "HJMDrWarter"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1559"
+                  endingLineNumber = "1559"
+                  offsetFromSymbolStart = "68">
+               </Location>
+               <Location
+                  uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - ff6afef0fc66f781"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[DXHFXVC changePumpSpeedWithSize:]"
+                  moduleName = "HJMDrWarter"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1560"
+                  endingLineNumber = "1560"
+                  offsetFromSymbolStart = "24">
+               </Location>
+            </Locations>
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
       <BreakpointProxy
       <BreakpointProxy

DJMHomeTY/Global/Define/XHURL.h

@@ -161,7 +161,8 @@
 #define UpdateDeviceVersionURL [NSString stringWithFormat:@"%@%@",DRURL,@"/Facility/getUpdateMCUURL"]
 #define UpdateDeviceVersionURL [NSString stringWithFormat:@"%@%@",DRURL,@"/Facility/getUpdateMCUURL"]
 
 
 /*海菲秀获取BANNER列表*/
 /*海菲秀获取BANNER列表*/
-#define HFXGetBannerList [NSString stringWithFormat:@"%@%@",DRURL,@"/hfx/banner"]
+//#define HFXGetBannerList [NSString stringWithFormat:@"%@%@",DRURL,@"/hfx/banner"]
+#define HFXGetBannerList [NSString stringWithFormat:@"%@%@",DRURL,@"/hfx/getBanner"]
 /*海菲秀获取BANNER列表*/
 /*海菲秀获取BANNER列表*/
 #define HFXGetGiftLink [NSString stringWithFormat:@"%@%@",DRURL,@"/ldm/api/openurl/faceAgeH5"]
 #define HFXGetGiftLink [NSString stringWithFormat:@"%@%@",DRURL,@"/ldm/api/openurl/faceAgeH5"]