Signed-off-by: ruhaly <han_lru@163.com>
Merge branch 'master' of https://github.com/ruhaly/bookos.git

Conflicts:
	BookOS/bin/BookOS.apk
	BookOS/bin/R.txt
	BookOS/bin/classes.dex
	BookOS/bin/resources.ap_
	BookOS/gen/com/my/bookos/R.java
	BookOS/project.properties
	V4/bin/v4.jar
	changhong_sdk/bin/R.txt
	changhong_sdk/bin/changhong_sdk.jar
	changhong_sdk/bin/classes/com/changhong/sdk/R$string.class
	changhong_sdk/bin/classes/com/lidroid/xutils/BitmapUtils$BitmapLoadTask.class
	changhong_sdk/bin/classes/com/lidroid/xutils/BitmapUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/DbUtils$DaoConfig.class
	changhong_sdk/bin/classes/com/lidroid/xutils/DbUtils$FindTempCache.class
	changhong_sdk/bin/classes/com/lidroid/xutils/DbUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/HttpUtils$1.class
	changhong_sdk/bin/classes/com/lidroid/xutils/HttpUtils$2.class
	changhong_sdk/bin/classes/com/lidroid/xutils/HttpUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/ViewUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/BitmapCommonUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/BitmapDisplayConfig.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/BitmapGlobalConfig$BitmapCacheManagementTask.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/BitmapGlobalConfig.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/PauseOnScrollListener.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/callback/BitmapLoadCallBack.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/core/AsyncDrawable.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/core/BitmapCache$1.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/core/BitmapCache$BitmapMeta.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/core/BitmapCache$MemoryCacheKey.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/core/BitmapCache.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/core/BitmapDecoder.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/core/BitmapSize.class
	changhong_sdk/bin/classes/com/lidroid/xutils/bitmap/download/Downloader.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/BooleanColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/ByteArrayColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/ByteColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/CharColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/ColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/ColumnConverterFactory.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/DateColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/DoubleColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/FloatColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/IntegerColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/LongColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/ShortColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/SqlDateColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/converter/StringColumnConverter.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/sqlite/CursorUtils$EntityTempCache.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/sqlite/CursorUtils$FindCacheSequence.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/sqlite/CursorUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/sqlite/FinderLazyLoader.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/sqlite/ForeignLazyLoader.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/sqlite/SqlInfoBuilder.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/sqlite/WhereBuilder.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/Column.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/ColumnUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/DbModel.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/Finder.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/Foreign.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/Id.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/KeyValue.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/Table.class
	changhong_sdk/bin/classes/com/lidroid/xutils/db/table/TableUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/HttpCache$1.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/HttpCache.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/HttpHandler$State.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/HttpHandler.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/RequestParams$HeaderItem.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/RequestParams.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/ResponseInfo.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/ResponseStream.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/SyncHttpHandler.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/callback/FileDownloadHandler.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/callback/RequestCallBack.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/callback/RequestCallBackHandler.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/callback/StringDownloadHandler.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/HttpRequest$HttpMethod.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/HttpRequest.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/RetryHandler.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/entity/BodyParamsEntity.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/entity/DecompressingEntity.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/entity/FileUploadEntity.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/entity/InputStreamUploadEntity.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/multipart/HttpMultipart.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/multipart/MinimalFieldHeader.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/multipart/MultipartEntity$CallBackInfo.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/multipart/MultipartEntity.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/multipart/content/FileBody.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/multipart/content/InputStreamBody.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/multipart/content/StringBody.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/util/URIBuilder.class
	changhong_sdk/bin/classes/com/lidroid/xutils/http/client/util/URLEncodedUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/util/OtherUtils$1.class
	changhong_sdk/bin/classes/com/lidroid/xutils/util/OtherUtils.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/ViewInjectInfo.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/EventBase.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnChildClick.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnClick.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnFocusChange.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnGroupClick.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnGroupCollapse.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnGroupExpand.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnItemClick.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnItemLongClick.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnItemSelected.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnKey.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnLongClick.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnNothingSelected.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnPreferenceChange.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnPreferenceClick.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnProgressChanged.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnScroll.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnScrollStateChanged.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnStartTrackingTouch.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnStopTrackingTouch.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnTabChange.class
	changhong_sdk/bin/classes/com/lidroid/xutils/view/annotation/event/OnTouch.class
	changhong_sdk/gen/com/changhong/sdk/R.java
	changhong_sdk/res/values/strings.xml
	changhong_sdk/src/com/lidroid/xutils/BitmapUtils.java
	changhong_sdk/src/com/lidroid/xutils/DbUtils.java
	changhong_sdk/src/com/lidroid/xutils/HttpUtils.java
	changhong_sdk/src/com/lidroid/xutils/ViewUtils.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/BitmapCommonUtils.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/BitmapDisplayConfig.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/BitmapGlobalConfig.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/PauseOnScrollListener.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/callback/BitmapLoadCallBack.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/core/AsyncDrawable.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/core/BitmapCache.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/core/BitmapDecoder.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/core/BitmapSize.java
	changhong_sdk/src/com/lidroid/xutils/bitmap/download/Downloader.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/BooleanColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/ByteArrayColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/ByteColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/CharColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/ColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/ColumnConverterFactory.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/DateColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/DoubleColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/FloatColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/IntegerColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/LongColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/ShortColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/SqlDateColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/converter/StringColumnConverter.java
	changhong_sdk/src/com/lidroid/xutils/db/sqlite/CursorUtils.java
	changhong_sdk/src/com/lidroid/xutils/db/sqlite/FinderLazyLoader.java
	changhong_sdk/src/com/lidroid/xutils/db/sqlite/ForeignLazyLoader.java
	changhong_sdk/src/com/lidroid/xutils/db/sqlite/Selector.java
	changhong_sdk/src/com/lidroid/xutils/db/sqlite/SqlInfo.java
	changhong_sdk/src/com/lidroid/xutils/db/sqlite/SqlInfoBuilder.java
	changhong_sdk/src/com/lidroid/xutils/db/sqlite/WhereBuilder.java
	changhong_sdk/src/com/lidroid/xutils/db/table/Column.java
	changhong_sdk/src/com/lidroid/xutils/db/table/ColumnUtils.java
	changhong_sdk/src/com/lidroid/xutils/db/table/DbModel.java
	changhong_sdk/src/com/lidroid/xutils/db/table/Finder.java
	changhong_sdk/src/com/lidroid/xutils/db/table/Foreign.java
	changhong_sdk/src/com/lidroid/xutils/db/table/Id.java
	changhong_sdk/src/com/lidroid/xutils/db/table/KeyValue.java
	changhong_sdk/src/com/lidroid/xutils/db/table/Table.java
	changhong_sdk/src/com/lidroid/xutils/db/table/TableUtils.java
	changhong_sdk/src/com/lidroid/xutils/http/HttpCache.java
	changhong_sdk/src/com/lidroid/xutils/http/HttpHandler.java
	changhong_sdk/src/com/lidroid/xutils/http/RequestParams.java
	changhong_sdk/src/com/lidroid/xutils/http/ResponseInfo.java
	changhong_sdk/src/com/lidroid/xutils/http/ResponseStream.java
	changhong_sdk/src/com/lidroid/xutils/http/SyncHttpHandler.java
	changhong_sdk/src/com/lidroid/xutils/http/callback/FileDownloadHandler.java
	changhong_sdk/src/com/lidroid/xutils/http/callback/RequestCallBack.java
	changhong_sdk/src/com/lidroid/xutils/http/callback/RequestCallBackHandler.java
	changhong_sdk/src/com/lidroid/xutils/http/callback/StringDownloadHandler.java
	changhong_sdk/src/com/lidroid/xutils/http/client/HttpRequest.java
	changhong_sdk/src/com/lidroid/xutils/http/client/RetryHandler.java
	changhong_sdk/src/com/lidroid/xutils/http/client/entity/BodyParamsEntity.java
	changhong_sdk/src/com/lidroid/xutils/http/client/entity/DecompressingEntity.java
	changhong_sdk/src/com/lidroid/xutils/http/client/entity/FileUploadEntity.java
	changhong_sdk/src/com/lidroid/xutils/http/client/entity/GZipDecompressingEntity.java
	changhong_sdk/src/com/lidroid/xutils/http/client/entity/InputStreamUploadEntity.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/HttpMultipart.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/MIME.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/MinimalFieldHeader.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/MultipartEntity.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/content/ByteArrayBody.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/content/ContentBody.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/content/FileBody.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/content/InputStreamBody.java
	changhong_sdk/src/com/lidroid/xutils/http/client/multipart/content/StringBody.java
	changhong_sdk/src/com/lidroid/xutils/http/client/util/URIBuilder.java
	changhong_sdk/src/com/lidroid/xutils/http/client/util/URLEncodedUtils.java
	changhong_sdk/src/com/lidroid/xutils/util/CharsetUtils.java
	changhong_sdk/src/com/lidroid/xutils/util/IOUtils.java
	changhong_sdk/src/com/lidroid/xutils/util/OtherUtils.java
	changhong_sdk/src/com/lidroid/xutils/view/ViewInjectInfo.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/ResInject.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/EventBase.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnChildClick.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnClick.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnFocusChange.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnGroupClick.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnGroupCollapse.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnGroupExpand.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnItemClick.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnItemLongClick.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnItemSelected.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnKey.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnLongClick.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnNothingSelected.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnPreferenceChange.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnPreferenceClick.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnProgressChanged.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnScroll.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnScrollStateChanged.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnStartTrackingTouch.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnStopTrackingTouch.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnTabChange.java
	changhong_sdk/src/com/lidroid/xutils/view/annotation/event/OnTouch.java

Signed-off-by: ruhaly <han_lru@163.com>