feat(doc): update android integration document

README.md

@@ -68,7 +68,7 @@ For iOS, we recommend to use iOS simulator when first try. However, you can chan
 
 > If `Step 2` throw error, you can `cd` to `driver/js/examples` hippy-react-demo or hippy-vue-demo, and run `npm install` to install demo dependencies first.
 >
-> More details for [iOS SDK integration](https://hippyjs.org/#/ios/integration?id=ios-%e9%9b%86%e6%88%90).
+> More details for [iOS SDK integration](https://doc.openhippy.com/#/development/ios-3.0-integration-guidelines).
 
 ### Build the Android app with js demo
 
@@ -97,7 +97,7 @@ Before build the android app, please make sure the SDK and NDK is installed, And
 >
 > If you encounter the issue of `No toolchains found in the NDK toolchains folder for ABI with prefix: mips64el-linux-android`, here is the [solution](https://github.com/google/filament/issues/15#issuecomment-415423557).
 >
-> More details for [Android SDK integration](https://hippyjs.org/#/android/integration?id=android-%e9%9b%86%e6%88%90).
+> More details for [Android SDK integration](https://doc.openhippy.com/#/development/android-3.0-integration-guidelines).
 
 ### Debug the js demo
 
@@ -110,7 +110,7 @@ Before build the android app, please make sure the SDK and NDK is installed, And
 >
 > On example debug mode, npm packages such as @hippy/react, @hippy/vue, @hippy/vue-next are linked to `driver/js/packages` > `[different package]` > `dist`(not node_modules), so if you have changed js package source code and want to make it take effect in target example, please call `npm run build` again.
 >
-> More details for debugging can be read in [Hippy Debug Document](https://hippyjs.org/#/guide/debug).
+> More details for debugging can be read in [Hippy Debug Document](https://doc.openhippy.com/#/development/debug).
 
 ### Build the js production demo
 
@@ -123,7 +123,7 @@ Before build the android app, please make sure the SDK and NDK is installed, And
 
 ## 📁 Documentation
 
-To check out [hippy examples](https://github.com/Tencent/Hippy/tree/master/examples) and visit [hippyjs.org](https://hippyjs.org).
+To check out [hippy examples](https://github.com/Tencent/Hippy/tree/master/examples) and visit [openhippy.com](https://openhippy.com/).
 
 ## 📅 Changelog
 

docs/development/android-3.0-integration-guidelines.md

@@ -6,11 +6,22 @@
 
 ---
 
-## 前期准备
+## Android Studio环境配置
 
-- 已经安装了 JDK version>=1.7 并配置了环境变量
-- 已经安装 Android Studio 最新版本
-- 运行 Demo 工程前需要完成 NDK，CMAKE，gradle 与相关插件的安装
+1. NDK、 CMake、 Gradle及AGP版本已经在工程配置文件中指定，其中NDK会在第一次Sync project的时候自动安装，CMake需要开发者在Settings > Android SDK中手动下载并设置
+
+   - NDK_VERSION = 25.0.8775105
+   - CMAKE_VERSION = 3.22.1
+   - GRADLE_VERSION = 7.4
+   - AGP_VERSION = 7.2.2
+
+   !> 由于暂未对8.x AGP及Gradle版本作适配，请忽略Android Studio中弹出的AGP升级提示。
+
+2. Settings > Build, Execution, Deployment > Build Tools > Gradle中下载并设置Version 17的JDK版本
+
+   <img src="../assets/img/android-studio-jdk.png" alt= "JDK" width="40%" />
+
+3. 执行Sync project完成gradle构建
 
 ## Demo 体验
 

docs/development/demo.md

@@ -25,6 +25,19 @@ Demo的Native工程代码位于framework/examples目录，前端工程代码位
 brew install git git-lfs node@16 cmake
 ```
 
+### Windows开发环境
+
+可以Windows上开发Android和Ohos应用，请安装以下依赖。
+
+1. Git for Windows
+
+    通过(https://gitforwindows.org)下载安装Git for Windows
+
+2. Node和NPM
+
+    通过指引安装[nodejs和npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)，建议使用Node v16，NPM v7版本
+
+
 #### 编译iOS Demo环境准备
 
 1. Xcode
@@ -42,36 +55,13 @@ brew install git git-lfs node@16 cmake
 
     通过android开发者平台下载安装[Android Studio](https://developer.android.com/studio)
 
-2. Android NDK
-
-    通过android开发者平台下载安装[NDK](https://developer.android.com/ndk?hl=en)
+2. Android Studio环境配置参考[3.0集成指引章节](development/android-3.0-integration-guidelines)
 
 #### 编译Ohos Demo环境准备
 
 1. DevEco Studio
    通过Ohos开发者平台下载安装[DevEco Studio](https://developer.huawei.com/consumer/cn/download/)
 
-### Windows开发环境
-
-可以Windows上开发Android应用，请安装以下依赖。
-
-1. Android Studio
-
-    通过android开发者平台下载安装[Android Studio](https://developer.android.com/studio)
-
-2. Android NDK
-
-    通过android开发者平台下载安装[NDK](https://developer.android.com/ndk?hl=en)
-
-3. Git for Windows
-
-    通过(https://gitforwindows.org)下载安装Git for Windows
-
-4. Node和NPM
-
-    通过指引安装[nodejs和npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)，建议使用Node v16，NPM v7版本
-
-也可以Windows上开发Ohos应用，请安装DevEco Studio、Git、Node和NPM。
 
 ## 代码拉取
 
@@ -240,4 +230,3 @@ cp -R driver/js/examples/hippy-react-demo/dist/android/*  framework/examples/and
 
 <img src="../assets/img/3.0-demo-helloworld.png" alt= "Demo效果" width="200" height="433" />
 
-恭喜你完成了Hippy的初步体验，下一步参考[Native工程集成章节](development/native-integration)将Hippy接入到你现有的工程吧。