Merge branch 'dev' of https://github.com/Qihoo360/RePlugin into dev

Qihoo360 · Apr 4, 2019 · 7c1547c · 7c1547c
2 parents 3515079 + 312646b
commit 7c1547c
Show file tree

Hide file tree

Showing 18 changed files with 298 additions and 278 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 </p>
 
 [![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE)
-[![Release Version](https://img.shields.io/badge/release-2.3.1-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases)
+[![Release Version](https://img.shields.io/badge/release-2.3.2-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases)
 
 ## 通知
 

diff --git a/README_CN.md b/README_CN.md
@@ -6,7 +6,7 @@
 
 [![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE)
 
-[![Release Version](https://img.shields.io/badge/release-2.3.1-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases)
+[![Release Version](https://img.shields.io/badge/release-2.3.2-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases)
 
 ## 通知
 

diff --git a/deploy.sh b/deploy.sh
@@ -14,7 +14,7 @@ __gradle_exec(){ if [[ -x gradlew ]];then ./gradlew ${@}; else gradle ${@}; fi;
 __rp_deploy_project(){
 	[[ ! -d ${1} ]] && echo ">>> INVALID ${1}!!! <<<" && return
 	# execute deploying
-	echo ">>> ${1} <<<" && __gradle_exec -p ${1} clean bintrayUpload
+	echo ">>> ${1} <<<" && cd ${1} && __gradle_exec -p ${1} clean bintrayUpload
 	# revert changed files
 	git checkout ${1}
 }

diff --git a/...host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/StubProcessManager.java b/...host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/StubProcessManager.java
@@ -17,7 +17,6 @@
 import static com.qihoo360.replugin.helper.LogDebug.LOG;
 import static com.qihoo360.replugin.helper.LogDebug.PLUGIN_TAG;
 import static com.qihoo360.replugin.helper.LogRelease.LOGR;
-
 /**
  * @author RePlugin Team
  * dec: 坑位进程管理 buyuntao

diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/V5FileInfo.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/V5FileInfo.java
@@ -421,7 +421,7 @@ final PluginInfo updateV5FileTo(Context context, File dir, boolean checkOverride
             if (target.exists()) {
                 FileUtils.forceDelete(target);
             }
-            
+
             // 更名
             FileUtils.moveFile(tmpfile, target);
             return pi;

diff --git a/...host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePluginCallbacks.java b/...host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePluginCallbacks.java
@@ -21,8 +21,8 @@
 import android.content.SharedPreferences;
 
 import com.qihoo360.loader2.PluginContext;
-import com.qihoo360.replugin.utils.pkg.PackageFilesUtil;
 import com.qihoo360.replugin.model.PluginInfo;
+import com.qihoo360.replugin.utils.pkg.PackageFilesUtil;
 
 import java.io.InputStream;
 

diff --git a/...in-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePluginConfig.java b/...in-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePluginConfig.java
@@ -208,7 +208,7 @@ public RePluginConfig setMoveFileWhenInstalling(boolean moveFileWhenInstalling)
      * 获取宿主的 BuildID
      *
      * @return 宿主的BuildID
-     * @since 2.2.2
+     * @since 2.0.0
      */
     public String getHostBuildID() {
         return hostBuildID;
@@ -220,7 +220,7 @@ public String getHostBuildID() {
      *
      * @param buildID 宿主的BuildID
      * @return RePluginConfig自己。这样可以连环调用set方法
-     * @since 2.2.2
+     * @since 2.0.0
      */
     public RePluginConfig setHostBuild(String buildID) {
         if (!checkAllowModify()) {
@@ -233,7 +233,7 @@ public RePluginConfig setHostBuild(String buildID) {
     /**
      * 获取宿主的 VersionName
      *
-     * @since 2.2.2
+     * @since 2.0.0
      */
     public String getHostVersionName() {
         return hostVersionName;
@@ -244,7 +244,7 @@ public String getHostVersionName() {
      *
      * @param versionName 宿主的VersionName
      * @return RePluginConfig自己。这样可以连环调用set方法
-     * @since 2.2.2
+     * @since 2.0.0
      */
     public RePluginConfig setHostVersionName(String versionName) {
         if (!checkAllowModify()) {
@@ -258,7 +258,6 @@ public RePluginConfig setHostVersionName(String versionName) {
      * 获取宿主的VersionBuild号
      *
      * @return
-     * @since 2.2.2
      */
     public String getHostVersionBuild() {
         return RePlugin.getConfig().getHostVersionName() + "." + RePlugin.getConfig().getHostBuildID();

diff --git a/...host-lib/src/main/java/com/qihoo360/replugin/component/provider/PluginProviderClient.java b/...host-lib/src/main/java/com/qihoo360/replugin/component/provider/PluginProviderClient.java
@@ -77,7 +77,7 @@ public static Cursor query(Context c, Uri uri, String[] projection, String selec
      * 调用插件里的Provider
      * @see android.content.ContentResolver#query(Uri, String[], String, String[], String, CancellationSignal)
      */
-    @TargetApi(16)
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     public static Cursor query(Context c, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder, CancellationSignal cancellationSignal) {
         Uri turi = toCalledUri(c, uri);
         return c.getContentResolver().query(turi, projection, selection, selectionArgs, sortOrder, cancellationSignal);

diff --git a/...n-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/helper/LogDebug.java b/...n-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/helper/LogDebug.java
@@ -265,8 +265,5 @@ public static int printPluginInfo(PluginInfo pi, int load) {
      */
     public static final String MISC_TAG = "ws002";
 
-    /**
-     * createClassLoader TAG
-     */
     public static final String LOADER_TAG = "createClassLoader";
 }