From 8852f93cab36f2a1d67e8dfaf0fcc5ac4988d0b9 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Thu, 12 May 2022 18:31:17 +0800
Subject: [PATCH] add flutter to readme and fix web

---
 README-ZH.md                      | 6 ++++++
 README.md                         | 4 ++--
 flutter/web/js/gen_js_from_hbb.py | 4 ++--
 flutter/web/js/ts_proto.py        | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README-ZH.md b/README-ZH.md
index 4fd1ff9a5..f9c27a3bc 100644
--- a/README-ZH.md
+++ b/README-ZH.md
@@ -36,6 +36,8 @@ Chat with us: [知乎](https://www.zhihu.com/people/rustdesk) | [Discord](https:
 [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) |
 [macOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib)
 
+移动版本使用Flutter，未来会将桌面版本从Sciter迁移到Flutter。
+
 ## 基本构建步骤
 
 - 请准备好 Rust 开发环境和 C++编译环境
@@ -47,6 +49,8 @@ Chat with us: [知乎](https://www.zhihu.com/people/rustdesk) | [Discord](https:
 
 - 运行 `cargo run`
 
+## [构建](https://rustdesk.com/docs/en/dev/build/)
+
 ## 在 Linux 上编译
 
 ### Ubuntu 18 (Debian 10)
@@ -202,6 +206,8 @@ target/release/rustdesk
 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: 控制端
 - **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: 与[rustdesk-server](https://github.com/rustdesk/rustdesk-server)保持 UDP 通讯, 等待远程连接（通过打洞直连或者中继）
 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: 平台服务相关代码
+- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: 移动版本的Flutter代码 
+- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/js)**: Flutter Web版本中的Javascript代码
 
 ## 截图
 
diff --git a/README.md b/README.md
index 592a03c94..0cddb4202 100644
--- a/README.md
+++ b/README.md
@@ -153,8 +153,8 @@ Please ensure that you are running these commands from the root of the RustDesk
 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: start a peer connection
 - **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: Communicate with [rustdesk-server](https://github.com/rustdesk/rustdesk-server), wait for remote direct (TCP hole punching) or relayed connection
 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: platform specific code
-- **[src/flutter](https://github.com/rustdesk/rustdesk/tree/master/src/flutter)**: Flutter code for mobile
-- **[src/flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/src/flutter/web/js)**: Javascript for Flutter web client
+- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: Flutter code for mobile
+- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/js)**: Javascript for Flutter web client
 
 ## Snapshot
 
diff --git a/flutter/web/js/gen_js_from_hbb.py b/flutter/web/js/gen_js_from_hbb.py
index 7e9d78cbe..169eaf24a 100755
--- a/flutter/web/js/gen_js_from_hbb.py
+++ b/flutter/web/js/gen_js_from_hbb.py
@@ -7,7 +7,7 @@ from tabnanny import check
 
 def main():
    print('export const LANGS = {')
-   for fn in glob.glob('../hbb/src/lang/*'):
+   for fn in glob.glob('../../../src/lang/*'):
       lang = os.path.basename(fn)[:-3]
       if lang == 'template': continue
       print('  %s: {'%lang)
@@ -55,7 +55,7 @@ def main():
    print('export const KEY_MAP: any = {')
    print(KEY_MAP[0])
    print('}')
-   for ln in open('../hbb/Cargo.toml'):
+   for ln in open('../../../Cargo.toml'):
       if ln.startswith('version ='):
          print('export const ' + ln)
       
diff --git a/flutter/web/js/ts_proto.py b/flutter/web/js/ts_proto.py
index f917c6b37..62a73fe7c 100755
--- a/flutter/web/js/ts_proto.py
+++ b/flutter/web/js/ts_proto.py
@@ -2,7 +2,7 @@
 
 import os
 
-path = os.path.abspath(os.path.join(os.getcwd(), '..', 'hbb', 'libs', 'hbb_common', 'protos'))
+path = os.path.abspath(os.path.join(os.getcwd(), '..', '..', '..', 'libs', 'hbb_common', 'protos'))
 
 if os.name == 'nt':
     cmd = r'protoc --ts_proto_opt=esModuleInterop=true --ts_proto_opt=snakeToCamel=false --plugin=protoc-gen-ts_proto=.\node_modules\.bin\protoc-gen-ts_proto.cmd  -I "%s" --ts_proto_out=./src/ rendezvous.proto'%path