Skip to content

Merge dev_oh into master: 高德 3D 地图鸿蒙适配收编 - #1

Closed
summer88123 wants to merge 30 commits into
masterfrom
dev_oh
Closed

summer88123 wants to merge 30 commits into
masterfrom
dev_oh

Conversation

@summer88123

Copy link
Copy Markdown
Member

将 dev_oh 分支收编进 master(鸿蒙地图适配 + example 工程清理 + iOS SDK 9.6.0)。主仓已 pin 0228332。

关联主仓技术演进: https://devcloud.cn-north-4.huaweicloud.com/projectman/scrum/ea9762777b694cbe8b099d7f6acb453c/task/detail/71133114

qiuxiang and others added 30 commits February 13, 2022 12:27
Update readme, remove setApiKey, Change to AMapSdk.init
* main-ori: (23 commits)
  Update release.yml
  Update react-native.config.js
  调整发布脚本,npm publish 与 build example 并行
  Fix ios project config
  Upgrade iOS SDK to 9.6.0
  Fix ios project
  Update release action
  Fix release action
  Update readme.md
  Update readme
  Fix docs action
  Add build docs action
  Fix build action
  移除 example 原生代码(使用 react-native init example 创建)
  更新依赖
  升级 SDK
  解决 qiuxiang#749
  Update readme.md
  Fix ios privacy
  Upgrade Map SDK
  ...

Conflicts:
	lib/android/build.gradle
* dev:
  feat:   s.dependency 'AMap3DMap', "~> 10.0.600"
  fix: 修复iOS achieved报错问题
  feat: 更新一下iOS初始化接口
  feat: 升级dependency 'AMap3DMap', "~> 9.7.0"
  fest: ios兼容新架构
  feat(升级rn77): 开启新架构后,不传参数会红屏
  不指定java版本

# Conflicts:
#	lib/ios/Modules/SdkModule.swift
#	lib/ios/react-native-amap3d.podspec
#	lib/src/sdk.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants