Commit 4523dd9d authored by fallenstardust's avatar fallenstardust

启动参数

同步startGame传参数量
parent f33d84c9
...@@ -30,6 +30,7 @@ import static cn.garymb.ygomobile.Constants.QUERY_NAME; ...@@ -30,6 +30,7 @@ import static cn.garymb.ygomobile.Constants.QUERY_NAME;
public class GameUriManager { public class GameUriManager {
private Activity activity; private Activity activity;
private String fname;
public GameUriManager(Activity activity) { public GameUriManager(Activity activity) {
this.activity = activity; this.activity = activity;
...@@ -56,7 +57,7 @@ public class GameUriManager { ...@@ -56,7 +57,7 @@ public class GameUriManager {
options.mUserName = intent.getStringExtra(Constants.QUERY_USER); options.mUserName = intent.getStringExtra(Constants.QUERY_USER);
options.mPort = intent.getIntExtra(Constants.QUERY_PORT, 0); options.mPort = intent.getIntExtra(Constants.QUERY_PORT, 0);
options.mRoomName = intent.getStringExtra(Constants.QUERY_ROOM); options.mRoomName = intent.getStringExtra(Constants.QUERY_ROOM);
YGOStarter.startGame(getActivity(), options); YGOStarter.startGame(getActivity(), options, null);
} catch (Exception e) { } catch (Exception e) {
Toast.makeText(getActivity(), R.string.start_game_error, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), R.string.start_game_error, Toast.LENGTH_SHORT).show();
activity.finish(); activity.finish();
...@@ -153,7 +154,7 @@ public class GameUriManager { ...@@ -153,7 +154,7 @@ public class GameUriManager {
} else if (file.getName().toLowerCase(Locale.US).endsWith(".yrp")) { } else if (file.getName().toLowerCase(Locale.US).endsWith(".yrp")) {
File yrp = new File(AppsSettings.get().getResourcePath() + "/" + CORE_REPLAY_PATH + "/" + file.getName().toLowerCase(Locale.US)); File yrp = new File(AppsSettings.get().getResourcePath() + "/" + CORE_REPLAY_PATH + "/" + file.getName().toLowerCase(Locale.US));
if (yrp.exists()) { if (yrp.exists()) {
YGOStarter.startGame(getActivity(), null); YGOStarter.startGame(getActivity(), null, "-r" + yrp.getName());
Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_LONG).show(); Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_LONG).show();
} else { } else {
try { try {
...@@ -162,8 +163,8 @@ public class GameUriManager { ...@@ -162,8 +163,8 @@ public class GameUriManager {
Toast.makeText(activity, activity.getString(R.string.install_failed_bcos) + e, Toast.LENGTH_LONG).show(); Toast.makeText(activity, activity.getString(R.string.install_failed_bcos) + e, Toast.LENGTH_LONG).show();
} }
if (!ComponentUtils.isActivityRunning(getActivity(), new ComponentName(getActivity(), YGOMobileActivity.class))) { if (!ComponentUtils.isActivityRunning(getActivity(), new ComponentName(getActivity(), YGOMobileActivity.class))) {
YGOStarter.startGame(getActivity(), null); YGOStarter.startGame(getActivity(), null, "-r" + yrp.getName());
Toast.makeText(activity, activity.getString(R.string.yrp_installed), Toast.LENGTH_LONG).show(); Toast.makeText(activity, ""+yrp.getName(), Toast.LENGTH_LONG).show();
} }
} }
} }
...@@ -225,7 +226,7 @@ public class GameUriManager { ...@@ -225,7 +226,7 @@ public class GameUriManager {
File yrp = new File(AppsSettings.get().getResourcePath() + "/" + CORE_REPLAY_PATH + "/" + urifile.getName().toLowerCase(Locale.US)); File yrp = new File(AppsSettings.get().getResourcePath() + "/" + CORE_REPLAY_PATH + "/" + urifile.getName().toLowerCase(Locale.US));
ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(uri, "r"); ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(uri, "r");
if (yrp.exists()) { if (yrp.exists()) {
YGOStarter.startGame(getActivity(), null); YGOStarter.startGame(getActivity(), null, "-r " + urifile.getName());
Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_SHORT).show(); Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_SHORT).show();
} else { } else {
if (pfd == null) { if (pfd == null) {
...@@ -244,7 +245,7 @@ public class GameUriManager { ...@@ -244,7 +245,7 @@ public class GameUriManager {
e.printStackTrace(); e.printStackTrace();
} }
if (!ComponentUtils.isActivityRunning(activity, new ComponentName(activity, YGOMobileActivity.class))) { if (!ComponentUtils.isActivityRunning(activity, new ComponentName(activity, YGOMobileActivity.class))) {
YGOStarter.startGame(activity, null); YGOStarter.startGame(activity, null,"-r " + urifile.getName());
Toast.makeText(activity, activity.getString(R.string.yrp_installed), Toast.LENGTH_LONG).show(); Toast.makeText(activity, activity.getString(R.string.yrp_installed), Toast.LENGTH_LONG).show();
} }
} }
...@@ -273,7 +274,7 @@ public class GameUriManager { ...@@ -273,7 +274,7 @@ public class GameUriManager {
// options.mUserName = uri.getQueryParameter(Constants.QUERY_USER); // options.mUserName = uri.getQueryParameter(Constants.QUERY_USER);
// options.mPort = Integer.parseInt(uri.getQueryParameter(Constants.QUERY_PORT)); // options.mPort = Integer.parseInt(uri.getQueryParameter(Constants.QUERY_PORT));
// options.mRoomName = uri.getQueryParameter(Constants.QUERY_ROOM); // options.mRoomName = uri.getQueryParameter(Constants.QUERY_ROOM);
// YGOStarter.startGame(getActivity(), options); // YGOStarter.startGame(getActivity(), options, null);
// } catch (Exception e) { // } catch (Exception e) {
// Toast.makeText(getActivity(), R.string.start_game_error, Toast.LENGTH_SHORT).show(); // Toast.makeText(getActivity(), R.string.start_game_error, Toast.LENGTH_SHORT).show();
// activity.finish(); // activity.finish();
......
...@@ -23,7 +23,7 @@ public class LogoActivity extends Activity { ...@@ -23,7 +23,7 @@ public class LogoActivity extends Activity {
hideBottomUIMenu(); hideBottomUIMenu();
setContentView(R.layout.activity_logo); setContentView(R.layout.activity_logo);
if (AppsSettings.get().isOnlyGame()) { if (AppsSettings.get().isOnlyGame()) {
YGOStarter.startGame(this, null); YGOStarter.startGame(this, null, null);
finish(); finish();
return; return;
} else { } else {
......
...@@ -473,7 +473,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -473,7 +473,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
options.mUserName = serverInfo.getPlayerName(); options.mUserName = serverInfo.getPlayerName();
options.mPort = serverInfo.getPort(); options.mPort = serverInfo.getPort();
options.mRoomName = name; options.mRoomName = name;
YGOStarter.startGame(this, options); YGOStarter.startGame(this, options, null);
} }
protected abstract void checkResourceDownload(ResCheckTask.ResCheckListener listener); protected abstract void checkResourceDownload(ResCheckTask.ResCheckListener listener);
......
...@@ -246,7 +246,7 @@ public class MainActivity extends HomeActivity { ...@@ -246,7 +246,7 @@ public class MainActivity extends HomeActivity {
@Override @Override
protected void openGame() { protected void openGame() {
if (enableStart) { if (enableStart) {
YGOStarter.startGame(this, null); YGOStarter.startGame(this, null, null);
} else { } else {
VUiKit.show(this, R.string.dont_start_game); VUiKit.show(this, R.string.dont_start_game);
} }
......
...@@ -257,7 +257,7 @@ public class MyCard { ...@@ -257,7 +257,7 @@ public class MyCard {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
YGOStarter.startGame(activity, options); YGOStarter.startGame(activity, options, null);
} }
}); });
} catch (Exception e) { } catch (Exception e) {
......
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