To fix local conflict.

Author: solderzzc

.gitignore

@@ -5,3 +5,8 @@ runtime
 build/build/*
 build/dist/*
 build/runtime_arch
+build/*
+*node_modules/*
+test/node_modules/*
+*.tgz
+.DS_Store

README.md

@@ -7,7 +7,7 @@ Full stack system for the deep learning edge computing devices, espeicailly set-
 ## Automatically train/deploy model for edge device(Embedded/Android/X86 system)
 ## Power efficient, Easy scalable, Production ready, Mobile first
 
-![image](screenshots/lifecycle.png)
+![image](screenshots/lifecycle_mac.png)
 
 # Feature List
 - [x] High accurate Face Recognition
@@ -46,18 +46,13 @@ Full stack system for the deep learning edge computing devices, espeicailly set-
 # Demo
 ![demo](https://github.com/SharpAI/DeepCamera/blob/master/screenshots/demo.gif)
 
-# Purchase Dev Kit for easily startup
-Run from code is time consuming task even with experts' supporting, we are considering to provide full set of development kit to easy the setup effort you may face to. 
-[Please thumb up if you want one](https://github.com/SharpAI/DeepCamera/issues/8)
-### How it works from end user's point of view, green parts are done if using Dev Kit
-![From end user's view](screenshots/on_app_end_user.png)
-
 # How to Run DeepCamera From Source Code
+![From end user's view](screenshots/on_app_end_user.png)
 
 ## 1. Generate/Get Serial No
 ### Android
-After install Launcher(Modified Termux), the serial_no will be placed:
-`/data/data/com.termux/files/home/.ro_serialno`
+After install Launcher(Modified Termux), QR Code is placed on screen.
+
 ### Linux/MacOS
 Get your Mac Address(1e:20:34:10:24:21)
 ```
@@ -70,7 +65,7 @@ echo 1e2034102421 > docker/workaipython/ro_serialno
 
 ## 3. How to Run DeepCamera on Edge Device
 
-### 3.1 [Run on Android(5.1+ aarch64)](docs/Run_On_Android_aarch64.md)
+### 3.1 [Run on Android(5.1+ aarch64)](docs/Run_Source_Android_aarch64.md)
 ### 3.2 Run on Rockchip RK3399 with linux/docker
 #### 3.2.1 Use prebuilt docker images
 ```
@@ -111,6 +106,8 @@ Shinobi login page(device_ip:8080):
 username: user@sharpaibox.com  
 password: SharpAI2018 
 
+You can also [turn Mac Camera into RTSP camera(not tested)](https://www.tribler.org/MacWebcam/)
+
 ### 4.2 Android(Dahua SDK Configure)
 Code is [here](https://github.com/SharpAI/RTSP_Decoder_IJKPlayer/blob/od_gl_based/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/activities/CameraScanActivity.java#L147)
 
@@ -120,7 +117,18 @@ Code is [here](https://github.com/SharpAI/ScreenCapture)
 ### 4.4 Android(RTSP url config)
 Comming soon
 
-## [How to configure on Mobile APP](https://github.com/SharpAI/mobile_app_server/blob/android_porting/README.md)
+# Survey: Do you want to have Dev Kit for easily startup
+We are considering to provide full set of development kit to easy the setup effort you may face to. 
+[Please thumb up if you want one](https://github.com/SharpAI/DeepCamera/issues/8)
+### How it works from end user's point of view, green parts are done if using Dev Kit
+![From end user's view](screenshots/on_app_end_user.png)
+
+## [How to configure on Mobile APP, Chinese Version](https://github.com/SharpAI/mobile_app_server/blob/android_porting/README.md)
+
+## Application in English(Beta Test)
+Android: https://www.pgyer.com/app/install/0e87e08c72a232e8f39a6a7c76222038
+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.

build/build_aarch64.sh

@@ -25,7 +25,6 @@ fi
 mkdir -p $runtime/bin/model
 
 pyinstaller --clean -y classifier_server.spec
-#cp -f ../src/embedding/judgeutil.so_termux-linux-aarch64 dist/classifier/judgeutil.so
 cp -rf dist/classifier/* runtime/bin/
 rm -rf dist/classifier/*
 

build/scripts/embedding_aarch64.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 export RUNTIME_BASEDIR=`pwd`
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PREFIX/lib64:/system/lib64
+export LD_LIBRARY_PATH=/system/lib64:$LD_LIBRARY_PATH:$PREFIX/lib64:/system/vendor/lib64/egl:/system/vendor/lib64
 export DATA_RUNTIME_FOLDER=../model
 export DEVICE_UUID_FILEPATH=/data/data/com.termux/files/home/.ro_serialno
 export DEVICE_GROUP_ID_FILEPATH=/data/data/com.termux/files/home/.groupid.txt

build/scripts/start_aarch64.sh

@@ -74,5 +74,5 @@ function startserver()
     fi
 }
 
-checkUUID
+#checkUUID
 startserver

build/scripts/start_arm.sh

@@ -78,5 +78,5 @@ function startserver()
     fi
 }
 
-checkUUID
+#checkUUID
 startserver

build/scripts/start_monitor.sh

@@ -17,7 +17,7 @@ while true; do
     #disable watchtower before startup index.js
     #rm -rf ${AUTO_UPDATE_FILE}
     pushd monitor
-        node main.bin.js\
+        node main.bin.js
     popd
     #popd
     echo "exit index.js"

build/scripts/worker_aarch64.sh

@@ -5,6 +5,6 @@ export DATA_RUNTIME_FOLDER=../model
 cd bin
 while [ 1 ]
 do
-  ./worker worker --loglevel INFO -E -n detect -c 1 -Q detect
+  REDIS_HOST=localhost REDIS_PORT=6379 ONE_KNOWN_PERSON_BYPASS_QUEUE_MODE=0 DEEP_ANALYSIS_MODE=1 SAMPLING_TO_SAVE_ENERGY_MODE=0 RESTRICT_RECOGNITON_MODE=0 MINIMAL_FACE_RESOLUTION=100 BIGGEST_FACE_ONLY_MODE=0 UPLOAD_IMAGE_SERVICE_ENABLED=0 GIF_UPLOADING=1 REALTIME_STRANGER_SDK_MESSAGE=1 ENABLE_STATIC_OBJECT_FILTER=false ./worker worker --loglevel INFO -E -n detect -c 1 -Q detect
   sleep 20
 done

docs/Run_On_Android_aarch64.md

@@ -1,4 +1,13 @@
 # Run On Android(AArch64)
+## Tested Device
+|Chipset|Memory Size|GPU Model|Device Model|System|Issue|
+|:-----:|:---------:|:-------:|:----------:|:----:|:---:|
+|Rockchip RK3399|4GB|Mali-T760 MP4|H96 MAX|Android 7.1.2||
+|Rockchip RK3399|4GB|Mali-T760 MP4|Rockpro64|Android 7.1.2||
+|Samsung Exynos 7420|3GB|Mali-T760 MP8|VR on avl7420|Android 6.0.1||
+|Samsung Exynos 7420|3GB|Mali-T760 MP8|SM-G920A|Android 7.0||
+|MediaTek MT6797|3GB|Mali-T880 MP4|Chuwi Hi9 Pro Tablet|Android 8.0.0|[TfLite Object Detection](https://github.com/SharpAI/DeepCamera/issues/19)|
+|HiSilicon Kirin 970|4GB|Mali-G72 MP12 + NPU|Huawei Honor 10|Android 8.1.2|[TfLite Object Detection](https://github.com/SharpAI/DeepCamera/issues/19)|
 
 ## Get Launcher_Termux source code
 ```
@@ -31,23 +40,54 @@ ssh -p 8022 a@Android_IP
 pkg update
 pkg install wget
 cd /data/data/com.termux/files
-wget https://github.com/SharpAI/DeepCamera/releases/download/1.1/usr_aarch64_dev_1204_2018.tgz
-tar -zxf usr_aarch64_dev_1204_2018.tgz
+wget https://github.com/SharpAI/DeepCamera/releases/download/1.1/usr_aarch64_dev_0318_2019.tgz
+tar -zxf usr_aarch64_dev_0318_2019.tgz
 ```
-#### you can delete usr_aarch64_dev_1204_2018.tgz to save space or just keep it
+#### you can delete usr_aarch64_dev_0318_2019.tgz to save space or just keep it
 
 ## Test if working
 
-### Following works on Rockpro64 Android 7.1.2, please report issue if you have runtime warning
+### please report issue if you have runtime warning
 ```
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PREFIX/lib64:/system/lib64:/system/vendor/lib64/egl:/system/vendor/lib64 LD_PRELOAD=$LD_PRELOAD:/system/lib64/libcrypto.so:/system/lib64/libcompiler_rt.so python2
+LD_LIBRARY_PATH=/system/lib64:$LD_LIBRARY_PATH:$PREFIX/lib64:/system/vendor/lib64/egl:/system/vendor/lib64 python2
 
 import tvm
-import mxnet
 ```
 ```
 >>> tvm.__version__
 '0.5.dev'
+```
+### please report issue if you have runtime warning
+```
+LD_LIBRARY_PATH=/system/lib64:$LD_LIBRARY_PATH:$PREFIX/lib64 python2
+
+import mxnet
+```
+```
 >>> mxnet.__version__
-'0.10.1'
+'1.3.1'
+```
+## Get the source code of DeepCamera
+```
+cd
+git clone https://github.com/SharpAI/DeepCamera
+cd DeepCamera
+./setup.sh
+cd build
+./build_aarch64.sh ./
+```
+
+## Install the built code
+
+```
+cd DeepCamera/build
+tar -zxmf sharpai-app-aarch64.tgz -C ~
+```
+
+## Run the built code
+
+```
+cd /data/data/com.termux/files/home/runtime
+termux-wake-lock
+setsid bash ~/runtime/start_aarch64.sh
 ```

docs/Run_Source_Android_aarch64.md

@@ -0,0 +1,77 @@
+# Run On Android(AArch64)
+## Tested Device
+|Chipset|Memory Size|GPU Model|Device Model|System|Issue|
+|:-----:|:---------:|:-------:|:----------:|:----:|:---:|
+|Rockchip RK3399|4GB|Mali-T760 MP4|H96 MAX|Android 7.1.2||
+|Rockchip RK3399|4GB|Mali-T760 MP4|Rockpro64|Android 7.1.2||
+|Samsung Exynos 7420|3GB|Mali-T760 MP8|VR on avl7420|Android 6.0.1||
+|Samsung Exynos 7420|3GB|Mali-T760 MP8|SM-G920A|Android 7.0||
+|MediaTek MT6797|3GB|Mali-T880 MP4|Chuwi Hi9 Pro Tablet|Android 8.0.0|[TfLite Object Detection](https://github.com/SharpAI/DeepCamera/issues/19)|
+|HiSilicon Kirin 970|4GB|Mali-G72 MP12 + NPU|Huawei Honor 10|Android 8.1.2|[TfLite Object Detection](https://github.com/SharpAI/DeepCamera/issues/19)|
+
+## Get Launcher_Termux source code
+```
+git clone https://github.com/SharpAI/Launcher_Termux
+```
+
+## Config authorized_keys for ssh
+Open Launcher_Termux, add your id_rsa.pub in authorized_keys
+
+![add authorized keys](../screenshots/add_authorized_keys.png)
+
+## Launch Launcher_Termux in Android Studio
+
+## Install openssh in Launcher_Termux
+
+```
+pkg install openssh
+sshd
+```
+
+## Remote access to Launcher_Termux through ssh
+
+```
+ssh -p 8022 a@Android_IP
+```
+
+## Install development rootfs(Launcher_Termux ssh environment)
+
+```
+pkg update
+pkg install wget
+cd /data/data/com.termux/files
+wget https://github.com/SharpAI/DeepCamera/releases/download/1.1/usr_aarch64_dev_0318_2019.tgz
+tar -zxf usr_aarch64_dev_0318_2019.tgz
+```
+#### you can delete usr_aarch64_dev_0318_2019.tgz to save space or just keep it
+
+## Test if working
+
+### please report issue if you have runtime warning
+```
+LD_LIBRARY_PATH=/system/lib64:$LD_LIBRARY_PATH:$PREFIX/lib64:/system/vendor/lib64/egl:/system/vendor/lib64 python2
+
+import tvm
+```
+```
+>>> tvm.__version__
+'0.5.dev'
+```
+### please report issue if you have runtime warning
+```
+LD_LIBRARY_PATH=/system/lib64:$LD_LIBRARY_PATH:$PREFIX/lib64 python2
+
+import mxnet
+```
+```
+>>> mxnet.__version__
+'1.3.1'
+```
+## Get the source code of DeepCamera
+```
+cd
+git clone https://github.com/SharpAI/DeepCamera
+cd DeepCamera
+./setup.sh
+./start_service.sh
+```