Skip to content

Y
YGOMobile
Commit d69b698e authored by kenan's avatar kenan
Browse files
Options

游戏结束杀死自己进程

parent fe5870f0
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 54 deletions
Classes/gframe/deck_con.cpp
View file @ d69b698e
......@@ -132,7 +132,7 @@ void DeckBuilder::Terminate() {
//os::Printer::log("setLastDeck", linebuf);
mainGame->SaveConfig();
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
}
bool DeckBuilder::OnEvent(const irr::SEvent& event) {
#ifdef _IRR_ANDROID_PLATFORM_
......
Classes/gframe/duelclient.cpp
View file @ d69b698e
......@@ -679,7 +679,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
mainGame->SaveConfig();
event_base_loopbreak(client_base);
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
break;
}
case STOC_REPLAY: {
......@@ -980,7 +980,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->gMutex.unlock();
event_base_loopbreak(client_base);
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
}
return false;
}
......
Classes/gframe/event_handler.cpp
View file @ d69b698e
......@@ -145,7 +145,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
else
mainGame->ShowElement(mainGame->wLanWindow);
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
} else {
mainGame->PopupElement(mainGame->wSurrender);
}
......
Classes/gframe/game.cpp
View file @ d69b698e
......@@ -39,15 +39,6 @@ void Game::process(irr::SEvent &event) {
}
#ifdef _IRR_ANDROID_PLATFORM_
void onActivityLifeChanged(struct android_app* app, int32_t status){
//status ==
//ANDROID_ACTIVITY_RESUME 1
//ANDROID_ACTIVITY_STOP 2
// ANDROID_ACTIVITY_PAUSE 5
//ANDROID_ACTIVITY_DESTROY 3
//ANDROID_ACTIVITY_FOCUS 4
}
bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
this->appMain = app;
#endif
......@@ -81,8 +72,6 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
device->setProcessReceiver(this);
app->onInputEvent = android::handleInput;
((CIrrDeviceAndroid*)device)->onActivityLifeChanged = onActivityLifeChanged;
ILogger* logger = device->getLogger();
// logger->setLogLevel(ELL_WARNING);
isPSEnabled = options->isPendulumScaleEnabled();
......@@ -2028,4 +2017,8 @@ void Game::ChangeToIGUIImageButton(irr::gui::IGUIButton* button, irr::video::ITe
button->setOverrideFont(font);
}
void Game::OnGameClose() {
android::onGameExit(appMain);
this->device->closeDevice();
}
}
\ No newline at end of file
Classes/gframe/game.h
View file @ d69b698e
......@@ -167,11 +167,12 @@ public:
void AddDebugMsg(const char* msgbuf);
void ErrorLog(const char* msgbuf);
void addMessageBox(const wchar_t* caption, const wchar_t* text);
void initUtils();
void initUtils(){}
void ClearTextures();
void CloseGameButtons();
void CloseGameWindow();
void CloseDuelWindow();
void OnGameClose();
void ChangeToIGUIImageWindow(irr::gui::IGUIWindow* window, irr::gui::IGUIImage* bgwindow, irr::video::ITexture* image);
void ChangeToIGUIImageButton(irr::gui::IGUIButton* button, irr::video::ITexture* image, irr::video::ITexture* pressedImage, irr::gui::CGUITTFont* font=0);
......
Classes/gframe/gframe.cpp
View file @ d69b698e
......@@ -65,6 +65,7 @@ int main(int argc, char* argv[]) {
bool keep_on_return = false;
bool open_file = false;
#ifdef _IRR_ANDROID_PLATFORM_
__android_log_print(ANDROID_LOG_WARN, "ygo", "handle args %d", argc);
//android
for(int i = 0; i < argc; ++i) {
const char* arg = argv[i].c_str();
......@@ -77,7 +78,6 @@ int main(int argc, char* argv[]) {
wchar_t fname[1024];
char* tmp = sub_string(arg, 2);
BufferIO::DecodeUTF8(tmp, fname);
__android_log_print(ANDROID_LOG_DEBUG, "ygo", "load cdb=%s", tmp);
ygo::dataManager.LoadDB(fname);
delete tmp;
} else if(!strcmp(arg, "-k")) { // Keep on return
......
Classes/gframe/menu_handler.cpp
View file @ d69b698e
......@@ -63,7 +63,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
case BUTTON_MODE_EXIT: {
mainGame->soundManager->StopBGM();
mainGame->SaveConfig();
mainGame->device->closeDevice();
mainGame->OnGameClose();
break;
}
case BUTTON_LAN_MODE: {
......@@ -121,7 +121,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->HideElement(mainGame->wLanWindow);
mainGame->ShowElement(mainGame->wMainMenu);
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
break;
}
case BUTTON_LAN_REFRESH: {
......@@ -214,7 +214,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->wChat->setVisible(false);
mainGame->SaveConfig();
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
break;
}
case BUTTON_REPLAY_MODE: {
......
Classes/gframe/replay_mode.cpp
View file @ d69b698e
......@@ -249,7 +249,7 @@ void ReplayMode::EndDuel() {
mainGame->device->setEventReceiver(&mainGame->menuHandler);
mainGame->gMutex.unlock();
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
}
}
void ReplayMode::Restart(bool refresh) {
......
Classes/gframe/single_mode.cpp
View file @ d69b698e
......@@ -154,7 +154,7 @@ int SingleMode::SinglePlayThread() {
mainGame->gMutex.unlock();
mainGame->SaveConfig();
if(exit_on_return)
mainGame->device->closeDevice();
mainGame->OnGameClose();
}
return 0;
}
......
irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp
View file @ d69b698e
......@@ -279,36 +279,21 @@ void CIrrDeviceAndroid::handleAndroidCommand(ANDROID_APP app, int32_t cmd)
case APP_CMD_LOST_FOCUS:
os::Printer::log("Android command APP_CMD_LOST_FOCUS", ELL_DEBUG);
device->Focused = false;
if(device->onActivityLifeChanged != nullptr){
device->onActivityLifeChanged(app, ANDROID_ACTIVITY_FOCUS);
}
break;
case APP_CMD_DESTROY:
os::Printer::log("Android command APP_CMD_DESTROY", ELL_DEBUG);
device->Initialized = false;
if(device->onActivityLifeChanged != nullptr){
device->onActivityLifeChanged(app, ANDROID_ACTIVITY_DESTROY);
}
break;
case APP_CMD_PAUSE:
os::Printer::log("Android command APP_CMD_PAUSE", ELL_DEBUG);
device->Paused = true;
if(device->onActivityLifeChanged != nullptr){
device->onActivityLifeChanged(app, ANDROID_ACTIVITY_PAUSE);
}
break;
case APP_CMD_STOP:
os::Printer::log("Android command APP_CMD_STOP", ELL_DEBUG);
if(device->onActivityLifeChanged != nullptr){
device->onActivityLifeChanged(app, ANDROID_ACTIVITY_STOP);
}
break;
case APP_CMD_RESUME:
os::Printer::log("Android command APP_CMD_RESUME", ELL_DEBUG);
device->Paused = false;
if(device->onActivityLifeChanged != nullptr){
device->onActivityLifeChanged(app, ANDROID_ACTIVITY_RESUME);
}
break;
case APP_CMD_WINDOW_RESIZED:
os::Printer::log("Android command APP_CMD_WINDOW_RESIZED", ELL_DEBUG);
......
irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.h
View file @ d69b698e
......@@ -17,12 +17,6 @@
#include <android/sensor.h>
#include <android_native_app_glue.h>
#define ANDROID_ACTIVITY_RESUME 1
#define ANDROID_ACTIVITY_STOP 2
#define ANDROID_ACTIVITY_PAUSE 5
#define ANDROID_ACTIVITY_DESTROY 3
#define ANDROID_ACTIVITY_FOCUS 4
namespace irr
{
class CIrrDeviceAndroid : public CIrrDeviceStub, video::IImagePresenter
......@@ -58,8 +52,6 @@ namespace irr
virtual void restoreWindow();
void (*onActivityLifeChanged)(struct android_app* app, int32_t status);
virtual core::position2di getWindowPosition();
virtual E_DEVICE_TYPE getType() const;
......
libcore/android/android_tools.cpp
View file @ d69b698e
......@@ -887,6 +887,20 @@ void process_input(ANDROID_APP app,
}
}
void onGameExit(ANDROID_APP app){
if (!app || !app->activity || !app->activity->vm)
return;
JNIEnv* jni = nullptr;
app->activity->vm->AttachCurrentThread(&jni, NULL);
jobject lNativeActivity = app->activity->clazz;
jclass ClassNativeActivity = jni->GetObjectClass(lNativeActivity);
jmethodID methodId = jni->GetMethodID(ClassNativeActivity,
"onGameExit", "()V");
jni->CallVoidMethod(lNativeActivity, methodId);
jni->DeleteLocalRef(ClassNativeActivity);
app->activity->vm->DetachCurrentThread();
}
s32 handleInput(ANDROID_APP app, AInputEvent* androidEvent) {
IrrlichtDevice* device = (IrrlichtDevice*) app->userData;
s32 Status = 0;
......
libcore/android/android_tools.h
View file @ d69b698e
......@@ -193,6 +193,8 @@ extern s32 handleInput(ANDROID_APP app, AInputEvent* androidEvent);
extern bool android_deck_delete(const char* deck_name);
extern void onGameExit(ANDROID_APP app);
extern void runWindbot(ANDROID_APP app, const char* args);
}
......
libcore/src/main/AndroidManifest.xml
View file @ d69b698e
......@@ -26,7 +26,7 @@
android:value="YGOMobile"/>
</activity>
<receiver android:name="cn.garymb.ygomobile.GameReceiver"
android:process=":game" >
android:process=":gamehelper" >
<intent-filter>
<action android:name="cn.garymb.ygomobile.game.start"/>
<action android:name="cn.garymb.ygomobile.game.stop"/>
......
libcore/src/main/java/cn/garymb/ygomobile/YGOMobileActivity.java
View file @ d69b698e
......@@ -17,6 +17,7 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.PowerManager;
import android.os.Process;
import android.util.Log;
import android.view.Gravity;
import android.view.HapticFeedbackConstants;
......@@ -544,4 +545,10 @@ public class YGOMobileActivity extends NativeActivity implements
}
});
}
@Override
public void onGameExit() {
Log.e("ygomobile", "game exit");
Process.killProcess(Process.myPid());
}
}
libcore/src/main/java/cn/garymb/ygomobile/core/IrrlichtBridge.java
View file @ d69b698e
......@@ -213,5 +213,7 @@ public final class IrrlichtBridge {
int getPositionX();
int getPositionY();
void onGameExit();
}
}
mobile/build.gradle
View file @ d69b698e
......@@ -13,7 +13,7 @@ android {
flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true
ndk {
abiFilters "arm64-v8a", "armeabi-v7a", "x86"
abiFilters "armeabi-v7a"//"arm64-v8a", "armeabi-v7a", "x86"
}
}
compileOptions {
......@@ -34,6 +34,9 @@ android {
}
}
buildTypes {
debug {
debuggable false
}
release {
shrinkResources false
minifyEnabled false
......
mobile/src/main/java/cn/garymb/ygomobile/GameUriManager.java
View file @ d69b698e
......@@ -37,6 +37,7 @@ public class GameUriManager {
}
public boolean doIntent(Intent intent) {
Log.i("ygo", "doIntent");
if (ACTION_OPEN_DECK.equals(intent.getAction())) {
if (intent.getData() != null) {
doUri(intent.getData());
......@@ -119,6 +120,7 @@ public class GameUriManager {
private void doUri(Uri uri) {
Intent startSeting = new Intent(activity, SettingsActivity.class);
Log.i("ygo", "doUri:"+uri);
if ("file".equals(uri.getScheme())) {
File file = new File(uri.getPath());
if (file.getName().toLowerCase(Locale.US).endsWith(".ydk")) {
......@@ -162,9 +164,11 @@ public class GameUriManager {
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 (!YGOStarter.isGameRunning(getActivity())) {
YGOStarter.startGame(getActivity(), null, "-r", yrp.getName());
Toast.makeText(activity, ""+yrp.getName(), Toast.LENGTH_LONG).show();
} else {
Log.w("ygo", "game is running");
}
}
} else if ("content".equals(uri.getScheme())) {
......@@ -242,9 +246,11 @@ public class GameUriManager {
} catch (Throwable e) {
e.printStackTrace();
}
if (!ComponentUtils.isActivityRunning(activity, new ComponentName(activity, YGOMobileActivity.class))) {
YGOStarter.startGame(getActivity(), null, "-r ", yrp.getName());
if (!YGOStarter.isGameRunning(getActivity())) {
YGOStarter.startGame(getActivity(), null, "-r", yrp.getName());
Toast.makeText(activity, activity.getString(R.string.yrp_installed), Toast.LENGTH_LONG).show();
} else {
Log.w("ygo", "game is running");
}
}
} else {
......
mobile/src/main/java/cn/garymb/ygomobile/YGOStarter.java
View file @ d69b698e
......@@ -3,6 +3,8 @@ package cn.garymb.ygomobile;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.graphics.Bitmap;
......@@ -19,6 +21,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.target.ViewTarget;
import com.bumptech.glide.signature.StringSignature;
import com.tencent.bugly.proguard.C;
import java.io.File;
import java.util.HashMap;
......@@ -27,6 +30,7 @@ import cn.garymb.ygodata.YGOGameOptions;
import cn.garymb.ygomobile.core.IrrlichtBridge;
import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.plus.ViewTargetPlus;
import cn.garymb.ygomobile.utils.ComponentUtils;
public class YGOStarter {
......@@ -207,4 +211,9 @@ public class YGOStarter {
int oldRequestedOrientation;
boolean isRunning = false;
}
public static boolean isGameRunning(Context context) {
return ComponentUtils.isProcessRunning(context, context.getPackageName() + ":game")
&& ComponentUtils.isActivityRunning(context, new ComponentName(context, YGOMobileActivity.class));
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @ d69b698e
......@@ -435,7 +435,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
builder.setLeftButtonText(R.string.join_game);
builder.setLeftButtonListener((dlg, i) -> {
dlg.dismiss();
if (Build.VERSION.SDK_INT >= 23 && ComponentUtils.isActivityRunning(this, new ComponentName(this, YGOMobileActivity.class))) {
if (Build.VERSION.SDK_INT >= 23 && YGOStarter.isGameRunning(getActivity())) {
Toast toast = Toast.makeText(getApplicationContext(), R.string.tip_return_to_duel, Toast.LENGTH_SHORT);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
......@@ -558,7 +558,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
tv.setOnClickListener((v) -> {
openGame();
});
if (ComponentUtils.isActivityRunning(this, new ComponentName(this, YGOMobileActivity.class))) {
if (YGOStarter.isGameRunning(getActivity())) {
tv.setVisibility(View.VISIBLE);
} else {
tv.setVisibility(View.GONE);
......@@ -664,7 +664,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
}
public void showTipsToast() {
if (!ComponentUtils.isActivityRunning(this, new ComponentName(this, YGOMobileActivity.class))) {
if (!YGOStarter.isGameRunning(getActivity())) {
String[] tipsList = this.getResources().getStringArray(R.array.tips);
int x = (int) (Math.random() * tipsList.length);
String tips = tipsList[x];
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java
View file @ d69b698e
......@@ -196,7 +196,7 @@ public class MainActivity extends HomeActivity {
super.onResume();
YGOStarter.onResumed(this);
//如果游戏Activity已经不存在了，则
if (!ComponentUtils.isActivityRunning(this, new ComponentName(this, YGOMobileActivity.class))) {
if (!YGOStarter.isGameRunning(getActivity())) {
sendBroadcast(new Intent(IrrlichtBridge.ACTION_STOP).setPackage(getPackageName()));
}
}
......
mobile/src/main/java/cn/garymb/ygomobile/utils/ComponentUtils.java
View file @ d69b698e
......@@ -4,12 +4,25 @@ import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.Context;
import android.os.Build;
import android.text.TextUtils;
import androidx.annotation.RequiresApi;
import java.util.List;
public class ComponentUtils {
public static boolean isProcessRunning(Context context, String processName) {
ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
List<ActivityManager.RunningAppProcessInfo> tasks = am.getRunningAppProcesses();
if (tasks != null) {
for (ActivityManager.RunningAppProcessInfo taskInfo : tasks) {
if (context.getApplicationInfo().uid == taskInfo.uid && TextUtils.equals(processName, taskInfo.processName)) {
return true;
}
}
}
return false;
}
public static boolean isActivityRunning(Context context, ComponentName componentName) {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
return isActivityRunningV21(context, componentName);
......
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