Merge branch 'master' of github.com:qpython-android/qpython

Author: riverfor

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: riverfor
+custom: ["https://paypal.me/qpyriver"]

README.md

@@ -1,29 +1,59 @@
 # About
+
+
 <p align="center"><a href="https://play.google.com/store/apps/details?id=org.qpython.qpy" target="_blank"><img src="https://lh3.googleusercontent.com/E2sU2Mca-geyscWogW2ZsQC3dY1Y46a3HU35NoHv0AIBvCgQn_ZRZ2MOeA5tg3YkWg=s360-rw"></a></p>
 
-Welcome to read the QPython guide!
+Welcome to the QPython project!
 
-QPython is a script engine that runs Python on android devices. It lets your android device run Python scripts and projects. It contains the Python interpreter, console, editor, and the SL4A Library for Android. It’s Python on Android!
+QPython is the Python engine for android. It contains some amazing features such as Python interpreter, runtime environment, editor and QPYI and integrated SL4A. It makes it easy for you to use Python on Android. And it's FREE.
 
+QPython already has millions of users worldwide and it is also an open source project.
 
-QPython has several millions users in the world already, it's a great project for programming users, welcome to join us for contributing to this project NOW.
+For different usage scenarios, QPython has two branches, namely QPython Ox and 3x.
+
+QPython Ox is mainly aimed at programming learners, and it provides more friendly features for beginners.
+QPython 3x is mainly for experienced Python users, and it provides some advanced technical features.
 
 ## Quick start
 
+This repository is the QPython Ox project repository, you can follow the below steps to run it.
+
 - Macos + Android studio, (Ubuntu may work too)
 - git clone [email protected]:qpython-android/qpython.git
 - git submodule init
 - git submodule sync
 - git submodule update
 - build it...
 
+Get more information from [wiki](https://github.com/qpython-android/qpython/wiki) for developing QPython
+
+## Related 
+
+- [QPython 3x features](https://github.com/qpython-android/qpython.org/blob/master/qpython-docs/source/en/qpython_3x_featues.rst), [QPython Ox features](https://github.com/qpython-android/qpython.org/blob/master/qpython-docs/source/en/qpython_ox_featues.rst)
+- [QPySL4A APIs](https://github.com/qpython-android/qpysl4a/blob/master/doc/en/APIs.rst) and [test scripts](https://github.com/qpython-android/qpysl4a/issues/1)
+- QPYPI Packages
+
 ## How to ask QPython related questions
 In order to benefit those guys who have the same issue with QPython, we suggest that you should ask the issue which is related with QPython within public techical communities.
 
-Please tell us your phone's informatioin, android os information, QPython version, where did you install it and the detailed stituation you have encountered.
+
+### English QPythonista Community
 
 - [Ask in stackoverflow](https://stackoverflow.com/questions/tagged/qpython)
+- [Discuss QPython Programming in QPython Group](https://www.facebook.com/groups/qpython/)
+
+### Chinese QPythonista Community
+
 - [在segmentfault提问 - Chinese](https://segmentfault.com/t/qpython)
+- [在贴吧讨论 - Chinese](https://tieba.baidu.com/f?ie=utf-8&kw=qpython)
+
+### Report issues
+
+Please tell us your phone's informatioin, android os information, QPython branch, and your code, where did you install it and the detailed stituation you have encountered.
+
+- [Report an app's issue](https://github.com/qpython-android/qpython/issues)
+- [Report an non-app's issue](https://github.com/qpython-android/qpython.org/issues)
+- [Request to support a package](https://github.com/qpython-android/qpypi/issues)
 
 ## Donation
 
@@ -42,4 +72,6 @@ IF YOU WANT TO PARTICIPATE THIS PROJECT, PLEASE SEND YOUR EMAIL TO US, WE WILL I
 - Twitter: @qpython
 - Facebook: https://www.facebook.com/qpython
 
+Or you can join [qpython slack](https://join.slack.com/t/qpython/shared_invite/enQtOTI1MDY1NzM4NjU2LTljZDI3MjI0ZmZmNzIwNzAwMTU2ZDIyNGRjMTJiOTQ4MzgzY2Y3NDU5YzJjNTQ5MmM4Nzk2MGI4YWZmY2VhOTU)
+
 THANK YOU.

docs/QPython_3x_featues.md

@@ -0,0 +1,36 @@
+# QPython 3x featues
+
+Because google play and some appstores have strict requirements on the permissions of the app, we use different strategies in different appstores, which is why the branch name will be different. For example, L means Limited, and S means it contains Sensitive permissions.
+
+## Python
+- Python3.6.6
+- QRCode Reader
+- Editor
+- QPYPI
+- Ftp
+
+## Android Permissions
+
+### Both QPython 3S and 3L
+
+- android.permission.INTERNET
+- android.permission.ACCESS_SUPERUSER
+- android.permission.WAKE_LOCK
+- android.permission.ACCESS_NETWORK_STATE
+- android.permission.ACCESS_WIFI_STATE
+- android.permission.RECEIVE_BOOT_COMPLETED
+- android.permission.CAMERA
+- android.permission.FLASHLIGHT
+- android.permission.VIBRATE
+- android.permission.RECEIVE_USER_PRESENT
+- com.android.vending.BILLING
+- com.android.browser.permission.READ_HISTORY_BOOKMARKS
+- com.android.browser.permission.WRITE_HISTORY_BOOKMARKS
+- com.android.launcher.permission.INSTALL_SHORTCUT
+- com.android.launcher.permission.UNINSTALL_SHORTCUT
+- android.permission.READ_EXTERNAL_STORAGE
+- android.permission.WRITE_EXTERNAL_STORAGE
+- android.permission.ACCESS_COARSE_LOCATION
+- android.permission.ACCESS_FINE_LOCATION
+
+### QPython 3S

docs/QPython_Ox_featues.md

@@ -0,0 +1,40 @@
+# QPython Ox featues
+
+Because google play and some appstores have strict requirements on the permissions of the app, we use different strategies in different appstores, which is why the branch name will be different. For example, L means Limited, and S means it contains Sensitive permissions.
+
+## Python
+- Python3 + Python2 basis
+- QRCode Reader
+- Editor
+- QPYPI
+- Ftp
+- Course
+
+## Permissions
+### Both QPython OL and OS
+- android.permission.INTERNET
+- android.permission.ACCESS_SUPERUSER
+- android.permission.WAKE_LOCK
+- android.permission.ACCESS_NETWORK_STATE
+- android.permission.ACCESS_WIFI_STATE
+- android.permission.RECEIVE_BOOT_COMPLETED
+- android.permission.CAMERA
+- android.permission.FLASHLIGHT
+- android.permission.VIBRATE
+- android.permission.RECEIVE_USER_PRESENT
+- com.android.vending.BILLING
+- com.android.browser.permission.READ_HISTORY_BOOKMARKS
+- com.android.browser.permission.WRITE_HISTORY_BOOKMARKS
+- com.android.launcher.permission.INSTALL_SHORTCUT
+- com.android.launcher.permission.UNINSTALL_SHORTCUT
+- android.permission.READ_EXTERNAL_STORAGE
+- android.permission.WRITE_EXTERNAL_STORAGE
+- android.permission.ACCESS_COARSE_LOCATION
+- android.permission.ACCESS_FINE_LOCATION
+
+### QPython OS
+- android.permission.FOREGROUND_SERVICE
+- android.permission.BLUETOOTH
+- android.permission.BLUETOOTH_ADMIN
+- android.permission.NFC
+- android.permission.RECORD_AUDIO