Skip to content

Commit 47c26cb

Browse files
committed
修改oppo和vivo手机品牌判断方式,忽略大小写
Signed-off-by: Cai Liming <405977146@163.com>
1 parent 7d93d87 commit 47c26cb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

PluginCore/src/com/plugin/core/PluginCreator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static Resources createPluginResource(Application application, String abs
5151
assetPaths[0] = application.getApplicationInfo().sourceDir;
5252
assetPaths[1] = absolutePluginApkPath;
5353

54-
if ("vivo".equals(Build.BRAND) || "oppo".equals(Build.BRAND)) {
54+
if ("vivo".equalsIgnoreCase(Build.BRAND) || "oppo".equalsIgnoreCase(Build.BRAND)) {
5555
//但是!!!如是OPPO或者vivo4.x系统的话 ,要吧这个顺序反过来,否则在混合模式下会找不到资源
5656
assetPaths[0] = absolutePluginApkPath;
5757
assetPaths[1] = application.getApplicationInfo().sourceDir;

PluginMain/src/com/example/pluginmain/PluginDetailActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void initViews(PluginDescriptor pluginDescriptor) {
7474

7575
@Override
7676
public void onClick(View v) {
77-
if (Build.BRAND.equals("vivo") || Build.BRAND.equals("oppo")) {
77+
if ("vivo".equalsIgnoreCase(Build.BRAND) || "oppo".equalsIgnoreCase(Build.BRAND)) {
7878
//要想步步高手机也支持fragment模式,插件需要使用独立模式,即不通过R直接或者间接使用注宿主程序的资源
7979
//如果步步高手机也需要使用非独立插件,则要舍弃宿主主题
8080
Toast.makeText(PluginDetailActivity.this, "步步高手机暂时只支持Activity模式!", Toast.LENGTH_LONG).show();
@@ -119,7 +119,7 @@ public void onClick(View v) {
119119
public void onClick(View v) {
120120
//Activity两种模式
121121
//oppo 和 vivo 手机单独处理
122-
if (Build.BRAND.equals("vivo") || Build.BRAND.equals("oppo")) {
122+
if ("vivo".equalsIgnoreCase(Build.BRAND) || "oppo".equalsIgnoreCase(Build.BRAND)) {
123123
//要想步步高手机也支持fragment模式,插件需要使用独立模式,即不通过R直接或者间接使用注宿主程序的资源
124124
//如果步步高手机也需要使用非独立插件,则要舍弃宿主主题
125125

0 commit comments

Comments
 (0)