WinBollActivity 类型重构
This commit is contained in:
parent
2f019ae176
commit
dd041e5d78
@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue Feb 04 04:18:10 GMT 2025
|
#Wed Feb 05 02:35:15 GMT 2025
|
||||||
stageCount=1
|
stageCount=1
|
||||||
libraryProject=libapputils
|
libraryProject=libapputils
|
||||||
baseVersion=9.3
|
baseVersion=9.3
|
||||||
publishVersion=9.3.0
|
publishVersion=9.3.0
|
||||||
buildCount=21
|
buildCount=58
|
||||||
baseBetaVersion=9.3.1
|
baseBetaVersion=9.3.1
|
||||||
|
@ -19,5 +19,4 @@ public class App extends WinBollGlobalApplication {
|
|||||||
super.onCreate();
|
super.onCreate();
|
||||||
//Toast.makeText(getApplication(), "Toast Test", Toast.LENGTH_SHORT).show();
|
//Toast.makeText(getApplication(), "Toast Test", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -8,29 +8,28 @@ import android.view.View;
|
|||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.apputils.R;
|
||||||
import cc.winboll.studio.libapputils.activities.AboutActivity;
|
import cc.winboll.studio.libapputils.activities.AboutActivity;
|
||||||
import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
|
import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
|
||||||
import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
|
import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
|
||||||
import cc.winboll.studio.libapputils.app.IWinBoll;
|
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
||||||
|
import cc.winboll.studio.libapputils.app.WinBollFactory;
|
||||||
import cc.winboll.studio.libapputils.bean.APPInfo;
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
import cc.winboll.studio.libapputils.log.LogActivity;
|
import cc.winboll.studio.libapputils.log.LogActivity;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libapputils.log.LogUtils;
|
||||||
|
import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollFactory;
|
|
||||||
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
|
||||||
|
|
||||||
final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|
||||||
|
|
||||||
|
final public class MainActivity extends BaseWinBollActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "MainActivity";
|
public static final String TAG = "MainActivity";
|
||||||
|
|
||||||
IWinBollActivity mIWinBollActivity;
|
|
||||||
|
|
||||||
public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
|
public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppCompatActivity getCurrentAppCompatActivity() {
|
public AppCompatActivity getActivity() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,7 +40,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isAddWinBollToolBar() {
|
public boolean isAddWinBollToolBar() {
|
||||||
ToastUtils.show(String.format("%s isAddWinBollToolBar()", TAG));
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -49,7 +47,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
public Toolbar initToolBar() {
|
public Toolbar initToolBar() {
|
||||||
return findViewById(R.id.activitymainToolbar1);
|
return findViewById(R.id.activitymainToolbar1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isEnableDisplayHomeAsUp() {
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
return false;
|
return false;
|
||||||
@ -57,13 +55,9 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
//ToastUtils.show("onCreate");
|
|
||||||
mIWinBollActivity = WinBollFactory.buildWinBollActivity(this);
|
|
||||||
mIWinBollActivity.onCreate(savedInstanceState);
|
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
//ToastUtils.show("setContentView");
|
|
||||||
|
|
||||||
Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
|
Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
|
||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
|
|
||||||
@ -93,31 +87,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
protected String getAppName() {
|
||||||
super.onPostCreate(savedInstanceState);
|
return getString(R.string.app_name);
|
||||||
// setSubTitle("");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
// exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// void exit() {
|
|
||||||
// YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onYes() {
|
|
||||||
// WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onNo() {
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
|
|
||||||
// }
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// 处理传入的 Intent 数据
|
// 处理传入的 Intent 数据
|
||||||
//
|
//
|
||||||
@ -161,12 +134,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
//ToastUtils.show("onCreateOptionsMenu");
|
//ToastUtils.show("onCreateOptionsMenu");
|
||||||
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
||||||
mIWinBollActivity.inflateWinBollMenu(menu);
|
|
||||||
return super.onCreateOptionsMenu(menu);
|
return super.onCreateOptionsMenu(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -179,15 +150,13 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
} else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
|
} else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
|
||||||
Intent intent = new Intent(this, QRCodeDecodeActivity.class);
|
Intent intent = new Intent(this, QRCodeDecodeActivity.class);
|
||||||
startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
|
startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
|
||||||
} else if(item.getItemId() == R.id.item_about) {
|
} else if (item.getItemId() == R.id.item_about) {
|
||||||
openAboutActivity();
|
openAboutActivity();
|
||||||
return true;
|
return true;
|
||||||
} else if(mIWinBollActivity.onOptionsItemSelected(item)) {
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
void openAboutActivity() {
|
void openAboutActivity() {
|
||||||
Intent intent = new Intent(this, AboutActivity.class);
|
Intent intent = new Intent(this, AboutActivity.class);
|
||||||
APPInfo appInfo = new APPInfo();
|
APPInfo appInfo = new APPInfo();
|
||||||
@ -204,8 +173,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
intent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo);
|
intent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo);
|
||||||
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AboutActivity.class);
|
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AboutActivity.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void onTestAboutActivity(View view) {
|
public void onTestAboutActivity(View view) {
|
||||||
//ToastUtils.show("onTestAboutActivity");
|
//ToastUtils.show("onTestAboutActivity");
|
||||||
openAboutActivity();
|
openAboutActivity();
|
||||||
@ -216,19 +185,21 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
|
intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
|
||||||
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
|
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
/*@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivithyResult(int requestCode, int resultCode, Intent data) {
|
||||||
switch (requestCode) {
|
switch (requestCode) {
|
||||||
case REQUEST_QRCODEDECODE_ACTIVITY : {
|
case REQUEST_QRCODEDECODE_ACTIVITY : {
|
||||||
String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
|
if (data != null) {
|
||||||
ToastUtils.show(text);
|
String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
|
||||||
|
ToastUtils.show(text);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default : {
|
default : {
|
||||||
ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
|
//ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.prosessActivityResult(requestCode, resultCode, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
@ -3,25 +3,26 @@ package cc.winboll.studio.apputils;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import cc.winboll.studio.libapputils.app.IWinBoll;
|
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.view.StringToQrCodeView;
|
import cc.winboll.studio.libapputils.view.StringToQrCodeView;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen@QQ.COM
|
* @Author ZhanGSKen@QQ.COM
|
||||||
* @Date 2025/01/17 19:50:46
|
* @Date 2025/01/17 19:50:46
|
||||||
*/
|
*/
|
||||||
public class TestStringToQrCodeViewActivity extends AppCompatActivity implements IWinBoll {
|
public class TestStringToQrCodeViewActivity extends BaseWinBollActivity implements IWinBollActivity {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static final String TAG = "TestStringToQrCodeViewActivity";
|
public static final String TAG = "TestStringToQrCodeViewActivity";
|
||||||
|
|
||||||
StringToQrCodeView mStringToQrCodeView;
|
StringToQrCodeView mStringToQrCodeView;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppCompatActivity getCurrentAppCompatActivity() {
|
public AppCompatActivity getActivity() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
@ -48,10 +49,4 @@ public class TestStringToQrCodeViewActivity extends AppCompatActivity implements
|
|||||||
setContentView(R.layout.activity_teststringtoqrcodeview);
|
setContentView(R.layout.activity_teststringtoqrcodeview);
|
||||||
mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
|
mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
//setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,23 +1,24 @@
|
|||||||
package cc.winboll.studio.apputils;
|
package cc.winboll.studio.apputils;
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import cc.winboll.studio.libapputils.app.IWinBoll;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen@QQ.COM
|
* @Author ZhanGSKen@QQ.COM
|
||||||
* @Date 2025/01/13 15:09:46
|
* @Date 2025/01/13 15:09:46
|
||||||
*/
|
*/
|
||||||
public class TestWinBollActivity extends AppCompatActivity implements IWinBoll {
|
import android.os.Bundle;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
|
|
||||||
|
public class TestWinBollActivity extends BaseWinBollActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "TestWinBollActivity";
|
public static final String TAG = "TestWinBollActivity";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppCompatActivity getCurrentAppCompatActivity() {
|
public AppCompatActivity getActivity() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
@ -43,12 +44,4 @@ public class TestWinBollActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_testwinboll);
|
setContentView(R.layout.activity_testwinboll);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
//setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue Feb 04 04:18:10 GMT 2025
|
#Wed Feb 05 02:35:15 GMT 2025
|
||||||
stageCount=1
|
stageCount=1
|
||||||
libraryProject=libapputils
|
libraryProject=libapputils
|
||||||
baseVersion=9.3
|
baseVersion=9.3
|
||||||
publishVersion=9.3.0
|
publishVersion=9.3.0
|
||||||
buildCount=21
|
buildCount=58
|
||||||
baseBetaVersion=9.3.1
|
baseBetaVersion=9.3.1
|
||||||
|
@ -13,25 +13,27 @@ import android.widget.LinearLayout;
|
|||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
import cc.winboll.studio.libapputils.app.IWinBoll;
|
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
||||||
import cc.winboll.studio.libapputils.bean.APPInfo;
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
import cc.winboll.studio.libapputils.view.AboutView;
|
import cc.winboll.studio.libapputils.view.AboutView;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
|
|
||||||
final public class AboutActivity extends AppCompatActivity implements IWinBoll {
|
final public class AboutActivity extends BaseWinBollActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "AboutActivity";
|
public static final String TAG = "AboutActivity";
|
||||||
|
|
||||||
public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
|
public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
|
||||||
|
|
||||||
|
|
||||||
APPInfo mAPPInfo;
|
APPInfo mAPPInfo;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppCompatActivity getCurrentAppCompatActivity() {
|
public AppCompatActivity getActivity() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
@ -51,7 +53,7 @@ final public class AboutActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
public Toolbar initToolBar() {
|
public Toolbar initToolBar() {
|
||||||
return findViewById(R.id.activityaboutToolbar1);
|
return findViewById(R.id.activityaboutToolbar1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
@ -63,28 +65,20 @@ final public class AboutActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
if (mAPPInfo == null) {
|
if (mAPPInfo == null) {
|
||||||
mAPPInfo = new APPInfo();
|
mAPPInfo = new APPInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
AboutView aboutView = new AboutView(this, mAPPInfo);
|
AboutView aboutView = new AboutView(this, mAPPInfo);
|
||||||
LinearLayout llMain = findViewById(R.id.activityaboutLinearLayout1);
|
LinearLayout llMain = findViewById(R.id.activityaboutLinearLayout1);
|
||||||
llMain.addView(aboutView);
|
llMain.addView(aboutView);
|
||||||
|
|
||||||
ToastUtils.show(TAG);
|
ToastUtils.show(TAG);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
//setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
getMenuInflater().inflate(R.menu.toolbar_winboll_shared_about, menu);
|
getMenuInflater().inflate(R.menu.toolbar_winboll_shared_about, menu);
|
||||||
return super.onCreateOptionsMenu(menu);
|
return super.onCreateOptionsMenu(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
if (item.getItemId() == R.id.item_help) {
|
if (item.getItemId() == R.id.item_help) {
|
||||||
@ -92,6 +86,4 @@ final public class AboutActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -11,24 +11,22 @@ import android.net.Uri;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
|
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libapputils.log.LogUtils;
|
||||||
import cc.winboll.studio.libapputils.view.SimpleWebView;
|
import cc.winboll.studio.libapputils.view.SimpleWebView;
|
||||||
import com.hjq.toast.ToastUtils;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import android.os.PersistableBundle;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import cc.winboll.studio.libapputils.app.IWinBoll;
|
|
||||||
|
|
||||||
public class AssetsHtmlActivity extends AppCompatActivity implements IWinBoll {
|
public class AssetsHtmlActivity extends BaseWinBollActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "AssetsHtmlActivity";
|
public static final String TAG = "AssetsHtmlActivity";
|
||||||
|
|
||||||
public static final String EXTRA_HTMLFILENAME = "EXTRA_HTMLFILENAME";
|
public static final String EXTRA_HTMLFILENAME = "EXTRA_HTMLFILENAME";
|
||||||
|
|
||||||
String mszHelpIndexFilePath = "";
|
String mszHelpIndexFilePath = "";
|
||||||
Uri mszHelpIndexFileUri;
|
Uri mszHelpIndexFileUri;
|
||||||
Context mContext;
|
Context mContext;
|
||||||
@ -37,10 +35,10 @@ public class AssetsHtmlActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
String mszHtmlFileName;
|
String mszHtmlFileName;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppCompatActivity getCurrentAppCompatActivity() {
|
public AppCompatActivity getActivity() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
@ -114,13 +112,6 @@ public class AssetsHtmlActivity extends AppCompatActivity implements IWinBoll {
|
|||||||
// myWebView.loadUrl(mszHelpIndexFileUri.toString());
|
// myWebView.loadUrl(mszHelpIndexFileUri.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
|
|
||||||
super.onPostCreate(savedInstanceState, persistentState);
|
|
||||||
//setSubTitle(mszHtmlFileName);
|
|
||||||
//setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
void initWebViewFromAssets(String szHtmlFileName) {
|
void initWebViewFromAssets(String szHtmlFileName) {
|
||||||
try {
|
try {
|
||||||
|
@ -14,28 +14,29 @@ import androidx.appcompat.widget.Toolbar;
|
|||||||
import androidx.core.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
import cc.winboll.studio.libapputils.app.IWinBoll;
|
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import com.google.zxing.ResultPoint;
|
import com.google.zxing.ResultPoint;
|
||||||
import com.journeyapps.barcodescanner.BarcodeCallback;
|
import com.journeyapps.barcodescanner.BarcodeCallback;
|
||||||
import com.journeyapps.barcodescanner.BarcodeResult;
|
import com.journeyapps.barcodescanner.BarcodeResult;
|
||||||
import com.journeyapps.barcodescanner.DecoratedBarcodeView;
|
import com.journeyapps.barcodescanner.DecoratedBarcodeView;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class QRCodeDecodeActivity extends AppCompatActivity implements IWinBoll {
|
public class QRCodeDecodeActivity extends BaseWinBollActivity implements IWinBollActivity {
|
||||||
|
|
||||||
|
|
||||||
public static final String TAG = "QRCodeDecodeActivity";
|
public static final String TAG = "QRCodeDecodeActivity";
|
||||||
public static final String EXTRA_RESULT = "EXTRA_RESULT";
|
|
||||||
|
|
||||||
|
public static final String EXTRA_RESULT = "EXTRA_RESULT";
|
||||||
private static final int REQUEST_CAMERA_PERMISSION = 1;
|
private static final int REQUEST_CAMERA_PERMISSION = 1;
|
||||||
|
|
||||||
TextView resultTextView;
|
TextView resultTextView;
|
||||||
DecoratedBarcodeView barcodeView;
|
DecoratedBarcodeView barcodeView;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppCompatActivity getCurrentAppCompatActivity() {
|
public AppCompatActivity getActivity() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
@ -73,7 +74,7 @@ public class QRCodeDecodeActivity extends AppCompatActivity implements IWinBoll
|
|||||||
startScanning();
|
startScanning();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void startScanning() {
|
private void startScanning() {
|
||||||
|
@ -0,0 +1,321 @@
|
|||||||
|
package cc.winboll.studio.libapputils.app;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author ZhanGSKen@QQ.COM
|
||||||
|
* @Date 2024/08/12 14:32:08
|
||||||
|
* @Describe WinBoll 活动窗口基础类
|
||||||
|
*/
|
||||||
|
import android.content.ComponentName;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.content.pm.ResolveInfo;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.libapputils.R;
|
||||||
|
import cc.winboll.studio.libapputils.activities.AboutActivity;
|
||||||
|
import cc.winboll.studio.libapputils.log.LogActivity;
|
||||||
|
import cc.winboll.studio.libapputils.log.LogUtils;
|
||||||
|
import cc.winboll.studio.libapputils.view.AboutView;
|
||||||
|
import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
|
||||||
|
import com.hjq.toast.ToastUtils;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
public class BaseWinBollActivity extends AppCompatActivity implements IWinBollActivity {
|
||||||
|
|
||||||
|
public static final String TAG = "BaseWinBollActivity";
|
||||||
|
|
||||||
|
public static final int REQUEST_LOG_ACTIVITY = 0;
|
||||||
|
|
||||||
|
//IWinBollActivity mIWinBollActivity;
|
||||||
|
AppCompatActivity mCurrentAppCompatActivity;
|
||||||
|
|
||||||
|
Toolbar mToolBar;
|
||||||
|
@Override
|
||||||
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
initCurrentAppCompatActivity();
|
||||||
|
checkResolveActivity();
|
||||||
|
LogUtils.d(TAG, "onCreate");
|
||||||
|
//super.onCreate(savedInstanceState);
|
||||||
|
archiveInstance();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).registeRemove(this);
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPostResume() {
|
||||||
|
super.onPostResume();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onSaveInstanceState(Bundle outState) {
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onStart() {
|
||||||
|
super.onStart();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onTitleChanged(CharSequence title, int color) {
|
||||||
|
super.onTitleChanged(title, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AppCompatActivity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Toolbar initToolBar() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAddWinBollToolBar() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void initCurrentAppCompatActivity() {
|
||||||
|
mCurrentAppCompatActivity = getActivity();
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean checkResolveActivity() {
|
||||||
|
PackageManager packageManager = mCurrentAppCompatActivity.getPackageManager();
|
||||||
|
//Intent intent = new Intent("your_action_here");
|
||||||
|
Intent intent = mCurrentAppCompatActivity.getIntent();
|
||||||
|
if (intent != null) {
|
||||||
|
List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
|
||||||
|
if (resolveInfoList.size() > 0) {
|
||||||
|
// 传入的Intent action在Activity清单的intent-filter的action节点里有定义
|
||||||
|
if (intent.getAction() != null) {
|
||||||
|
if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
|
||||||
|
WinBollGlobalApplication.setIsDebug(true);
|
||||||
|
//ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
// 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
|
||||||
|
//ToastUtils.show("false : " + intent.getAction());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// action在清单文件中没有声明
|
||||||
|
ToastUtils.show("false");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void archiveInstance() {
|
||||||
|
Intent intent = mCurrentAppCompatActivity.getIntent();
|
||||||
|
StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
|
||||||
|
|
||||||
|
if (intent != null) {
|
||||||
|
ComponentName componentName = intent.getComponent();
|
||||||
|
if (componentName != null) {
|
||||||
|
String packageName = componentName.getPackageName();
|
||||||
|
//Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
|
||||||
|
sb.append("启动本应用的应用包名: \n" + packageName);
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("\nImplicit Intent Tracker :\n接收到的 Intent 动作: \n" + intent.getAction());
|
||||||
|
Set<String> categories = intent.getCategories();
|
||||||
|
if (categories != null) {
|
||||||
|
for (String category : categories) {
|
||||||
|
sb.append("\n接收到的 Intent 类别 :\n" + category);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Uri data = intent.getData();
|
||||||
|
if (data != null) {
|
||||||
|
sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sb.append("Intent is null.");
|
||||||
|
}
|
||||||
|
sb.append("\n\n");
|
||||||
|
LogUtils.d(TAG, sb.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPostCreate(Bundle savedInstanceState) {
|
||||||
|
super.onPostCreate(savedInstanceState);
|
||||||
|
|
||||||
|
// 缓存当前 activity
|
||||||
|
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).add(this);
|
||||||
|
|
||||||
|
// 初始化工具栏
|
||||||
|
mToolBar = initToolBar();
|
||||||
|
if (mToolBar != null) {
|
||||||
|
mCurrentAppCompatActivity.setSupportActionBar(mToolBar);
|
||||||
|
if (isEnableDisplayHomeAsUp()) {
|
||||||
|
// 显示后退按钮
|
||||||
|
mCurrentAppCompatActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
}
|
||||||
|
mCurrentAppCompatActivity.getSupportActionBar().setSubtitle(getTag());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
if (isAddWinBollToolBar()) {
|
||||||
|
//ToastUtils.show("mIWinBoll.isAddWinBollToolBar()");
|
||||||
|
mCurrentAppCompatActivity.getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
|
||||||
|
}
|
||||||
|
if (WinBollGlobalApplication.isDebug()) {
|
||||||
|
mCurrentAppCompatActivity.getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
|
||||||
|
}
|
||||||
|
return super.onCreateOptionsMenu(menu);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
|
||||||
|
LogUtils.d(TAG, "onOptionsItemSelected");
|
||||||
|
//ToastUtils.show(String.format("%s onOptionsItemSelected", TAG));
|
||||||
|
if (item.getItemId() == R.id.item_testcrashreport) {
|
||||||
|
for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
|
||||||
|
mCurrentAppCompatActivity.getString(i);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.item_log) {
|
||||||
|
// LogUtils.d(TAG, "item_log not yet.");
|
||||||
|
// Intent intent = new Intent(this, LogActivity.class);
|
||||||
|
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
|
||||||
|
// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
|
||||||
|
// startActivity(intent);
|
||||||
|
|
||||||
|
//WinBollActivityManager.getInstance().printAvtivityListInfo();
|
||||||
|
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).startWinBollActivity(mCurrentAppCompatActivity, LogActivity.class);
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.item_exit) {
|
||||||
|
exit();
|
||||||
|
//ToastUtils.show("item_exit");
|
||||||
|
//WinBollActivityManager.getInstance(mCurrentAppCompatActivity).finishAll();
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.item_info) {
|
||||||
|
LogUtils.d(TAG, "item_info not yet.");
|
||||||
|
return true;
|
||||||
|
//WinBollApplication application = (WinBollApplication) getApplication();
|
||||||
|
//application.getMyActivityLifecycleCallbacks().showActivityeInfo();
|
||||||
|
} else if (item.getItemId() == R.id.item_exitdebug) {
|
||||||
|
AboutView.setApp2NormalMode(mCurrentAppCompatActivity);
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.item_about) {
|
||||||
|
startAboutActivity();
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == android.R.id.home) {
|
||||||
|
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).finish(this);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// else if (item.getItemId() == android.R.id.home) {
|
||||||
|
// 回到主窗口速度缓慢,方法备用。现在用 WinBollActivityManager resumeActivity 和 finish 方法管理。
|
||||||
|
// _mMainWinBollActivity 是 WinBollActivity 的静态属性
|
||||||
|
// onCreate 函数下 _mMainWinBollActivity 为空时就用 _mMainWinBollActivity = this 赋值。
|
||||||
|
//startWinBollActivity(new Intent(_mMainWinBollActivity, _mMainWinBollActivity.getClass()), _mMainWinBollActivity.getTag(), _mMainWinBollActivity);
|
||||||
|
//}
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isAddWinBollInfoMenu() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) {
|
||||||
|
exit();
|
||||||
|
} else {
|
||||||
|
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).finish(this);
|
||||||
|
super.onBackPressed();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected String getAppName() {
|
||||||
|
return getString(R.string.lib_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
void exit() {
|
||||||
|
YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onYes() {
|
||||||
|
WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onNo() {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
YesNoAlertDialog.show(this, "[ " + getAppName() + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// activity: 为 null 时,
|
||||||
|
// intent.putExtra 函数 "tag" 参数为 tag
|
||||||
|
// activity: 不为 null 时,
|
||||||
|
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
||||||
|
//
|
||||||
|
public <T extends AboutActivity> void startAboutActivity() {
|
||||||
|
Intent intent = new Intent(mCurrentAppCompatActivity, AboutActivity.class);
|
||||||
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
|
||||||
|
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
|
||||||
|
intent.putExtra("tag", AboutActivity.TAG);
|
||||||
|
mCurrentAppCompatActivity.startActivity(intent);
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Override
|
||||||
|
// public void startActivity(Intent intent) {
|
||||||
|
// //绑定唯一标识 tag,存在 则根据 taskId 移动到前台
|
||||||
|
// String tag = intent.getStringExtra("tag");
|
||||||
|
// //ToastUtils.show("startActivityForResult tag " + tag);
|
||||||
|
// //WinBollActivityManager.getInstance(this).printAvtivityListInfo();
|
||||||
|
// if (WinBollActivityManager.getInstance(this).isActive(tag)) {
|
||||||
|
// //ToastUtils.show("resumeActivity");
|
||||||
|
// LogUtils.d(TAG, "resumeActivity");
|
||||||
|
// WinBollActivityManager.getInstance(this).resumeActivity(this, tag);
|
||||||
|
// } else {
|
||||||
|
// //ToastUtils.show("super.startActivity(intent);");
|
||||||
|
// super.startActivity(intent);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
protected void prosessActivityResult(int requestCode, int targetFragment, Intent data) {
|
||||||
|
LogUtils.d(TAG, "onActivityResult");
|
||||||
|
switch (requestCode) {
|
||||||
|
case REQUEST_LOG_ACTIVITY : {
|
||||||
|
LogUtils.d(TAG, "REQUEST_LOG_ACTIVITY");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,21 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.app;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2025/02/04 10:20:16
|
|
||||||
* @Describe WinBoll Activity 接口
|
|
||||||
*/
|
|
||||||
public interface IWinBoll {
|
|
||||||
|
|
||||||
public static final String TAG = "IWinBoll";
|
|
||||||
|
|
||||||
// 获取当前具有 IWinBoll 特征的 AppCompatActivity 活动窗口
|
|
||||||
AppCompatActivity getCurrentAppCompatActivity();
|
|
||||||
|
|
||||||
abstract public String getTag();
|
|
||||||
abstract Toolbar initToolBar();
|
|
||||||
abstract boolean isEnableDisplayHomeAsUp();
|
|
||||||
abstract boolean isAddWinBollToolBar();
|
|
||||||
}
|
|
@ -1,228 +1,21 @@
|
|||||||
package cc.winboll.studio.libapputils.app;
|
package cc.winboll.studio.libapputils.app;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen@QQ.COM
|
* @Author ZhanGSKen@QQ.COM
|
||||||
* @Date 2024/08/12 14:32:08
|
* @Date 2025/02/04 10:20:16
|
||||||
* @Describe WinBoll 活动窗口基础类
|
* @Describe WinBoll Activity 接口
|
||||||
*/
|
*/
|
||||||
import android.content.ComponentName;
|
public interface IWinBollActivity {
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.content.pm.ResolveInfo;
|
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import cc.winboll.studio.libapputils.R;
|
|
||||||
import cc.winboll.studio.libapputils.activities.AboutActivity;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogActivity;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
import cc.winboll.studio.libapputils.view.AboutView;
|
|
||||||
import com.hjq.toast.ToastUtils;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
public class IWinBollActivity {
|
public static final String TAG = "IWinBollActivity";
|
||||||
|
|
||||||
public static final String TAG = "WinBollActivity";
|
// 获取当前具有 IWinBoll 特征的 AppCompatActivity 活动窗口
|
||||||
|
AppCompatActivity getActivity();
|
||||||
public static final int REQUEST_LOG_ACTIVITY = 0;
|
|
||||||
|
abstract public String getTag();
|
||||||
IWinBoll mIWinBoll;
|
abstract Toolbar initToolBar();
|
||||||
AppCompatActivity mCurrentAppCompatActivity;
|
abstract boolean isEnableDisplayHomeAsUp();
|
||||||
|
abstract boolean isAddWinBollToolBar();
|
||||||
Toolbar mToolBar;
|
|
||||||
|
|
||||||
public IWinBollActivity(IWinBoll iWinBoll) {
|
|
||||||
mIWinBoll = iWinBoll;
|
|
||||||
mCurrentAppCompatActivity = (AppCompatActivity)iWinBoll;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
checkResolveActivity();
|
|
||||||
LogUtils.d(TAG, "onCreate");
|
|
||||||
//super.onCreate(savedInstanceState);
|
|
||||||
archiveInstance();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean checkResolveActivity() {
|
|
||||||
PackageManager packageManager = mCurrentAppCompatActivity.getPackageManager();
|
|
||||||
//Intent intent = new Intent("your_action_here");
|
|
||||||
Intent intent = mCurrentAppCompatActivity.getIntent();
|
|
||||||
if (intent != null) {
|
|
||||||
List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
|
|
||||||
if (resolveInfoList.size() > 0) {
|
|
||||||
// 传入的Intent action在Activity清单的intent-filter的action节点里有定义
|
|
||||||
if (intent.getAction() != null) {
|
|
||||||
if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
|
|
||||||
WinBollGlobalApplication.setIsDebug(true);
|
|
||||||
//ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
// 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
|
|
||||||
//ToastUtils.show("false : " + intent.getAction());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// action在清单文件中没有声明
|
|
||||||
ToastUtils.show("false");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void archiveInstance() {
|
|
||||||
Intent intent = mCurrentAppCompatActivity.getIntent();
|
|
||||||
StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
|
|
||||||
|
|
||||||
if (intent != null) {
|
|
||||||
ComponentName componentName = intent.getComponent();
|
|
||||||
if (componentName != null) {
|
|
||||||
String packageName = componentName.getPackageName();
|
|
||||||
//Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
|
|
||||||
sb.append("启动本应用的应用包名: \n" + packageName);
|
|
||||||
}
|
|
||||||
|
|
||||||
sb.append("\nImplicit Intent Tracker :\n接收到的 Intent 动作: \n" + intent.getAction());
|
|
||||||
Set<String> categories = intent.getCategories();
|
|
||||||
if (categories != null) {
|
|
||||||
for (String category : categories) {
|
|
||||||
sb.append("\n接收到的 Intent 类别 :\n" + category);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Uri data = intent.getData();
|
|
||||||
if (data != null) {
|
|
||||||
sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
sb.append("Intent is null.");
|
|
||||||
}
|
|
||||||
sb.append("\n\n");
|
|
||||||
LogUtils.d(TAG, sb.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
mToolBar = mIWinBoll.initToolBar();
|
|
||||||
mCurrentAppCompatActivity.setSupportActionBar(mToolBar);
|
|
||||||
if (mIWinBoll.isEnableDisplayHomeAsUp() && mToolBar != null) {
|
|
||||||
// 显示后退按钮
|
|
||||||
mCurrentAppCompatActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 缓存当前 activity
|
|
||||||
LogUtils.d(TAG, "ActManager.getInstance().add(this);");
|
|
||||||
//ToastUtils.show("getTag() " + getTag());
|
|
||||||
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).add(mIWinBoll);
|
|
||||||
|
|
||||||
mCurrentAppCompatActivity.getSupportActionBar().setSubtitle(mIWinBoll.getTag());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onDestroy() {
|
|
||||||
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).registeRemove(mIWinBoll);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void inflateWinBollMenu(Menu menu) {
|
|
||||||
if (mIWinBoll.isAddWinBollToolBar()) {
|
|
||||||
mCurrentAppCompatActivity.getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
|
|
||||||
}
|
|
||||||
if (WinBollGlobalApplication.isDebug()) {
|
|
||||||
mCurrentAppCompatActivity.getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
LogUtils.d(TAG, "onOptionsItemSelected");
|
|
||||||
if (item.getItemId() == R.id.item_testcrashreport) {
|
|
||||||
for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
|
|
||||||
mCurrentAppCompatActivity.getString(i);
|
|
||||||
}
|
|
||||||
} else if (item.getItemId() == R.id.item_log) {
|
|
||||||
// LogUtils.d(TAG, "item_log not yet.");
|
|
||||||
// Intent intent = new Intent(this, LogActivity.class);
|
|
||||||
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
|
|
||||||
// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
|
|
||||||
// startActivity(intent);
|
|
||||||
|
|
||||||
//WinBollActivityManager.getInstance().printAvtivityListInfo();
|
|
||||||
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).startWinBollActivity(mCurrentAppCompatActivity, LogActivity.class);
|
|
||||||
} else if (item.getItemId() == R.id.item_exit) {
|
|
||||||
//ToastUtils.show("item_exit");
|
|
||||||
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).finishAll();
|
|
||||||
} else if (item.getItemId() == R.id.item_info) {
|
|
||||||
LogUtils.d(TAG, "item_info not yet.");
|
|
||||||
//WinBollApplication application = (WinBollApplication) getApplication();
|
|
||||||
//application.getMyActivityLifecycleCallbacks().showActivityeInfo();
|
|
||||||
} else if (item.getItemId() == R.id.item_exitdebug) {
|
|
||||||
AboutView.setApp2NormalMode(mCurrentAppCompatActivity);
|
|
||||||
} else if (item.getItemId() == R.id.item_about) {
|
|
||||||
startAboutActivity();
|
|
||||||
} else if (item.getItemId() == android.R.id.home) {
|
|
||||||
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).finish(mIWinBoll);
|
|
||||||
}
|
|
||||||
// else if (item.getItemId() == android.R.id.home) {
|
|
||||||
// 回到主窗口速度缓慢,方法备用。现在用 WinBollActivityManager resumeActivity 和 finish 方法管理。
|
|
||||||
// _mMainWinBollActivity 是 WinBollActivity 的静态属性
|
|
||||||
// onCreate 函数下 _mMainWinBollActivity 为空时就用 _mMainWinBollActivity = this 赋值。
|
|
||||||
//startWinBollActivity(new Intent(_mMainWinBollActivity, _mMainWinBollActivity.getClass()), _mMainWinBollActivity.getTag(), _mMainWinBollActivity);
|
|
||||||
//}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAddWinBollInfoMenu() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onBackPressed() {
|
|
||||||
//super.onBackPressed();
|
|
||||||
//ToastUtils.show("onBackPressed");
|
|
||||||
WinBollActivityManager.getInstance(mCurrentAppCompatActivity).finish(mIWinBoll);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// activity: 为 null 时,
|
|
||||||
// intent.putExtra 函数 "tag" 参数为 tag
|
|
||||||
// activity: 不为 null 时,
|
|
||||||
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
|
||||||
//
|
|
||||||
public <T extends AboutActivity> void startAboutActivity() {
|
|
||||||
Intent intent = new Intent(mCurrentAppCompatActivity, AboutActivity.class);
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
|
|
||||||
intent.putExtra("tag", AboutActivity.TAG);
|
|
||||||
mCurrentAppCompatActivity.startActivity(intent);
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
// public void startActivity(Intent intent) {
|
|
||||||
// //绑定唯一标识 tag,存在 则根据 taskId 移动到前台
|
|
||||||
// String tag = intent.getStringExtra("tag");
|
|
||||||
// //ToastUtils.show("startActivityForResult tag " + tag);
|
|
||||||
// //WinBollActivityManager.getInstance(this).printAvtivityListInfo();
|
|
||||||
// if (WinBollActivityManager.getInstance(this).isActive(tag)) {
|
|
||||||
// //ToastUtils.show("resumeActivity");
|
|
||||||
// LogUtils.d(TAG, "resumeActivity");
|
|
||||||
// WinBollActivityManager.getInstance(this).resumeActivity(this, tag);
|
|
||||||
// } else {
|
|
||||||
// //ToastUtils.show("super.startActivity(intent);");
|
|
||||||
// super.startActivity(intent);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
public void onActivityResult(int requestCode, int targetFragment, Intent data) {
|
|
||||||
LogUtils.d(TAG, "onActivityResult");
|
|
||||||
switch (requestCode) {
|
|
||||||
case REQUEST_LOG_ACTIVITY : {
|
|
||||||
LogUtils.d(TAG, "REQUEST_LOG_ACTIVITY");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -25,12 +25,13 @@ public class WinBollActivityManager {
|
|||||||
|
|
||||||
Context mContext;
|
Context mContext;
|
||||||
static WinBollActivityManager _mWinBollActivityManager;
|
static WinBollActivityManager _mWinBollActivityManager;
|
||||||
static Map<String, IWinBoll> _mapIWinBollList;
|
static Map<String, IWinBollActivity> _mapIWinBollList;
|
||||||
|
IWinBollActivity firstIWinBollActivity;
|
||||||
|
|
||||||
public WinBollActivityManager(Context context) {
|
public WinBollActivityManager(Context context) {
|
||||||
mContext = context;
|
mContext = context;
|
||||||
LogUtils.d(TAG, "WinBollActivityManager()");
|
LogUtils.d(TAG, "WinBollActivityManager()");
|
||||||
_mapIWinBollList = new HashMap<String, IWinBoll>();
|
_mapIWinBollList = new HashMap<String, IWinBollActivity>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static synchronized WinBollActivityManager getInstance(Context context) {
|
public static synchronized WinBollActivityManager getInstance(Context context) {
|
||||||
@ -45,10 +46,16 @@ public class WinBollActivityManager {
|
|||||||
//
|
//
|
||||||
// 把Activity添加到管理中
|
// 把Activity添加到管理中
|
||||||
//
|
//
|
||||||
public <T extends IWinBoll> void add(T iWinBoll) {
|
public <T extends IWinBollActivity> void add(T iWinBoll) {
|
||||||
if (isActive(iWinBoll.getTag())) {
|
if (isActive(iWinBoll.getTag())) {
|
||||||
LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
|
LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
|
||||||
} else {
|
} else {
|
||||||
|
// 设置起始活动窗口,以便最后退出时提问
|
||||||
|
if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
|
||||||
|
firstIWinBollActivity = iWinBoll;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 添加到活动窗口列表
|
||||||
_mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
|
_mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
|
||||||
LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
|
LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
|
||||||
}
|
}
|
||||||
@ -61,7 +68,7 @@ public class WinBollActivityManager {
|
|||||||
// activity: 不为 null 时,
|
// activity: 不为 null 时,
|
||||||
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
||||||
//
|
//
|
||||||
public <T extends IWinBoll> void startWinBollActivity(Context context, Class<T> clazz) {
|
public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
|
||||||
try {
|
try {
|
||||||
// 如果窗口已存在就重启窗口
|
// 如果窗口已存在就重启窗口
|
||||||
String tag = clazz.newInstance().getTag();
|
String tag = clazz.newInstance().getTag();
|
||||||
@ -82,7 +89,7 @@ public class WinBollActivityManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends IWinBoll> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
|
public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
|
||||||
try {
|
try {
|
||||||
// 如果窗口已存在就重启窗口
|
// 如果窗口已存在就重启窗口
|
||||||
String tag = clazz.newInstance().getTag();
|
String tag = clazz.newInstance().getTag();
|
||||||
@ -103,17 +110,21 @@ public class WinBollActivityManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
|
||||||
|
return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// 判断 tag绑定的 MyActivity是否存在
|
// 判断 tag绑定的 MyActivity是否存在
|
||||||
//
|
//
|
||||||
public boolean isActive(String tag) {
|
public boolean isActive(String tag) {
|
||||||
//printAvtivityListInfo();
|
//printAvtivityListInfo();
|
||||||
IWinBoll iWinBoll = getIWinBoll(tag);
|
IWinBollActivity iWinBoll = getIWinBoll(tag);
|
||||||
if (iWinBoll != null) {
|
if (iWinBoll != null) {
|
||||||
LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
|
LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
|
||||||
//ToastUtils.show("activity != null tag " + tag);
|
//ToastUtils.show("activity != null tag " + tag);
|
||||||
//判断是否为 BaseActivity,如果已经销毁,则移除
|
//判断是否为 BaseActivity,如果已经销毁,则移除
|
||||||
if (iWinBoll.getCurrentAppCompatActivity().isFinishing() || iWinBoll.getCurrentAppCompatActivity().isDestroyed()) {
|
if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
|
||||||
_mapIWinBollList.remove(iWinBoll.getTag());
|
_mapIWinBollList.remove(iWinBoll.getTag());
|
||||||
//_mWinBollActivityList.remove(activity);
|
//_mWinBollActivityList.remove(activity);
|
||||||
LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
|
LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
|
||||||
@ -128,18 +139,18 @@ public class WinBollActivityManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static IWinBoll getIWinBoll(String tag) {
|
static IWinBollActivity getIWinBoll(String tag) {
|
||||||
return _mapIWinBollList.get(tag);
|
return _mapIWinBollList.get(tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
// 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
||||||
//
|
//
|
||||||
public <T extends IWinBoll> void resumeActivity(Context context, String tag) {
|
public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
|
||||||
LogUtils.d(TAG, "resumeActivty");
|
LogUtils.d(TAG, "resumeActivty");
|
||||||
T iWinBoll = (T)getIWinBoll(tag);
|
T iWinBoll = (T)getIWinBoll(tag);
|
||||||
//LogUtils.d(TAG, "activity " + activity.getTag());
|
//LogUtils.d(TAG, "activity " + activity.getTag());
|
||||||
if (iWinBoll != null && !iWinBoll.getCurrentAppCompatActivity().isFinishing() && !iWinBoll.getCurrentAppCompatActivity().isDestroyed()) {
|
if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
|
||||||
resumeActivity(context, iWinBoll);
|
resumeActivity(context, iWinBoll);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -147,8 +158,8 @@ public class WinBollActivityManager {
|
|||||||
//
|
//
|
||||||
// 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
// 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
||||||
//
|
//
|
||||||
public <T extends IWinBoll> void resumeActivity(Context context, T iWinBoll) {
|
public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
|
||||||
ActivityManager am = (ActivityManager) iWinBoll.getCurrentAppCompatActivity().getSystemService(Context.ACTIVITY_SERVICE);
|
ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
|
||||||
//返回启动它的根任务(home 或者 MainActivity)
|
//返回启动它的根任务(home 或者 MainActivity)
|
||||||
Intent intent = new Intent(context, iWinBoll.getClass());
|
Intent intent = new Intent(context, iWinBoll.getClass());
|
||||||
TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
|
TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
|
||||||
@ -157,7 +168,7 @@ public class WinBollActivityManager {
|
|||||||
//moveTaskToFront(YourTaskId, 0);
|
//moveTaskToFront(YourTaskId, 0);
|
||||||
LogUtils.d(TAG, "am.moveTaskToFront");
|
LogUtils.d(TAG, "am.moveTaskToFront");
|
||||||
//ToastUtils.show("resumeActivity am.moveTaskToFront");
|
//ToastUtils.show("resumeActivity am.moveTaskToFront");
|
||||||
am.moveTaskToFront(iWinBoll.getCurrentAppCompatActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
|
am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -168,17 +179,17 @@ public class WinBollActivityManager {
|
|||||||
try {
|
try {
|
||||||
for (String key : _mapIWinBollList.keySet()) {
|
for (String key : _mapIWinBollList.keySet()) {
|
||||||
//System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
|
//System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
|
||||||
IWinBoll iWinBoll = _mapIWinBollList.get(key);
|
IWinBollActivity iWinBoll = _mapIWinBollList.get(key);
|
||||||
//ToastUtils.show("finishAll() activity");
|
//ToastUtils.show("finishAll() activity");
|
||||||
if (iWinBoll != null && !iWinBoll.getCurrentAppCompatActivity().isFinishing() && !iWinBoll.getCurrentAppCompatActivity().isDestroyed()) {
|
if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
|
||||||
//ToastUtils.show("activity != null ...");
|
//ToastUtils.show("activity != null ...");
|
||||||
if (WinBollGlobalApplication.getWinBollUI_TYPE() == WinBollGlobalApplication.WinBollUI_TYPE.Service) {
|
if (WinBollGlobalApplication.getWinBollUI_TYPE() == WinBollGlobalApplication.WinBollUI_TYPE.Service) {
|
||||||
// 结束窗口和最近任务栏, 建议前台服务类应用使用,可以方便用户再次调用 UI 操作。
|
// 结束窗口和最近任务栏, 建议前台服务类应用使用,可以方便用户再次调用 UI 操作。
|
||||||
iWinBoll.getCurrentAppCompatActivity().finishAndRemoveTask();
|
iWinBoll.getActivity().finishAndRemoveTask();
|
||||||
//ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
|
//ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
|
||||||
} else if (WinBollGlobalApplication.getWinBollUI_TYPE() == WinBollGlobalApplication.WinBollUI_TYPE.Aplication) {
|
} else if (WinBollGlobalApplication.getWinBollUI_TYPE() == WinBollGlobalApplication.WinBollUI_TYPE.Aplication) {
|
||||||
// 结束窗口保留最近任务栏,建议前台服务类应用使用,可以保持应用的系统自觉性。
|
// 结束窗口保留最近任务栏,建议前台服务类应用使用,可以保持应用的系统自觉性。
|
||||||
iWinBoll.getCurrentAppCompatActivity().finish();
|
iWinBoll.getActivity().finish();
|
||||||
//ToastUtils.show("finishAll() activity.finish();");
|
//ToastUtils.show("finishAll() activity.finish();");
|
||||||
} else {
|
} else {
|
||||||
LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
|
LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
|
||||||
@ -194,9 +205,9 @@ public class WinBollActivityManager {
|
|||||||
//
|
//
|
||||||
// 结束指定Activity
|
// 结束指定Activity
|
||||||
//
|
//
|
||||||
public <T extends IWinBoll> void finish(T iWinBoll) {
|
public <T extends IWinBollActivity> void finish(T iWinBoll) {
|
||||||
try {
|
try {
|
||||||
if (iWinBoll != null && !iWinBoll.getCurrentAppCompatActivity().isFinishing() && !iWinBoll.getCurrentAppCompatActivity().isDestroyed()) {
|
if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
|
||||||
//根据tag 移除 MyActivity
|
//根据tag 移除 MyActivity
|
||||||
//String tag= activity.getTag();
|
//String tag= activity.getTag();
|
||||||
//_mWinBollActivityList.remove(tag);
|
//_mWinBollActivityList.remove(tag);
|
||||||
@ -211,8 +222,8 @@ public class WinBollActivityManager {
|
|||||||
// ★:0 1 2 3 [4] >> 3
|
// ★:0 1 2 3 [4] >> 3
|
||||||
// ★:[0] >> 直接关闭当前窗口
|
// ★:[0] >> 直接关闭当前窗口
|
||||||
LogUtils.d(TAG, "finish no yet.");
|
LogUtils.d(TAG, "finish no yet.");
|
||||||
IWinBoll preIWinBoll = getPreIWinBoll(iWinBoll);
|
IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
|
||||||
iWinBoll.getCurrentAppCompatActivity().finish();
|
iWinBoll.getActivity().finish();
|
||||||
if (preIWinBoll != null) {
|
if (preIWinBoll != null) {
|
||||||
resumeActivity(mContext, preIWinBoll);
|
resumeActivity(mContext, preIWinBoll);
|
||||||
}
|
}
|
||||||
@ -226,11 +237,11 @@ public class WinBollActivityManager {
|
|||||||
//
|
//
|
||||||
// 获取窗口队列中的前一个窗口
|
// 获取窗口队列中的前一个窗口
|
||||||
//
|
//
|
||||||
IWinBoll getPreIWinBoll(IWinBoll iWinBoll) {
|
IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) {
|
||||||
try {
|
try {
|
||||||
boolean bingo = false;
|
boolean bingo = false;
|
||||||
IWinBoll preIWinBoll = null;
|
IWinBollActivity preIWinBoll = null;
|
||||||
for (Map.Entry<String, IWinBoll> entity : _mapIWinBollList.entrySet()) {
|
for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
|
||||||
if (entity.getKey().equals(iWinBoll.getTag())) {
|
if (entity.getKey().equals(iWinBoll.getTag())) {
|
||||||
bingo = true;
|
bingo = true;
|
||||||
LogUtils.d(TAG, "bingo");
|
LogUtils.d(TAG, "bingo");
|
||||||
@ -252,8 +263,8 @@ public class WinBollActivityManager {
|
|||||||
//
|
//
|
||||||
// 从管理列表中移除管理项
|
// 从管理列表中移除管理项
|
||||||
//
|
//
|
||||||
public <T extends IWinBoll> boolean registeRemove(T activity) {
|
public <T extends IWinBollActivity> boolean registeRemove(T activity) {
|
||||||
IWinBoll iWinBollTest = _mapIWinBollList.get(activity.getTag());
|
IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag());
|
||||||
if (iWinBollTest != null) {
|
if (iWinBollTest != null) {
|
||||||
_mapIWinBollList.remove(activity.getTag());
|
_mapIWinBollList.remove(activity.getTag());
|
||||||
return true;
|
return true;
|
||||||
@ -268,9 +279,9 @@ public class WinBollActivityManager {
|
|||||||
//LogUtils.d(TAG, "printAvtivityListInfo");
|
//LogUtils.d(TAG, "printAvtivityListInfo");
|
||||||
if (!_mapIWinBollList.isEmpty()) {
|
if (!_mapIWinBollList.isEmpty()) {
|
||||||
StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
|
StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
|
||||||
Iterator<Map.Entry<String, IWinBoll>> iterator = _mapIWinBollList.entrySet().iterator();
|
Iterator<Map.Entry<String, IWinBollActivity>> iterator = _mapIWinBollList.entrySet().iterator();
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
Map.Entry<String, IWinBoll> entry = iterator.next();
|
Map.Entry<String, IWinBollActivity> entry = iterator.next();
|
||||||
sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
|
sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
|
||||||
//ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
|
//ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
|
||||||
}
|
}
|
||||||
|
@ -6,11 +6,13 @@ package cc.winboll.studio.libapputils.app;
|
|||||||
* @Date 2025/02/04 10:19:34
|
* @Date 2025/02/04 10:19:34
|
||||||
* @Describe WinBoll 工厂
|
* @Describe WinBoll 工厂
|
||||||
*/
|
*/
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
public class WinBollFactory {
|
public class WinBollFactory {
|
||||||
|
|
||||||
public static final String TAG = "WinBollFactory";
|
public static final String TAG = "WinBollFactory";
|
||||||
|
|
||||||
public static IWinBollActivity buildWinBollActivity(IWinBoll iWinBoll) {
|
public static AppCompatActivity buildAppCompatActivity(IWinBollActivity iWinBoll) {
|
||||||
return new IWinBollActivity(iWinBoll);
|
return iWinBoll.getActivity();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,17 +9,18 @@ import android.os.Bundle;
|
|||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
import cc.winboll.studio.libapputils.app.IWinBoll;
|
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollGlobalApplication;
|
import cc.winboll.studio.libapputils.app.WinBollGlobalApplication;
|
||||||
|
|
||||||
public class LogActivity extends AppCompatActivity implements IWinBoll {
|
public class LogActivity extends BaseWinBollActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "LogActivity";
|
public static final String TAG = "LogActivity";
|
||||||
|
|
||||||
LogView mLogView;
|
LogView mLogView;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppCompatActivity getCurrentAppCompatActivity() {
|
public AppCompatActivity getActivity() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<string name="lib_name">library</string>
|
<string name="lib_name">libapputils</string>
|
||||||
<string name="app_normal">Click here is switch to Normal APP</string>
|
<string name="app_normal">Click here is switch to Normal APP</string>
|
||||||
<string name="app_debug">Click here is switch to APP DEBUG</string>
|
<string name="app_debug">Click here is switch to APP DEBUG</string>
|
||||||
<string name="gitea_home">GITEA HOME</string>
|
<string name="gitea_home">GITEA HOME</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user