1. 14 10月, 2024 4 次提交
  2. 08 10月, 2024 2 次提交
  3. 24 8月, 2024 2 次提交
  4. 22 8月, 2024 1 次提交
  5. 12 7月, 2024 2 次提交
    • DCloud-yyl's avatar
      Merge branch 'alpha' · ffb6edbb
      DCloud-yyl 提交于
      # Conflicts:
      #	uni_modules/uni-fileSystemManager/package.json
      #	uni_modules/uni-fileSystemManager/utssdk/app-android/FileDescriptorUtil.uts
      #	uni_modules/uni-fileSystemManager/utssdk/app-android/index.uts
      #	uni_modules/uni-fileSystemManager/utssdk/app-js/index.uts
      #	uni_modules/uni-fileSystemManager/utssdk/interface.uts
      #	uni_modules/uni-fileSystemManager/utssdk/unierror.uts
      #	uni_modules/uni-getAppAuthorizeSetting/utssdk/interface.uts
      #	uni_modules/uni-getAppBaseInfo/utssdk/app-android/index.uts
      #	uni_modules/uni-getAppBaseInfo/utssdk/app-ios/index.uts
      #	uni_modules/uni-getAppBaseInfo/utssdk/interface.uts
      #	uni_modules/uni-getDeviceInfo/utssdk/app-android/device/DeviceUtil.uts
      #	uni_modules/uni-getDeviceInfo/utssdk/app-ios/device/DeviceUtil.uts
      #	uni_modules/uni-getDeviceInfo/utssdk/interface.uts
      #	uni_modules/uni-getLocation-system/utssdk/interface.uts
      #	uni_modules/uni-getNetworkType/utssdk/interface.uts
      #	uni_modules/uni-getPerformance/utssdk/interface.uts
      #	uni_modules/uni-getProvider/utssdk/app-android/index.uts
      #	uni_modules/uni-getProvider/utssdk/app-ios/index.uts
      #	uni_modules/uni-getProvider/utssdk/interface.uts
      #	uni_modules/uni-getSystemInfo/utssdk/app-android/index.uts
      #	uni_modules/uni-getSystemInfo/utssdk/app-ios/index.uts
      #	uni_modules/uni-getSystemInfo/utssdk/interface.uts
      #	uni_modules/uni-media/utssdk/app-android/index.uts
      #	uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts
      #	uni_modules/uni-media/utssdk/app-android/utils/CompressUtils.uts
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/Info.plist
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64/DCloudMediaPicker.framework/DCloudMediaPicker
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/DCloudMediaPicker
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeDirectory
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeRequirements-1
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeResources
      #	uni_modules/uni-media/utssdk/app-ios/index.uts
      #	uni_modules/uni-media/utssdk/app-ios/info.plist
      #	uni_modules/uni-media/utssdk/interface.uts
      #	uni_modules/uni-navigationBar/utssdk/app-android/index.uts
      #	uni_modules/uni-network/utssdk/app-ios/index.uts
      #	uni_modules/uni-network/utssdk/app-ios/interface.uts
      #	uni_modules/uni-network/utssdk/app-ios/network/NetworkManager.uts
      #	uni_modules/uni-network/utssdk/app-ios/network/download/DownloadController.uts
      #	uni_modules/uni-network/utssdk/app-ios/network/upload/UploadController.uts
      #	uni_modules/uni-network/utssdk/interface.uts
      #	uni_modules/uni-payment-alipay/utssdk/app-android/Alipay.uts
      #	uni_modules/uni-payment-alipay/utssdk/app-android/index.uts
      #	uni_modules/uni-payment-alipay/utssdk/app-ios/config.json
      #	uni_modules/uni-payment-alipay/utssdk/app-ios/index.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-android/index.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-android/src/WXPayEntryActivity.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-android/src/Wxpay.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-ios/config.json
      #	uni_modules/uni-payment-wxpay/utssdk/app-ios/index.uts
      #	uni_modules/uni-payment/utssdk/app-android/index.uts
      #	uni_modules/uni-payment/utssdk/app-ios/index.uts
      #	uni_modules/uni-payment/utssdk/interface.uts
      #	uni_modules/uni-payment/utssdk/unierror.uts
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/ac_recyclerview_layout_top.xml
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/ac_recyclerview_layout_top_night.xml
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
      #	uni_modules/uni-prompt/utssdk/app-android/showToast.uts
      #	uni_modules/uni-route/utssdk/app-android/navigateBack.uts
      #	uni_modules/uni-route/utssdk/constants.uts
      #	uni_modules/uni-route/utssdk/interface.uts
      #	uni_modules/uni-tabBar/utssdk/app-android/index.uts
      #	uni_modules/uni-tabBar/utssdk/interface.uts
      #	uni_modules/uni-websocket/utssdk/app-ios/websocket/WebsockerClient.uts
      #	uni_modules/uni-websocket/utssdk/interface.uts
      ffb6edbb
    • DCloud-yyl's avatar
      同步代码@HBuilderX4.23 · f9df85a0
      DCloud-yyl 提交于
      f9df85a0
  6. 05 7月, 2024 2 次提交
  7. 21 6月, 2024 2 次提交
    • DCloud-yyl's avatar
      同步代码@HBuilderX4.21 · 24f0ec42
      DCloud-yyl 提交于
      24f0ec42
    • DCloud-yyl's avatar
      Merge branch 'dev' into alpha · d38d3d80
      DCloud-yyl 提交于
      # Conflicts:
      #	uni_modules/uni-fileSystemManager/package.json
      #	uni_modules/uni-fileSystemManager/utssdk/app-android/FileDescriptorUtil.uts
      #	uni_modules/uni-fileSystemManager/utssdk/app-android/index.uts
      #	uni_modules/uni-fileSystemManager/utssdk/app-js/index.uts
      #	uni_modules/uni-fileSystemManager/utssdk/interface.uts
      #	uni_modules/uni-fileSystemManager/utssdk/unierror.uts
      #	uni_modules/uni-getAppBaseInfo/utssdk/app-android/index.uts
      #	uni_modules/uni-getAppBaseInfo/utssdk/app-ios/index.uts
      #	uni_modules/uni-getAppBaseInfo/utssdk/interface.uts
      #	uni_modules/uni-getDeviceInfo/utssdk/app-android/device/DeviceUtil.uts
      #	uni_modules/uni-getDeviceInfo/utssdk/interface.uts
      #	uni_modules/uni-getPerformance/utssdk/interface.uts
      #	uni_modules/uni-getProvider/utssdk/app-android/index.uts
      #	uni_modules/uni-getProvider/utssdk/interface.uts
      #	uni_modules/uni-getSystemInfo/utssdk/app-android/index.uts
      #	uni_modules/uni-getSystemInfo/utssdk/app-ios/index.uts
      #	uni_modules/uni-getSystemInfo/utssdk/interface.uts
      #	uni_modules/uni-getbatteryinfo/utssdk/interface.uts
      #	uni_modules/uni-media/utssdk/app-android/index.uts
      #	uni_modules/uni-media/utssdk/app-android/utils/ChooseImageUtils.uts
      #	uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts
      #	uni_modules/uni-media/utssdk/app-android/utils/CompressUtils.uts
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/Info.plist
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64/DCloudMediaPicker.framework/DCloudMediaPicker
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/DCloudMediaPicker
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeDirectory
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeRequirements-1
      #	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeResources
      #	uni_modules/uni-media/utssdk/app-ios/index.uts
      #	uni_modules/uni-media/utssdk/app-ios/info.plist
      #	uni_modules/uni-media/utssdk/interface.uts
      #	uni_modules/uni-navigationBar/utssdk/app-android/index.uts
      #	uni_modules/uni-network/utssdk/app-ios/index.uts
      #	uni_modules/uni-network/utssdk/app-ios/interface.uts
      #	uni_modules/uni-network/utssdk/app-ios/network/NetworkManager.uts
      #	uni_modules/uni-payment-alipay/utssdk/app-android/Alipay.uts
      #	uni_modules/uni-payment-alipay/utssdk/app-android/index.uts
      #	uni_modules/uni-payment-alipay/utssdk/app-ios/config.json
      #	uni_modules/uni-payment-alipay/utssdk/app-ios/index.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-android/index.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-android/src/WXPayEntryActivity.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-android/src/Wxpay.uts
      #	uni_modules/uni-payment-wxpay/utssdk/app-ios/config.json
      #	uni_modules/uni-payment-wxpay/utssdk/app-ios/index.uts
      #	uni_modules/uni-payment/utssdk/app-android/index.uts
      #	uni_modules/uni-payment/utssdk/app-ios/index.uts
      #	uni_modules/uni-payment/utssdk/interface.uts
      #	uni_modules/uni-payment/utssdk/unierror.uts
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/ac_recyclerview_layout_top.xml
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/ac_recyclerview_layout_top_night.xml
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
      #	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
      #	uni_modules/uni-prompt/utssdk/app-android/showToast.uts
      #	uni_modules/uni-route/utssdk/app-android/navigateBack.uts
      #	uni_modules/uni-route/utssdk/constants.uts
      #	uni_modules/uni-route/utssdk/interface.uts
      #	uni_modules/uni-tabBar/utssdk/interface.uts
      #	uni_modules/uni-websocket/utssdk/app-ios/websocket/WebsockerClient.uts
      d38d3d80
  8. 20 6月, 2024 3 次提交
  9. 18 6月, 2024 1 次提交
  10. 12 6月, 2024 1 次提交
  11. 23 5月, 2024 4 次提交
  12. 21 5月, 2024 1 次提交
  13. 14 5月, 2024 4 次提交
  14. 30 4月, 2024 1 次提交
  15. 28 4月, 2024 2 次提交
  16. 23 4月, 2024 2 次提交
  17. 03 4月, 2024 4 次提交
  18. 26 3月, 2024 1 次提交
  19. 13 3月, 2024 1 次提交