Merge branch 'master' of https://github.com/SharpAI/DeepCamera

Author: solderzzc

README.md

@@ -131,11 +131,9 @@ iOS: https://testflight.apple.com/join/8LXGgu3q
 
 ## [How to deploy server on your server](https://github.com/SharpAI/mobile_app_server/issues/1)
 # Call For Help
-- [ ] Documents, A LOT OF DOCUMENTS, we already deploy our deep camera in industry leading company but we don't have extra resource to build up community friendly documents.
-- [ ] Tutorial on youtube, we can build up some of them, only if with your help, we can success together.
-- [ ] Translation, we did deploy our production in China, much of our resource is in Chinese, need your help to translate, especially the Mobile APP built with Meteor https://github.com/SharpAI/mobile_app_server  (need i18n selection based on system language)
-- [ ] Remove unused code/project in https://github.com/SharpAI/mobile_app_server
-- [ ] PR, more than welcome, anything :)
+- [x] Translation, we did deploy our production in China, much of our resource is in Chinese, need your help to translate, especially the Mobile APP built with Meteor https://github.com/SharpAI/mobile_app_server  (English_Version)
+- [x] Remove unused code/project in https://github.com/SharpAI/mobile_app_server
+- [x] PR, more than welcome, anything :)
 - [ ] Meetup hosts, in Silicon Valley
 
 ![screen shot 2019-03-07 at 4 03 59 pm](https://user-images.githubusercontent.com/3085564/53941268-a0781b80-40f2-11e9-8cc6-6295c3a39c96.png)

docs/RunOnRK3288.md

@@ -1,13 +1,11 @@
-# RK3288 Source Code（For Face Recognition）
+# DeepCamera on RK3288
 
-## 1 Prepare rk3288 Environment（Connect dev box and workstation in the same network）
+## 1 Prepare RK3288 Environment（Connect dev box and workstation in the same network）
 
-### 1-1 get modified termux apk (Built from [here](https://github.com/SharpAI/mobile_app_server/tree/android_porting/AndroidPorting/Launcher))
+### 1-1 Install SharpAI LauncherTermux
 
-#### 1-1-1 From Baidu (sharpai-norootfs-lambda_key.apk)
-> Link: https://pan.baidu.com/s/1ic3jEItCNG8mgJQPlHBYhg Password: mq9p
-#### 1-1-2 termux Compile
-> Use Android studio to build https://github.com/SharpAI/mobile_app_server/tree/android_porting/AndroidPorting/Launcher
+#### 1-1-1 [SharpAI-LauncherTermux.apk](https://github.com/SharpAI/DeepCamera/releases/download/1.1/SharpAI-LauncherTermux.apk)
+#### 1-1-2 [Source Code](https://github.com/SharpAI/Launcher_Termux)
 
 ### 1-2 Install modified termux apk
 #### 1-2-1 from u disk
@@ -19,10 +17,8 @@ The following figure：
 
 ![image.png](https://cdn.nlark.com/yuque/0/2019/png/170897/1552229210075-a6ab9acf-76b9-4bf4-82d5-45bd4a492622.png)
 
-
-
 ```
-adb install sharpai-norootfs-lambda_key.apk
+adb install SharpAI-LauncherTermux.apk
 ```
 
 #### 1-2-3 install openssh termux 
@@ -71,88 +67,44 @@ $ apt-get update
 
 
 ### 1-3 Install Source Code 
-Download based root fs and arch linux fs
-
-> usr_dev_root_armv7_1126_2018.tgz
-link: https://pan.baidu.com/s/18GwmAj04ylqg1AYS5T5BQA password:0w8a
-arch_dev_root_1203_2018_final.tgz
-link: https://pan.baidu.com/s/1FdaTiqjuLKEr7ZvKw2JF4g password:hvlz
-
-Upload them onto RK3288 box by adb
-
-The following figure：
-
-![image.png](https://cdn.nlark.com/yuque/0/2019/png/170897/1552229234603-331832f7-4af1-48be-bcfe-0bc93489841f.png#align=left&display=inline&height=157&name=image.png&originHeight=314&originWidth=1476&size=600996&status=done&width=738)
 
 ```
-adb root
-
-adb push usr_dev_root_armv7_1126_2018.tgz data/data/com.termux/files/usr_dev_root_armv7_1126_2018.tgz
-
-adb push arch_dev_root_1203_2018_final.tgz /data/data/com.termux/files/home/arch_dev_root_1203_2018_final.tgz
+pkg install wget
+cd /data/data/com.termux/files/
+$PRIFIX/bin/wget https://github.com/SharpAI/DeepCamera/releases/download/1.1/usr_dev_root_armv7_1126_2018.tgz
+tar -zxmf usr_dev_root_armv7_1126_2018.tgz
 ```
-> reference https://developer.android.com/studio/command-line/adb?hl=en-us
-
-
-openssh RK3288 box
 
+##### Remove if you want to save space
 ```
-cd /data/data/com.termux/files/
-tar -zxvmf usr_dev_root_armv7_1126_2018.tgz
 rm -f usr_dev_root_armv7_1126_2018.tgz
-
-cd /data/data/com.termux/files/home
-tar -zxvmf arch_dev_root_1203_2018_final.tgz
-rm -f arch_dev_root_1203_2018_final.tgz
 ```
 
-
-## 2 Prepare source code runtime
 ```
-$ cd /data/data/com.termux/files/home
-$ git clone https://github.com/SharpAI/DeepCamera
+cd /data/data/com.termux/files/home
+$PRIFIX/bin/wget https://github.com/SharpAI/DeepCamera/releases/download/1.1/arch_dev_root_1203_2018_final.tgz
+tar -zxmf arch_dev_root_1203_2018_final.tgz
 ```
 
-
-If you want to install a face model，download the model-armv7a.tgz
-
-> link: [https://pan.baidu.com/s/1YQENe4f0wDx7RMi3fZ5G2w](https://pan.baidu.com/s/1YQENe4f0wDx7RMi3fZ5G2w)  password:5ekz
-
-
-upload, untar, remove
-
+##### Remove if you want to save space
 ```
-$ cd /data/data/com.termux/files/home/DeepCamera
-$ tar -zxvmf model-armv7a.tgz
-$ rm -f model-armv7a.tgz
+rm -f arch_dev_root_1203_2018_final.tgz
 ```
 
-If you want to install human model，download the model-rk3288-termux.tgz
-
-> link: [https://pan.baidu.com/s/1ic3jEItCNG8mgJQPlHBYhg](https://pan.baidu.com/s/1ic3jEItCNG8mgJQPlHBYhg) password: mq9p
-
-upload, untar, remove
 
+## 2 Prepare source code runtime
 ```
-$ cd /data/data/com.termux/files/home/DeepCamera
-$ tar -zxvmf model-rk3288-termux.tgz
-$ rm -f model-rk3288-termux.tgz
+$ cd /data/data/com.termux/files/home
+$ git clone https://github.com/SharpAI/DeepCamera
+cd DeepCamera
+./setup_arm32.sh
 ```
 
-
-
 Install must have dependencies
 ```
 $ pip2 uninstall scipy
 $ apt-get install python2-scipy
-
 $ apt-get install graphicsmagick
-
-$ cd /data/data/com.termux/files/home/DeepCamera/src/flower/
-$ pip2 install -r requirements.txt
-
-$ cd /data/data/com.termux/files/home/DeepCamera/src/detector/
-$ npm install
 ```
 
 
@@ -172,3 +124,10 @@ Add following line to files:
 files：
 > /data/data/com.termux/files/usr/lib/python2.7/site-packages/scipy-1.2.0-py2.7-linux-armv8l.egg/scipy/stats/_continuous_distns.py
 /data/data/com.termux/files/usr/lib/python2.7/site-packages/scipy-1.2.0-py2.7-linux-armv8l.egg/scipy/stats/_stats_mstats_common.py
+
+
+```
+LD_LIBRARY_PATH=/system/lib:$LD_LIBRARY_PATH:$PREFIX/lib:/system/vendor/lib/egl:/system/vendor/lib LD_PRELOAD=$LD_PRELOAD:libatomic.so:libcutils.so python2
+
+import tvm
+```

docs/Run_Source_Android_aarch64.md

@@ -11,7 +11,7 @@
 
 ## Get Launcher_Termux source code
 ```
-git clone https://github.com/SharpAI/Launcher_Termux
+git clone https://github.com/SharpAI/Launcher_Termux -b dev
 ```
 
 ## Config authorized_keys for ssh