update LoadedApk

limpoxe · limpoxe · commit ee9515481aaa · 2016-01-30T12:58:57.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginLoader.java b/PluginCore/src/com/plugin/core/PluginLoader.java
@@ -486,13 +486,15 @@ static void ensurePluginInited(PluginDescriptor pluginDescriptor) {
 				pluginDescriptor.setPluginContext(pluginContext);
 				pluginDescriptor.setPluginClassLoader(pluginClassLoader);
 
+				callPluginApplicationOnCreate(pluginDescriptor);
+
 				try {
-					ActivityThread.installPackageInfo(getApplicatoin(), pluginDescriptor.getPackageName());
+					ActivityThread.installPackageInfo(getApplicatoin(), pluginDescriptor.getPackageName(), pluginDescriptor);
 				} catch (ClassNotFoundException e) {
 					e.printStackTrace();
 				}
 
-				callPluginApplicationOnCreate(pluginDescriptor);
+				changeListener.onPluginStarted(pluginDescriptor.getPackageName());
 
 				LogUtil.e("初始化插件" + pluginDescriptor.getPackageName() + "完成");
 			}
@@ -525,7 +527,6 @@ private static void callPluginApplicationOnCreate(PluginDescriptor pluginDescrip
 			application.onCreate();
 		}
 
-		changeListener.onPluginStarted(pluginDescriptor.getPackageName());
 	}
 
 	public static boolean isInstalled(String pluginId, String pluginVersion) {
diff --git a/PluginCore/src/com/plugin/core/app/ActivityThread.java b/PluginCore/src/com/plugin/core/app/ActivityThread.java
@@ -54,6 +54,7 @@ public synchronized static Object currentActivityThread() {
     }
 
     public static Object getResCompatibilityInfo() {
+        //貌似没啥用
         Object mBoundApplication = RefInvoker.getFieldObject(currentActivityThread(), android_app_ActivityThread, "mBoundApplication");
         Object compatInfo = RefInvoker.getFieldObject(mBoundApplication, android_app_ActivityThread_AppBindData, "compatInfo");
         return compatInfo;
@@ -166,7 +167,7 @@ public static void wrapInstrumentation() {
 //            42                parent = baseParent;
 //            43            }
 //
-    public static void installPackageInfo(Context hostContext, String pluginId) throws ClassNotFoundException {
+    public static void installPackageInfo(Context hostContext, String pluginId, PluginDescriptor pluginDescriptor) throws ClassNotFoundException {
         enableLog();
         Object applicationLoaders = RefInvoker.invokeStaticMethod("android.app.ApplicationLoaders", "getDefault", (Class[]) null, (Object[]) null);
         Map mLoaders = (Map)RefInvoker.getFieldObject(applicationLoaders, "android.app.ApplicationLoaders", "mLoaders");
@@ -181,6 +182,15 @@ public static void installPackageInfo(Context hostContext, String pluginId) thro
             Object pluginLoadedApk = RefInvoker.invokeMethod(currentActivityThread(), android_app_ActivityThread, "getPackageInfoNoCheck",
                     new Class[]{ApplicationInfo.class, Class.forName("android.content.res.CompatibilityInfo")},
                     new Object[]{info, compatibilityInfo});
+            if (pluginLoadedApk != null) {
+                Class loadedAPKClass = pluginLoadedApk.getClass();
+                RefInvoker.setFieldObject(pluginLoadedApk, loadedAPKClass, "mApplication", pluginDescriptor.getPluginApplication());
+                RefInvoker.setFieldObject(pluginLoadedApk, loadedAPKClass, "mResources", pluginDescriptor.getPluginContext().getResources());
+                //TODO
+                //RefInvoker.setFieldObject(pluginLoadedApk, loadedAPKClass, "mLibDir", );
+                //RefInvoker.setFieldObject(pluginLoadedApk, loadedAPKClass, "mDataDirFile", );
+                //RefInvoker.setFieldObject(pluginLoadedApk, loadedAPKClass, "mDataDir", );
+            }
             //再还原
             Thread.currentThread().setContextClassLoader(classLoader);
         } catch (PackageManager.NameNotFoundException e) {

Original file line number	Diff line number	Diff line change
`@@ -486,13 +486,15 @@ static void ensurePluginInited(PluginDescriptor pluginDescriptor) {`
`486`	`486`	`pluginDescriptor.setPluginContext(pluginContext);`
`487`	`487`	`pluginDescriptor.setPluginClassLoader(pluginClassLoader);`
`488`	`488`
	`489`	`+ callPluginApplicationOnCreate(pluginDescriptor);`
	`490`	`+`
`489`	`491`	`try {`
`490`		`- ActivityThread.installPackageInfo(getApplicatoin(), pluginDescriptor.getPackageName());`
	`492`	`+ ActivityThread.installPackageInfo(getApplicatoin(), pluginDescriptor.getPackageName(), pluginDescriptor);`
`491`	`493`	`} catch (ClassNotFoundException e) {`
`492`	`494`	`e.printStackTrace();`
`493`	`495`	`}`
`494`	`496`
`495`		`- callPluginApplicationOnCreate(pluginDescriptor);`
	`497`	`+ changeListener.onPluginStarted(pluginDescriptor.getPackageName());`
`496`	`498`
`497`	`499`	`LogUtil.e("初始化插件" + pluginDescriptor.getPackageName() + "完成");`
`498`	`500`	`}`
`@@ -525,7 +527,6 @@ private static void callPluginApplicationOnCreate(PluginDescriptor pluginDescrip`
`525`	`527`	`application.onCreate();`
`526`	`528`	`}`
`527`	`529`
`528`		`- changeListener.onPluginStarted(pluginDescriptor.getPackageName());`
`529`	`530`	`}`
`530`	`531`
`531`	`532`	`public static boolean isInstalled(String pluginId, String pluginVersion) {`