fixed issue#22 for lab

DynamicLoadApk/lib/src/com/ryg/dynamicload/DLProxyActivity.java

@@ -37,7 +37,6 @@ public class DLProxyActivity extends Activity implements DLProxy {
 
     protected DLPlugin mRemoteActivity;
     private DLProxyImpl impl = new DLProxyImpl(this);
-    private DLPluginManager mPluginManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,7 +47,6 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public void attach(DLPlugin remoteActivity, DLPluginManager pluginManager) {
         mRemoteActivity = remoteActivity;
-        mPluginManager = pluginManager;
     }
 
     @Override

DynamicLoadApk/lib/src/com/ryg/dynamicload/DLProxyFragmentActivity.java

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.ryg.dynamicload;
 
 import android.content.Intent;
@@ -23,6 +24,7 @@
 import android.content.res.Resources.Theme;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -37,18 +39,18 @@ public class DLProxyFragmentActivity extends FragmentActivity implements DLProxy
 
     protected DLPlugin mRemoteActivity;
     private DLProxyImpl impl = new DLProxyImpl(this);
-    private DLPluginManager mPluginManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Log.d("", "fragment : intent id : " + getIntent().toString());
+        Log.e("", "### proxy fragment : " + getIntent().getClass().getName());
         impl.onCreate(getIntent());
     }
 
     @Override
     public void attach(DLPlugin remoteActivity, DLPluginManager pluginManager) {
         mRemoteActivity = remoteActivity;
-        mPluginManager = pluginManager;
     }
 
     @Override

DynamicLoadApk/lib/src/com/ryg/dynamicload/internal/DLConfig.java

@@ -0,0 +1,49 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2015 singwhatiwanna(任玉刚) <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.ryg.dynamicload.internal;
+
+/**
+ * DL配置类,用于存储DL插件系统唯一的配置信息
+ * 
+ * @author mrsimple
+ */
+public final class DLConfig {
+
+    /**
+     * plugin的ClassLoader, 默认设置为DL的ClassLoader,在用户传递Parcelable数据时会替换成Plugin的
+     * classLoader.
+     */
+    public ClassLoader mPluginClassLoader = DLConfig.class.getClassLoader();
+    public final float DL_VERSION = 1.0f;
+
+    private static final DLConfig sConfig = new DLConfig();
+
+    private DLConfig() {
+    }
+
+    public static DLConfig getConfig() {
+        return sConfig;
+    }
+}

DynamicLoadApk/lib/src/com/ryg/dynamicload/internal/DLIntent.java

@@ -15,8 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ryg.dynamicload.internal;
 
+package com.ryg.dynamicload.internal;
 
 import android.content.Intent;
 import android.os.Parcel;
@@ -77,6 +77,16 @@ public String getDexPath() {
         return mDexPath;
     }
 
+    @Override
+    public Intent putExtra(String name, Parcelable value) {
+        ClassLoader pluginLoader = value.getClass().getClassLoader();
+        if (getExtras() == null) {
+            putExtra("dl-verson", DLConfig.getConfig().DL_VERSION);
+        }
+        DLConfig.getConfig().mPluginClassLoader = pluginLoader;
+        getExtras().setClassLoader(pluginLoader);
+        return super.putExtra(name, value);
+    }
 
     public static final Parcelable.Creator<DLIntent> CREATOR = new Parcelable.Creator<DLIntent>() {
 
@@ -114,4 +124,10 @@ public void readFromParcel(Parcel in) {
         super.readFromParcel(in);
     }
 
+    @Override
+    public String toString() {
+        return "DLIntent [mDexPath=" + mDexPath + ", mPluginPackage=" + mPluginPackage
+                + ", mPluginClass=" + mPluginClass + ", hashcode : " + this.hashCode() + " ]";
+    }
+
 }

DynamicLoadApk/lib/src/com/ryg/dynamicload/internal/DLPluginManager.java

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.ryg.dynamicload.internal;
 
 import java.io.File;
