From fc8c92ebe7cc9ab1414d83f8f91b153f51f8d362 Mon Sep 17 00:00:00 2001
From: codeskyblue <codeskyblue@gmail.com>
Date: Thu, 23 Jun 2016 15:57:08 +0800
Subject: [PATCH] update document

---
 CHANGELOG            | 76 ++++++++++++++++++++++++++++++++++++++++++++
 README.md            | 10 ++++++
 atx/adbkit/client.py |  5 +--
 3 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f73bd0f..df3fb83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,82 @@
 CHANGES
 =======
 
+* fix dir
+* remove uesless comment
+* update license from mit to apache2
+* fix taskqueue get timeout
+* use task.queue instead of pipe
+* finish atx.taskqueue
+* refator record using addon-components
+* remove adb2.py & device/android_minicap.py, add mixins for adbkit
+* update web all use local js source in order to speed up browser load
+* update doc
+* add command python -matx info
+* python -m atx gui add iOS support
+* remember last save path for tkgui, close #35
+* update opencv of qiniu address
+* remove adb.py deps
+* close #34
+* fix rotation, close #33
+* add start app support
+* little fix
+* add timeout
+* remove uesless code
+* refactoring. record screen + ui-hierarchy + user-input
+* change layout for later analyze
+* init ios click function
+* fix type when wait_response returns None
+* update desc
+* add ios device for connect
+* add ios automation doc
+* ios support prepare script
+* add gitter-travis integration
+* fix spell error
+* update doc of report
+* add google analytics for report, fix d.serial return None bug, change report js to jsdeliver cdn
+* remove useless files again
+* remove useless files
+* report add two api, info, error
+* use flask ext method to extend atx ext
+* update report.py but not yet tested, maybe caught something wrong
+* fix gt
+* click_image support long_click, close #29
+* finish part of taskqueue
+* update title
+* follow DESIGN.md to finish taskqueue
+* update name
+* fix adbkit devices() bug, remove adb.py dependency from android.py
+* remove useless print
+* update doc
+* fix forward, add performance collect use tencentGT
+* add clean after minicap capture and some other correct
+* fix ATX_ADB_HOST not working bug
+* add a remote input gui
+* add missing file
+* update logo
+* initialize eventhooks
+* add placeholder to avoid memeory leak
+* fix keycodes on windows
+* remove popo
+* add discuss group to readme
+* fix #27
+* add more functions
+* fix agent broken pipe
+* ios screenshot add rotate support
+* close #22
+* add ios screencap support
+* add openstf service
+* add logo
+* update watch function
+* update watch document
+* add screenshot method to ioskit
+* add packages function
+* add python -matx version, close #25
+* add uninstall command to adbkit, also with lot of comment
+
+1.0.11
+------
+
 * adbkit add minicap support
 * update docs
 * add screencap to adbkit
diff --git a/README.md b/README.md
index 9581033..b463e1b 100755
--- a/README.md
+++ b/README.md
@@ -579,6 +579,16 @@ python -m atx --help
 	adb uninstall com.github.uiautomator.test
 	```
 
+6. 卸载
+
+	```
+	adb uninstall com.github.uiautomator
+	adb uninstall com.github.uiautomator.test
+
+	adb shell rm /data/local/tmp/minicap
+	adb shell rm /data/local/tmp/minicap.so
+	```
+
 ## 代码导读
 `connect` 函数负责根据平台返回相应的类(AndroidDevice or IOSDevice)
 
diff --git a/atx/adbkit/client.py b/atx/adbkit/client.py
index 76bd816..ed7122d 100644
--- a/atx/adbkit/client.py
+++ b/atx/adbkit/client.py
@@ -50,10 +50,11 @@ def adb_path(cls):
         if cls.__adb_cmd is None:
             if "ANDROID_HOME" in os.environ:
                 filename = "adb.exe" if os.name == 'nt' else "adb"
-                adb_cmd = os.path.join(os.environ["ANDROID_HOME"], "platform-tools", filename)
+                adb_dir = os.path.join(os.environ["ANDROID_HOME"], "platform-tools")
+                adb_cmd = os.path.join(adb_dir, filename)
                 if not os.path.exists(adb_cmd):
                     raise EnvironmentError(
-                        "Adb not found in $ANDROID_HOME path: %s." % os.environ["ANDROID_HOME"])
+                        "Adb not found in $ANDROID_HOME/platform-tools path: %s." % adb_dir)
             else:
                 import distutils
                 if "spawn" not in dir(distutils):