Commit 0192fa7d authored by fallenstardust's avatar fallenstardust

revert 分场景

parent fd15d9bd
...@@ -132,9 +132,9 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -132,9 +132,9 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
public void onViewInitFinished(boolean arg0) { public void onViewInitFinished(boolean arg0) {
//x5內核初始化完成的回调,为true表示x5内核加载成功,否则表示x5内核加载失败,会自动切换到系统内核。 //x5內核初始化完成的回调,为true表示x5内核加载成功,否则表示x5内核加载失败,会自动切换到系统内核。
if (arg0) { if (arg0) {
Toast.makeText(getActivity(), "加载X5内核成功", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "加载X5内核成功", Toast.LENGTH_SHORT).show();
} else { } else {
Toast.makeText(getActivity(), "加载系统内核成功", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "加载系统内核成功", Toast.LENGTH_SHORT).show();
} }
} }
...@@ -151,7 +151,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -151,7 +151,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
//萌卡 //萌卡
StartMycard(); StartMycard();
checkNotch(); checkNotch();
showNewbieGuide("homepage"); showNewbieGuide();
} }
@Override @Override
...@@ -396,10 +396,8 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -396,10 +396,8 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
simpleListAdapter.set(AppsSettings.get().getLastRoomList()); simpleListAdapter.set(AppsSettings.get().getLastRoomList());
listView.setAdapter(simpleListAdapter); listView.setAdapter(simpleListAdapter);
listView.setOnItemClickListener((a, v, pos, index) -> { listView.setOnItemClickListener((a, v, pos, index) -> {
// builder.dismiss();
String name = simpleListAdapter.getItemById(index); String name = simpleListAdapter.getItemById(index);
editText.setText(name); editText.setText(name);
// joinGame(serverInfo, name);
}); });
editText.setOnEditorActionListener((v, actionId, event) -> { editText.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_DONE) { if (actionId == EditorInfo.IME_ACTION_DONE) {
...@@ -688,7 +686,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -688,7 +686,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
} }
//https://www.jianshu.com/p/99649af3b191 //https://www.jianshu.com/p/99649af3b191
public void showNewbieGuide(String scene) { public void showNewbieGuide() {
HighlightOptions options = new HighlightOptions.Builder()//绘制一个高亮虚线圈 HighlightOptions options = new HighlightOptions.Builder()//绘制一个高亮虚线圈
.setOnHighlightDrewListener(new OnHighlightDrewListener() { .setOnHighlightDrewListener(new OnHighlightDrewListener() {
@Override @Override
...@@ -713,72 +711,67 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -713,72 +711,67 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
canvas.drawRect(rectF, paint); canvas.drawRect(rectF, paint);
} }
}).build(); }).build();
if (scene == "homepage") { NewbieGuide.with(this)//with方法可以传入Activity或者Fragment,获取引导页的依附者
NewbieGuide.with(this)//with方法可以传入Activity或者Fragment,获取引导页的依附者 .setLabel("homepageGuide")
.setLabel("homepageGuide") .addGuidePage(
.addGuidePage( GuidePage.newInstance().setEverywhereCancelable(true)
GuidePage.newInstance().setEverywhereCancelable(true) .setBackgroundColor(0xbc000000)
.setBackgroundColor(0xbc000000) .addHighLightWithOptions(findViewById(R.id.menu), HighLight.Shape.CIRCLE, options)
.addHighLightWithOptions(findViewById(R.id.menu), HighLight.Shape.CIRCLE, options) .setLayoutRes(R.layout.view_guide_home)
.setLayoutRes(R.layout.view_guide_home) .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
@Override public void onLayoutInflated(View view, Controller controller) {
public void onLayoutInflated(View view, Controller controller) { //可对同一个layout布局使用不同的文字图案和布局更改,不必重复创建许多类似的布局
//可对同一个layout布局使用不同的文字图案和布局更改,不必重复创建许多类似的布局 TextView tv = view.findViewById(R.id.text_about);
TextView tv = view.findViewById(R.id.text_about); tv.setText("功能菜单:\n软件主要功能如教程,单人游戏,卡组编辑,设置等");
tv.setText("功能菜单:\n软件主要功能如教程,单人游戏,卡组编辑,设置等"); }
} })
})
)
) .addGuidePage(
.addGuidePage( GuidePage.newInstance().setEverywhereCancelable(true)
GuidePage.newInstance().setEverywhereCancelable(true) .setBackgroundColor(0xbc000000)
.setBackgroundColor(0xbc000000) .addHighLightWithOptions(findViewById(R.id.mycard), HighLight.Shape.CIRCLE, options)
.addHighLightWithOptions(findViewById(R.id.mycard), HighLight.Shape.CIRCLE, options) .setLayoutRes(R.layout.view_guide_home)
.setLayoutRes(R.layout.view_guide_home) .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
@Override public void onLayoutInflated(View view, Controller controller) {
public void onLayoutInflated(View view, Controller controller) { TextView tv = view.findViewById(R.id.text_about);
TextView tv = view.findViewById(R.id.text_about); tv.setText("萌卡平台:\n提供众多对战服务\n包含排位,观战,聊天与论坛等");
tv.setText("萌卡平台:\n提供众多对战服务\n包含排位,观战,聊天与论坛等"); }
} })
}) )
) .addGuidePage(
.addGuidePage( GuidePage.newInstance().setEverywhereCancelable(true)
GuidePage.newInstance().setEverywhereCancelable(true) .setBackgroundColor(0xbc000000)
.setBackgroundColor(0xbc000000) .addHighLightWithOptions(findViewById(R.id.list_server), HighLight.Shape.ROUND_RECTANGLE, options2)
.addHighLight(findViewById(R.id.list_server), HighLight.Shape.ROUND_RECTANGLE) .setLayoutRes(R.layout.view_guide_home)
.setLayoutRes(R.layout.view_guide_home) .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
@Override public void onLayoutInflated(View view, Controller controller) {
public void onLayoutInflated(View view, Controller controller) { TextView tv = view.findViewById(R.id.text_about);
TextView tv = view.findViewById(R.id.text_about); tv.setText("直连服务器列表:\n点击一个服务器模块即可加入相应的在线游戏");
tv.setText("直连服务器列表:\n点击一个服务器模块即可加入相应的在线游戏"); }
} })
}) )
) .addGuidePage(
.addGuidePage( GuidePage.newInstance().setEverywhereCancelable(true)
GuidePage.newInstance().setEverywhereCancelable(true) .setBackgroundColor(0xbc000000)
.setBackgroundColor(0xbc000000) .setLayoutRes(R.layout.view_guide_home)
.setLayoutRes(R.layout.view_guide_home) .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
@Override public void onLayoutInflated(View view, Controller controller) {
public void onLayoutInflated(View view, Controller controller) { view.findViewById(R.id.abt_rename).setVisibility(View.VISIBLE);
ImageView iv = view.findViewById(R.id.abt_rename); TextView tv = view.findViewById(R.id.text_about);
iv.setVisibility(View.VISIBLE); tv.setText("编辑按钮:\n点击编辑相应的服务器信息\n如改游戏昵称等");
TextView tv = view.findViewById(R.id.text_about); }
tv.setText("编辑按钮:\n点击编辑相应的服务器信息\n如改游戏昵称等"); })
} )
}) .alwaysShow(true)//总是显示,调试时可以打开
) .show();
.alwaysShow(true)//总是显示,调试时可以打开
.show();
} else if (scene == "dlgJoinGame") {
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment