Skip to content

Commit 2a39806

Browse files
committed
api rename
1 parent 87be7a5 commit 2a39806

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

FairyPlugin/src/main/java/com/limpoxe/fairy/core/PluginInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static void resetWindowConfig(final Context pluginContext, final PluginDescripto
378378
private static int getPluginTheme(ActivityInfo activityInfo, PluginActivityInfo pluginActivityInfo, PluginDescriptor pd) {
379379
int pluginAppTheme = 0;
380380
if (pluginActivityInfo != null ) {
381-
pluginAppTheme = ResourceUtil.getResourceId(pluginActivityInfo.getTheme());
381+
pluginAppTheme = ResourceUtil.parseResId(pluginActivityInfo.getTheme());
382382
}
383383
if (pluginAppTheme == 0) {
384384
pluginAppTheme = pd.getApplicationTheme();

FairyPlugin/src/main/java/com/limpoxe/fairy/core/proxy/systemservice/AndroidAppIPackageManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ private static ActivityInfo getActivityInfo(PluginDescriptor pluginDescriptor, S
384384
if (pluginDescriptor.getType(className) == PluginDescriptor.ACTIVITY) {
385385
PluginActivityInfo detail = pluginDescriptor.getActivityInfos().get(className);
386386
activityInfo.launchMode = Integer.valueOf(detail.getLaunchMode());
387-
activityInfo.theme = ResourceUtil.getResourceId(detail.getTheme());
387+
activityInfo.theme = ResourceUtil.parseResId(detail.getTheme());
388388
if (detail.getUiOptions() != null) {
389389
activityInfo.uiOptions = Integer.parseInt(detail.getUiOptions().replace("0x", ""), 16);
390390
}

FairyPlugin/src/main/java/com/limpoxe/fairy/manager/PluginStubBinding.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,13 @@ public static synchronized String bindStubActivity(String pluginActivityClassNam
239239
f.setAccessible(true);
240240
sResId = (int)f.get(null);
241241
}
242-
int styleId = ResourceUtil.getResourceId(themeId);
242+
int styleId = ResourceUtil.parseResId(themeId);
243243
if (styleId != 0) {
244244
//maybe need cache
245+
//根据目标Activity的主题id构造一个主题对象,
246+
//并尝试从此主题中取出用于配置透明的属性:windowIsTranslucent
247+
//如果取到了,说明目标Activity是使用的透明主题
248+
//则返回透明主题的stubActivity
245249
Resources.Theme theme = loadedPlugin.pluginResource.newTheme();
246250
Resources.Theme baseTheme = ((ContextWrapper)loadedPlugin.pluginContext).getBaseContext().getTheme();
247251
if (baseTheme != null) {

FairyPlugin/src/main/java/com/limpoxe/fairy/util/ResourceUtil.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,15 @@ public static Boolean getBoolean(String value, Context pluginContext) {
7171
return null;
7272
}
7373

74+
/**
75+
* use parseResId() instead
76+
*/
77+
@Deprecated
7478
public static int getResourceId(String value) {
79+
return parseResId(value);
80+
}
81+
82+
public static int parseResId(String value) {
7583
String idHex = null;
7684
if (value != null && value.startsWith("@") && value.length() == 9) {
7785
idHex = value.replace("@", "");
@@ -107,7 +115,7 @@ public static String getLabel(PluginDescriptor pluginDescriptor) {
107115
if (label == null || label.equals(pluginDescriptor.getPackageName())) {
108116
//可能设置的lable是来自宿主的资源
109117
if (pluginDescriptor.getDescription() != null) {
110-
int id = ResourceUtil.getResourceId(pluginDescriptor.getDescription());
118+
int id = ResourceUtil.parseResId(pluginDescriptor.getDescription());
111119
if (id != 0) {
112120
//再宿主中查一次
113121
try {

0 commit comments

Comments
 (0)