正在调整工具栏与应用介绍窗口。。。
This commit is contained in:
@@ -90,12 +90,12 @@ dependencies {
|
|||||||
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||||
|
|
||||||
// WinBoLL库 nexus.winboll.cc 地址
|
// WinBoLL库 nexus.winboll.cc 地址
|
||||||
api 'cc.winboll.studio:libaes:15.12.13'
|
api 'cc.winboll.studio:libaes:15.15.2'
|
||||||
api 'cc.winboll.studio:libappbase:15.14.2'
|
api 'cc.winboll.studio:libappbase:15.15.4'
|
||||||
|
|
||||||
// WinBoLL备用库 jitpack.io 地址
|
// WinBoLL备用库 jitpack.io 地址
|
||||||
//api 'com.github.ZhanGSKen:AES:aes-v15.12.9'
|
//api 'com.github.ZhanGSKen:AES:aes-v15.15.2'
|
||||||
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.14.1'
|
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
|
||||||
|
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue Jan 13 03:11:40 HKT 2026
|
#Tue Jan 13 04:16:26 GMT 2026
|
||||||
stageCount=10
|
stageCount=10
|
||||||
libraryProject=
|
libraryProject=
|
||||||
baseVersion=15.11
|
baseVersion=15.11
|
||||||
publishVersion=15.11.9
|
publishVersion=15.11.9
|
||||||
buildCount=0
|
buildCount=4
|
||||||
baseBetaVersion=15.11.10
|
baseBetaVersion=15.11.10
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ import android.view.Menu;
|
|||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import cc.winboll.studio.libaes.activitys.AboutActivity;
|
|
||||||
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
|
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
|
||||||
import cc.winboll.studio.libaes.models.APPInfo;
|
import cc.winboll.studio.libaes.models.APPInfo;
|
||||||
import cc.winboll.studio.libaes.models.DrawerMenuBean;
|
import cc.winboll.studio.libaes.models.DrawerMenuBean;
|
||||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||||
import cc.winboll.studio.libappbase.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import cc.winboll.studio.winboll.R;
|
import cc.winboll.studio.winboll.R;
|
||||||
|
import cc.winboll.studio.winboll.activities.AboutActivity;
|
||||||
import cc.winboll.studio.winboll.activities.SettingsActivity;
|
import cc.winboll.studio.winboll.activities.SettingsActivity;
|
||||||
import cc.winboll.studio.winboll.activities.WXPayActivity;
|
import cc.winboll.studio.winboll.activities.WXPayActivity;
|
||||||
import cc.winboll.studio.winboll.fragments.BrowserFragment;
|
import cc.winboll.studio.winboll.fragments.BrowserFragment;
|
||||||
@@ -46,6 +46,8 @@ public class MainActivity extends DrawerFragmentActivity {
|
|||||||
showFragment(mBrowserFragment);
|
showFragment(mBrowserFragment);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void sendMessage(Message msg) {
|
public static void sendMessage(Message msg) {
|
||||||
_mMainHandler.sendMessage(msg);
|
_mMainHandler.sendMessage(msg);
|
||||||
}
|
}
|
||||||
@@ -149,12 +151,9 @@ public class MainActivity extends DrawerFragmentActivity {
|
|||||||
}
|
}
|
||||||
} else if (nItemId == R.id.item_settings) {
|
} else if (nItemId == R.id.item_settings) {
|
||||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
|
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
|
||||||
} else if (nItemId == R.id.item_wxpayactivity) {
|
} else if (nItemId == R.id.item_about) {
|
||||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), WXPayActivity.class);
|
|
||||||
} else if (nItemId == cc.winboll.studio.libaes.R.id.item_about) {
|
|
||||||
Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
|
Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
|
||||||
APPInfo appInfo = genDefaultAPPInfo();
|
APPInfo appInfo = genDefaultAPPInfo();
|
||||||
intent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo);
|
|
||||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
||||||
} else {
|
} else {
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package cc.winboll.studio.winboll.activities;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
|
import cc.winboll.studio.libappbase.models.APPInfo;
|
||||||
|
import cc.winboll.studio.libappbase.views.AboutView;
|
||||||
|
import cc.winboll.studio.winboll.R;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||||
|
* @Date 2026/01/13 11:54
|
||||||
|
* @Describe 应用介绍窗口
|
||||||
|
*/
|
||||||
|
public class AboutActivity extends WinBoLLActivity {
|
||||||
|
|
||||||
|
public static final String TAG = "AboutActivity";
|
||||||
|
private Toolbar mToolbar;
|
||||||
|
@Override
|
||||||
|
public Activity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_about);
|
||||||
|
|
||||||
|
// 设置工具栏
|
||||||
|
initToolbar();
|
||||||
|
|
||||||
|
AboutView aboutView = findViewById(R.id.aboutview);
|
||||||
|
aboutView.setAPPInfo(genDefaultAppInfo());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initToolbar() {
|
||||||
|
LogUtils.d(TAG, "initToolbar() 开始初始化");
|
||||||
|
mToolbar = findViewById(R.id.toolbar);
|
||||||
|
if (mToolbar == null) {
|
||||||
|
LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setSupportActionBar(mToolbar);
|
||||||
|
mToolbar.setSubtitle(getTag());
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
LogUtils.d(TAG, "导航栏 点击返回按钮");
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
LogUtils.d(TAG, "initToolbar() 配置完成");
|
||||||
|
}
|
||||||
|
|
||||||
|
private APPInfo genDefaultAppInfo() {
|
||||||
|
LogUtils.d(TAG, "genDefaultAppInfo() 调用");
|
||||||
|
String branchName = "winboll";
|
||||||
|
APPInfo appInfo = new APPInfo();
|
||||||
|
appInfo.setAppName(getString(R.string.app_name));
|
||||||
|
appInfo.setAppIcon(R.drawable.ic_winboll);
|
||||||
|
appInfo.setAppDescription(getString(R.string.app_description));
|
||||||
|
appInfo.setAppGitName("WinBoLL");
|
||||||
|
appInfo.setAppGitOwner("Studio");
|
||||||
|
appInfo.setAppGitAPPBranch(branchName);
|
||||||
|
appInfo.setAppGitAPPSubProjectFolder(branchName);
|
||||||
|
appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=WinBoLL");
|
||||||
|
appInfo.setAppAPKName("WinBoLL");
|
||||||
|
appInfo.setAppAPKFolderName("WinBoLL");
|
||||||
|
LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成");
|
||||||
|
return appInfo;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,12 +9,20 @@ import android.app.Activity;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import cc.winboll.studio.libappbase.LogUtils;
|
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||||
|
|
||||||
public class WinBoLLActivity extends AppCompatActivity {
|
public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
|
||||||
|
|
||||||
public static final String TAG = "WinBoLLActivity";
|
public static final String TAG = "WinBoLLActivity";
|
||||||
|
@Override
|
||||||
|
public Activity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void onResume() {
|
protected void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
|
|||||||
23
winboll/src/main/res/layout/activity_about.xml
Normal file
23
winboll/src/main/res/layout/activity_about.xml
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<cc.winboll.studio.winboll.CustomToolbar
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:toolbarTitle="@string/app_name"
|
||||||
|
app:toolbarTitleColor="@color/colorAccent"
|
||||||
|
app:toolbarBackgroundColor="@color/colorPrimary"
|
||||||
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.views.AboutView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1.0"
|
||||||
|
android:id="@+id/aboutview"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -8,6 +8,6 @@
|
|||||||
android:id="@+id/item_settings"
|
android:id="@+id/item_settings"
|
||||||
android:title="Settings"/>
|
android:title="Settings"/>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/item_wxpayactivity"
|
android:id="@+id/item_about"
|
||||||
android:title="WXPayActivity"/>
|
android:title="About"/>
|
||||||
</menu>
|
</menu>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">WinBoLL</string>
|
<string name="app_name">WinBoLL</string>
|
||||||
|
<string name="app_description">WinBoLL 网站浏览器。</string>
|
||||||
<string name="app_name_cn1">筋斗云</string>
|
<string name="app_name_cn1">筋斗云</string>
|
||||||
<string name="app_name_cn2">金抖云</string>
|
<string name="app_name_cn2">金抖云</string>
|
||||||
<string name="switchto_en1">WinBoLL</string>
|
<string name="switchto_en1">WinBoLL</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user