@@ -46,26 +47,29 @@ public class DLPluginManager {
     private static final String TAG = "DLPluginManager";
 
     /**
-     * return value of {@link #startPluginActivity(Activity, DLIntent)} start success
+     * return value of {@link #startPluginActivity(Activity, DLIntent)} start
+     * success
      */
     public static final int START_RESULT_SUCCESS = 0;
 
     /**
-     * return value of {@link #startPluginActivity(Activity, DLIntent)} package not found
+     * return value of {@link #startPluginActivity(Activity, DLIntent)} package
+     * not found
      */
     public static final int START_RESULT_NO_PKG = 1;
 
     /**
-     * return value of {@link #startPluginActivity(Activity, DLIntent)} class not found
+     * return value of {@link #startPluginActivity(Activity, DLIntent)} class
+     * not found
      */
     public static final int START_RESULT_NO_CLASS = 2;
 
     /**
-     * return value of {@link #startPluginActivity(Activity, DLIntent)} class type error
+     * return value of {@link #startPluginActivity(Activity, DLIntent)} class
+     * type error
      */
     public static final int START_RESULT_TYPE_ERROR = 3;
 
-
     private static volatile DLPluginManager sInstance;
     private Context mContext;
     private final HashMap<String, DLPluginPackage> mPackagesHolder = new HashMap<String, DLPluginPackage>();
@@ -90,10 +94,12 @@ public static DLPluginManager getInstance(Context context) {
     /**
      * Load a apk. Before start a plugin Activity, we should do this first.<br/>
      * NOTE : will only be called by host apk.
+     * 
      * @param dexPath
      */
     public DLPluginPackage loadApk(String dexPath) {
-        // when loadApk is called by host apk, we assume that plugin is invoked by host.
+        // when loadApk is called by host apk, we assume that plugin is invoked
+        // by host.
         mFrom = DLConstants.FROM_EXTERNAL;
 
         PackageInfo packageInfo = mContext.getPackageManager().
@@ -127,7 +133,8 @@ public void reLoadApk(String dexPath, String packageName) {
     private DexClassLoader createDexClassLoader(String dexPath) {
         File dexOutputDir = mContext.getDir("dex", Context.MODE_PRIVATE);
         final String dexOutputPath = dexOutputDir.getAbsolutePath();
-        DexClassLoader loader = new DexClassLoader(dexPath, dexOutputPath, null, mContext.getClassLoader());
+        DexClassLoader loader = new DexClassLoader(dexPath, dexOutputPath, null,
+                mContext.getClassLoader());
         return loader;
     }
 
@@ -173,6 +180,7 @@ private Resources createResources(AssetManager assetManager) {
     public void launchPluginActivity(DLIntent dlIntent) {
         Intent service = new Intent(mContext, DLIntentService.class);
         service.setAction(DLConstants.ACTION_LAUNCH_PLUGIN);
+        service.setExtrasClassLoader(DLConfig.getConfig().mPluginClassLoader);
         service.putExtra(DLConstants.EXTRA_DLINTENT, dlIntent);
         mContext.startService(service);
     }
@@ -188,11 +196,16 @@ public int startPluginActivity(Context context, DLIntent dlIntent) {
      * @param context
      * @param dlIntent
      * @param requestCode
-     * @return One of below: {@link #START_RESULT_SUCCESS} {@link #START_RESULT_NO_PKG}
-     *         {@link #START_RESULT_NO_CLASS} {@link #START_RESULT_TYPE_ERROR}
+     * @return One of below: {@link #START_RESULT_SUCCESS}
+     *         {@link #START_RESULT_NO_PKG} {@link #START_RESULT_NO_CLASS}
+     *         {@link #START_RESULT_TYPE_ERROR}
      */
     @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     public int startPluginActivityForResult(Context context, DLIntent dlIntent, int requestCode) {
+
+        // 设置 Extras ClassLoader
+        dlIntent.setExtrasClassLoader(DLConfig.getConfig().mPluginClassLoader);
+
         if (mFrom == DLConstants.FROM_INTERNAL) {
             dlIntent.setClassName(context, dlIntent.getPluginClass());
             performStartActivityForResult(context, dlIntent, requestCode);
@@ -236,13 +249,19 @@ public int startPluginActivityForResult(Context context, DLIntent dlIntent, int
 
         Intent intent = new Intent();
         intent.setClass(mContext, activityClass);
-        if (dlIntent.getExtras() != null) {
-            intent.putExtras(dlIntent.getExtras());
-        }
         intent.putExtra(DLConstants.EXTRA_CLASS, className);
         intent.putExtra(DLConstants.EXTRA_PACKAGE, packageName);
         intent.putExtra(DLConstants.EXTRA_DEX_PATH, dlIntent.getDexPath());
         intent.setFlags(dlIntent.getFlags());
+
+        // 将dlIntent中的参数设置到intent中
+        if (dlIntent.getExtras() != null) {
+            // 设置ClassLoader,避免出现通过Intent传递Parcelable参数时出现Class Not Found异常
+            // dlIntent.setExtrasClassLoader(dlIntent.getPathClassLoader());
+            intent.setExtrasClassLoader(DLConfig.getConfig().mPluginClassLoader);
+            intent.putExtras(dlIntent.getExtras());
+        }
+
         Log.d(TAG, "launch " + className);
         performStartActivityForResult(context, intent, requestCode);
         return START_RESULT_SUCCESS;
@@ -259,6 +278,7 @@ private void performStartActivityForResult(Context context, Intent intent, int r
     /**
      * verify plugin, return false means verify plugin failed,the plugin can not
      * be loaded.
+     * 
      * @param context
      * @param pluginPath
      * @param packageInfo

DynamicLoadApk/lib/src/com/ryg/dynamicload/internal/DLProxyImpl.java

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.ryg.dynamicload.internal;
 
 import java.lang.reflect.Constructor;
@@ -84,6 +85,11 @@ private void handleActivityInfo() {
     }
 
     public void onCreate(Intent intent) {
+
+        // 在获取数据之前设置Extras ClassLoader,避免传输自定义的Parcelable对象时出现Class Not
+        // Found的问题.
+        intent.setExtrasClassLoader(DLConfig.getConfig().mPluginClassLoader);
+        // 获取数据
         mPackageName = intent.getStringExtra(DLConstants.EXTRA_PACKAGE);
         mClass = intent.getStringExtra(DLConstants.EXTRA_CLASS);
         mDexPath = intent.getStringExtra(DLConstants.EXTRA_DEX_PATH);

DynamicLoadApk/lib/src/com/ryg/utils/DLUtils.java

@@ -1,8 +1,5 @@
 package com.ryg.utils;
 
-import java.util.List;
-
-import android.R.anim;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
@@ -18,8 +15,8 @@
 
 import com.ryg.dynamicload.DLBasePluginActivity;
 import com.ryg.dynamicload.DLBasePluginFragmentActivity;
-import com.ryg.dynamicload.internal.DLPluginManager;
-import com.ryg.dynamicload.internal.DLPluginPackage;
+
+import java.util.List;
 
 public class DLUtils {
     private static final String TAG = "DLUtils";

DynamicLoadApk/sample/main/main-host/.classpath

@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

DynamicLoadApk/sample/main/main-host/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>main-host</name>
+	<name>dl-main-host</name>
 	<comment></comment>
 	<projects>
 	</projects>