Skip to content

Commit

Permalink
fix(demo): fixed demo debug prompt
Browse files Browse the repository at this point in the history
  • Loading branch information
xuqingkuang committed Dec 25, 2019
1 parent c2cec3b commit e284c6b
Show file tree
Hide file tree
Showing 16 changed files with 8,581 additions and 57 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Before submit new pull request, please make sure:
Before submitting a new pull request, please make sure:

- [ ] Test cases has been added/updated for the code you will submit.
- [ ] Test cases have been added/updated for the code you will submit.
- [ ] Documentation has added or updated.
- [ ] Commit message is following the [Convention Commit](https://conventionalcommits.org/) guideline.
- [ ] Squash the repeat code commits, short patches are welcome.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@ android/sdk/build
android/support_ui/build
android/sdk/src/main/jni/core
examples/android-demo/build/
examples/android-demo/.gradle
examples/android-demo/.idea/
examples/android-demo/local.properties
examples/android-demo/example/.externalNativeBuild
examples/android-demo/example/src/main/assets/
examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/xcuserdata/*
examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/*
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ English | [简体中文](./README.zh_CN.md)

## Introduction

Hippy is a cross-platform development framework, aiming to help developers write once, run on three platforms(iOS, Android and Web). Hippy is quite friendly to web developers, especially who are familar with React or Vue. With Hippy, developers are able to create the cross platform app easily.
Hippy is a cross-platform development framework, aiming to help developers write once, run on three platforms(iOS, Android and Web). Hippy is quite friendly to web developers, especially who are familiar with React or Vue. With Hippy, developers are able to create the cross platform app easily.

Hippy is now applied in 18 [Tencent](http://www.tencent.com/) apps concerning tens of billions of ordinary users.

## Advantages

* Design for web developers, offically support web frameworks like `React` and `Vue`.
* Design for web developers, officially support web frameworks like `React` and `Vue`.
* Same APIs for different platforms.
* Excellent performance with JS engine binding communication.
* Build-in recyclable component with better performance.
Expand Down Expand Up @@ -55,14 +55,14 @@ For macOS developers:

1. [XCode](https://developer.apple.com/xcode/) with iOS sdk: build the iOS app.
2. [Android Studio](https://developer.android.com/AndroidStudio) with NDK: build the android app.
3. [nodeJS](https://nodejs.org/en/): run the build scripts.
3. [Node.JS](https://nodejs.org/en/): run the build scripts.

[homebrew](https://brew.sh/) is recommended to install the dependencies.

For Windows developers:

1. [Android Studio](https://developer.android.com/AndroidStudio) with NDK: build the android app.
2. [nodeJS](https://nodejs.org/en/): run the build scripts.
2. [Node.JS](https://nodejs.org/en/): run the build scripts.

*Windows can't run the iOS development environment so far.*

Expand All @@ -85,12 +85,12 @@ Before build the android app, please make sure the SDK and NDK is installed, And

1. Install the dependencies with `npm install`.
2. Build the front-end sdk packages with `npm run build`.
3. Start `ConEmu` with git shell, then build the hippy-react demo with `npm run buildexample -- hippy-react-demo`, or build the hippy-vue demo with `npm run buildexample -- hippy-vue-demo` .
3. Open a terminal, then build the hippy-react demo with `npm run buildexample -- hippy-react-demo`, or build the hippy-vue demo with `npm run buildexample -- hippy-vue-demo` .
4. Open the `examples/android-demo` with Android Studio.
5. Connect android phone with USB cable and make sure USB debugging mode and USB installation are enabled.
6. Open the project with Android Studio, run and install the apk...

> For Windows Developers: Because Hippy example build script is writen with `bash`. Here's the [ConEmnu](https://conemu.github.io/) with git shell recommended, it is provided the Linux environment for Windows.
> For Windows Developers: Because Hippy example build script is writen with `bash`. Here's the [ConEmnu](https://conemu.github.io/) with `git shell` recommended, it is provided the Linux environment for Windows.
> If you encought 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).
Expand Down
6 changes: 3 additions & 3 deletions README.zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ macOS 用户需要以下软件:

1. [XCode](https://developer.apple.com/xcode/) 和 iOS SDK: 用以编译 iOS 终端 app。
2. [Android Studio](https://developer.android.com/AndroidStudio) 和 NDK: 用以编译 Android app。
3. [nodeJS](https://nodejs.org/en/): 用来运行前端编译脚本。
3. [Node.JS](http://nodejs.cn/): 用来运行前端编译脚本。

我们推荐使用 [homebrew](https://brew.sh/) 来安装依赖。

Windows 用户需要以下软件:

1. [Android Studio](https://developer.android.com/AndroidStudio) 和 NDK: 用以编译 Android app。
2. [nodeJS](https://nodejs.org/en/): 用来前端运行编译脚本
3. [Node.JS](http://nodejs.cn/): 用来运行前端编译脚本

*Windows 用户受条件所限,暂时无法进行 iOS app 开发*

Expand All @@ -85,7 +85,7 @@ Windows 用户需要以下软件:

1. 安装前端依赖,运行命令:`npm install`
2. 编译前端 SDK 包,运行命令: `npm run build`
3. 打开 ConEmnu 中的 Git Shell,并选择 hippy-react 范例项目进行编译:`npm run buildexample hippy-react-demo`,或者编译 hippy-vue 范例项目 `npm run buildexample hippy-vue-demo`
3. 打开一个命令行程序,并选择 hippy-react 范例项目进行编译:`npm run buildexample hippy-react-demo`,或者编译 hippy-vue 范例项目 `npm run buildexample hippy-vue-demo`
4. 用 Android Studio 来打开终端范例工程 `examples/android-demo`.
5. 用 USB 数据线插上你的 Android 手机,需要确认手机打开 USB 调试模式和 USB 安装。
6. 运行工程,并安装 apk。。。
Expand Down
2 changes: 1 addition & 1 deletion examples/android-demo/example/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
>

<activity android:name=".MyActivity"
android:label="@string/deprecated_activity_name"
android:label="@string/app_name"
android:configChanges="orientation|screenSize"
>
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Hippy Test</string>
<string name="app_name">Hippy Demo</string>
<string name="deprecated_activity_name">Hippy Deprecated</string>
<string name="activity_name">Hippy Test</string>
<string name="activity_tiny_name">Hippy Tiny</string>
Expand Down
14 changes: 7 additions & 7 deletions examples/android-demo/res/index.android.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions examples/android-demo/res/vendor.android.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions examples/hippy-react-demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ npm run hippy:build # Build the index js

The output files will be placed at `dist/android` and `dist/ios` folders.

> Take care, when you build own js project, here's defined a [alias to local hippy-react](./scripts/hippy-webpack.android-vendor.js#L61), you should remove it first, otherwise build progress will prompt a ModuleNotFound error.
### Integrate built output js to native

#### iOS
Expand Down
Loading

0 comments on commit e284c6b

Please sign in to comment.