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-04 12:21:09 +08:00
parent b5b4fbd3f5
commit 2f019ae176
15 changed files with 445 additions and 612 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 08:54:19 HKT 2025
#Tue Feb 04 04:18:10 GMT 2025
stageCount=1
libraryProject=libapputils
baseVersion=9.3
publishVersion=9.3.0
buildCount=0
buildCount=21
baseBetaVersion=9.3.1

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

@@ -17,7 +17,7 @@ public class App extends WinBollGlobalApplication {
@Override
public void onCreate() {
super.onCreate();
Toast.makeText(getApplication(), "Toast Test", Toast.LENGTH_SHORT).show();
//Toast.makeText(getApplication(), "Toast Test", Toast.LENGTH_SHORT).show();
}
}

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

@@ -6,35 +6,66 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
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.WinBollActivity;
import cc.winboll.studio.libapputils.app.IWinBoll;
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
import cc.winboll.studio.libapputils.bean.APPInfo;
import cc.winboll.studio.libapputils.log.LogActivity;
import cc.winboll.studio.libapputils.log.LogUtils;
import com.hjq.toast.ToastUtils;
import cc.winboll.studio.libapputils.activities.AboutActivity;
import cc.winboll.studio.libapputils.bean.APPInfo;
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 WinBollActivity {
public static final String TAG = "MainActivity";
IWinBollActivity mIWinBollActivity;
public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
@Override
protected boolean isEnableDisplayHomeAsUp() {
public AppCompatActivity getCurrentAppCompatActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
}
@Override
public boolean isAddWinBollToolBar() {
ToastUtils.show(String.format("%s isAddWinBollToolBar()", TAG));
return true;
}
@Override
public Toolbar initToolBar() {
return findViewById(R.id.activitymainToolbar1);
}
@Override
public boolean isEnableDisplayHomeAsUp() {
return false;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
//ToastUtils.show("onCreate");
mIWinBollActivity = WinBollFactory.buildWinBollActivity(this);
mIWinBollActivity.onCreate(savedInstanceState);
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
//Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
//setActionBar(toolbar);
//ToastUtils.show("setContentView");
Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
setSupportActionBar(toolbar);
// 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
//if (prosessIntents(getIntent())) return;
@@ -130,24 +161,12 @@ final public class MainActivity extends WinBollActivity {
return true;
}
@Override
public String getTag() {
return TAG;
}
@Override
protected boolean isAddWinBollToolBar() {
return true;
}
@Override
protected Toolbar initToolBar() {
return findViewById(R.id.activitymainToolbar1);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
//ToastUtils.show("onCreateOptionsMenu");
getMenuInflater().inflate(R.menu.toolbar_main, menu);
mIWinBollActivity.inflateWinBollMenu(menu);
return super.onCreateOptionsMenu(menu);
}
@@ -163,6 +182,8 @@ final public class MainActivity extends WinBollActivity {
} else if(item.getItemId() == R.id.item_about) {
openAboutActivity();
return true;
} else if(mIWinBollActivity.onOptionsItemSelected(item)) {
return true;
}
return super.onOptionsItemSelected(item);
}

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

@@ -1,19 +1,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.WinBollActivity;
import cc.winboll.studio.libapputils.app.IWinBoll;
import cc.winboll.studio.libapputils.view.StringToQrCodeView;
/**
* @Author ZhanGSKen@QQ.COM
* @Date 2025/01/17 19:50:46
*/
public class TestStringToQrCodeViewActivity extends WinBollActivity {
public class TestStringToQrCodeViewActivity extends AppCompatActivity implements IWinBoll {
public static final String TAG = "TestStringToQrCodeViewActivity";
StringToQrCodeView mStringToQrCodeView;
@Override
public AppCompatActivity getCurrentAppCompatActivity() {
return this;
}
@Override
public String getTag() {
@@ -21,17 +28,17 @@ public class TestStringToQrCodeViewActivity extends WinBollActivity {
}
@Override
protected Toolbar initToolBar() {
public Toolbar initToolBar() {
return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
}
@Override
protected boolean isEnableDisplayHomeAsUp() {
public boolean isEnableDisplayHomeAsUp() {
return true;
}
@Override
protected boolean isAddWinBollToolBar() {
public boolean isAddWinBollToolBar() {
return true;
}
@@ -45,6 +52,6 @@ public class TestStringToQrCodeViewActivity extends WinBollActivity {
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
setSubTitle(TAG);
//setSubTitle(TAG);
}
}

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

@@ -1,38 +1,40 @@
package cc.winboll.studio.apputils;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
import cc.winboll.studio.libapputils.app.WinBollActivity;
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
import cc.winboll.studio.libapputils.app.IWinBoll;
/**
* @Author ZhanGSKen@QQ.COM
* @Date 2025/01/13 15:09:46
*/
public class TestWinBollActivity extends WinBollActivity {
public class TestWinBollActivity extends AppCompatActivity implements IWinBoll {
public static final String TAG = "TestWinBollActivity";
@Override
public AppCompatActivity getCurrentAppCompatActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
}
@Override
protected Toolbar initToolBar() {
public Toolbar initToolBar() {
return findViewById(R.id.activitytestwinbollToolbar1);
}
@Override
protected boolean isEnableDisplayHomeAsUp() {
public boolean isEnableDisplayHomeAsUp() {
return true;
}
@Override
protected boolean isAddWinBollToolBar() {
public boolean isAddWinBollToolBar() {
return true;
}
@@ -45,7 +47,7 @@ public class TestWinBollActivity extends WinBollActivity {
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
setSubTitle(TAG);
//setSubTitle(TAG);
}