Studio/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WinBollActivity 类型重构

Browse Source
This commit is contained in:
ZhanGSKen
2025-02-05 10:37:54 +08:00
parent 2f019ae176
commit dd041e5d78
16 changed files with 452 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apputils/build.properties
View File

@@ -1,8 +1,8 @@
#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
libraryProject=libapputils
baseVersion=9.3
publishVersion=9.3.0
buildCount=21
buildCount=58
baseBetaVersion=9.3.1

1
apputils/src/main/java/cc/winboll/studio/apputils/App.java
View File

@@ -19,5 +19,4 @@ public class App extends WinBollGlobalApplication {
super.onCreate();
//Toast.makeText(getApplication(), "Toast Test", Toast.LENGTH_SHORT).show();
}
}

81
apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
View File

@@ -8,29 +8,28 @@ import android.view.View;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.apputils.R;
import cc.winboll.studio.libapputils.activities.AboutActivity;
import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
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.WinBollFactory;
import cc.winboll.studio.libapputils.bean.APPInfo;
import cc.winboll.studio.libapputils.log.LogActivity;
import cc.winboll.studio.libapputils.log.LogUtils;
import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
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";
IWinBollActivity mIWinBollActivity;
public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
@Override
public AppCompatActivity getCurrentAppCompatActivity() {
public AppCompatActivity getActivity() {
return this;
}
@@ -41,7 +40,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
@Override
public boolean isAddWinBollToolBar() {
ToastUtils.show(String.format("%s isAddWinBollToolBar()", TAG));
return true;
}
@@ -49,7 +47,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
public Toolbar initToolBar() {
return findViewById(R.id.activitymainToolbar1);
}
@Override
public boolean isEnableDisplayHomeAsUp() {
return false;
@@ -57,13 +55,9 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
@Override
protected void onCreate(Bundle savedInstanceState) {
//ToastUtils.show("onCreate");
mIWinBollActivity = WinBollFactory.buildWinBollActivity(this);
mIWinBollActivity.onCreate(savedInstanceState);
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
//ToastUtils.show("setContentView");
Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
setSupportActionBar(toolbar);
@@ -93,31 +87,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
}
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
// setSubTitle("");
protected String getAppName() {
return getString(R.string.app_name);
}
@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 数据
//
@@ -161,12 +134,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
return true;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
//ToastUtils.show("onCreateOptionsMenu");
getMenuInflater().inflate(R.menu.toolbar_main, menu);
mIWinBollActivity.inflateWinBollMenu(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) {
Intent intent = new Intent(this, QRCodeDecodeActivity.class);
startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
} else if(item.getItemId() == R.id.item_about) {
} else if (item.getItemId() == R.id.item_about) {
openAboutActivity();
return true;
} else if(mIWinBollActivity.onOptionsItemSelected(item)) {
return true;
}
return super.onOptionsItemSelected(item);
}
void openAboutActivity() {
Intent intent = new Intent(this, AboutActivity.class);
APPInfo appInfo = new APPInfo();
@@ -204,8 +173,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
intent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo);
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AboutActivity.class);
}
public void onTestAboutActivity(View view) {
//ToastUtils.show("onTestAboutActivity");
openAboutActivity();
@@ -216,19 +185,21 @@ final public class MainActivity extends AppCompatActivity implements IWinBoll {
intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
/*@Override
protected void onActivithyResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case REQUEST_QRCODEDECODE_ACTIVITY : {
String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
ToastUtils.show(text);
if (data != null) {
String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
ToastUtils.show(text);
}
break;
}
default : {
ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
super.onActivityResult(requestCode, resultCode, data);
//ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
super.prosessActivityResult(requestCode, resultCode, data);
}
}
}
}*/
}

19
apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java
View File

@@ -3,25 +3,26 @@ 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;
import cc.winboll.studio.libapputils.app.BaseWinBollActivity;
import cc.winboll.studio.libapputils.app.IWinBollActivity;
import cc.winboll.studio.libapputils.view.StringToQrCodeView;
/**
* @Author ZhanGSKen@QQ.COM
* @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";
StringToQrCodeView mStringToQrCodeView;
@Override
public AppCompatActivity getCurrentAppCompatActivity() {
public AppCompatActivity getActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
@@ -48,10 +49,4 @@ public class TestStringToQrCodeViewActivity extends AppCompatActivity implements
setContentView(R.layout.activity_teststringtoqrcodeview);
mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
}
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
//setSubTitle(TAG);
}
}

25
apputils/src/main/java/cc/winboll/studio/apputils/TestWinBollActivity.java
View File

@@ -1,23 +1,24 @@
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
* @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";
@Override
public AppCompatActivity getCurrentAppCompatActivity() {
public AppCompatActivity getActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
@@ -43,12 +44,4 @@ public class TestWinBollActivity extends AppCompatActivity implements IWinBoll {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_testwinboll);
}
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
//setSubTitle(TAG);
}
}