diff --git a/timestamp/build.properties b/timestamp/build.properties index 7384a39..8cfe1fc 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Dec 09 12:47:32 GMT 2025 +#Tue Dec 09 13:15:55 GMT 2025 stageCount=0 libraryProject= baseVersion=15.12 publishVersion=15.12.0 -buildCount=9 +buildCount=19 baseBetaVersion=15.12.1 diff --git a/timestamp/src/main/AndroidManifest.xml b/timestamp/src/main/AndroidManifest.xml index b1705ab..e14b121 100644 --- a/timestamp/src/main/AndroidManifest.xml +++ b/timestamp/src/main/AndroidManifest.xml @@ -62,6 +62,8 @@ + + diff --git a/timestamp/src/main/java/cc/winboll/studio/timestamp/MainActivity.java b/timestamp/src/main/java/cc/winboll/studio/timestamp/MainActivity.java index 03833df..186cf16 100644 --- a/timestamp/src/main/java/cc/winboll/studio/timestamp/MainActivity.java +++ b/timestamp/src/main/java/cc/winboll/studio/timestamp/MainActivity.java @@ -1,7 +1,9 @@ package cc.winboll.studio.timestamp; +import android.content.Intent; import android.os.Bundle; import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.EditText; import android.widget.Switch; @@ -9,10 +11,12 @@ import android.widget.TextView; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libaes.views.ADsBannerView; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.timestamp.MainService; import cc.winboll.studio.timestamp.R; +import cc.winboll.studio.timestamp.activities.SettingsActivity; import cc.winboll.studio.timestamp.utils.AppConfigsUtil; import cc.winboll.studio.timestamp.utils.ClipboardUtil; import cc.winboll.studio.timestamp.utils.TimeStampUtil; @@ -33,6 +37,7 @@ public class MainActivity extends AppCompatActivity { LogView mLogView; Switch mswEnableMainService; + ADsBannerView mADsBannerView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -42,6 +47,8 @@ public class MainActivity extends AppCompatActivity { Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar); setSupportActionBar(toolbar); + mADsBannerView = findViewById(R.id.adsbanner); + metTimeStampFormatString = findViewById(R.id.et_timestampformatstring); mtvTimeStampFormatString = findViewById(R.id.tv_timestampformatstring); metTimeStampCopyFormatString = findViewById(R.id.et_timestampcopyformatstring); @@ -60,14 +67,23 @@ public class MainActivity extends AppCompatActivity { //ToastUtils.show("onCreate"); } - - @Override protected void onResume() { super.onResume(); mLogView.start(); + if (mADsBannerView != null) { + mADsBannerView.resumeADs(MainActivity.this); + } } + @Override + protected void onDestroy() { + super.onDestroy(); + if (mADsBannerView != null) { + mADsBannerView.releaseAdResources(); + } + } + // 1. 反射核心方法：强制显示菜单图标 private void forceShowMenuIcons(Menu menu) { if (menu == null) { @@ -105,6 +121,19 @@ public class MainActivity extends AppCompatActivity { return super.onMenuOpened(featureId, menu); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.item_settings) { + Intent intent = new Intent(this, SettingsActivity.class); + startActivity(intent); + } else { + return super.onOptionsItemSelected(item); + } + return true; + } + + + public void onSetMainServiceStatus(View view) { MainService.setMainServiceStatus(this, mswEnableMainService.isChecked()); } diff --git a/timestamp/src/main/java/cc/winboll/studio/timestamp/activities/SettingsActivity.java b/timestamp/src/main/java/cc/winboll/studio/timestamp/activities/SettingsActivity.java new file mode 100644 index 0000000..aa3661f --- /dev/null +++ b/timestamp/src/main/java/cc/winboll/studio/timestamp/activities/SettingsActivity.java @@ -0,0 +1,38 @@ +package cc.winboll.studio.timestamp.activities; + +import android.os.Bundle; +import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.timestamp.R; + +/** + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/12/09 20:50 + * @Describe SettingActivity + */ +public class SettingsActivity extends AppCompatActivity { + + public static final String TAG = "SettingsActivity"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_settings); + Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + // 显示后退按钮 + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setSubtitle(TAG); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + LogUtils.d(TAG, "【导航栏】点击返回"); + finish(); + } + }); + + } + +} diff --git a/timestamp/src/main/res/layout/activity_main.xml b/timestamp/src/main/res/layout/activity_main.xml index 34a11c1..68632f0 100644 --- a/timestamp/src/main/res/layout/activity_main.xml +++ b/timestamp/src/main/res/layout/activity_main.xml @@ -2,8 +2,8 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> - + android:layout_height="200dp"> + + + + + + diff --git a/timestamp/src/main/res/layout/activity_settings.xml b/timestamp/src/main/res/layout/activity_settings.xml new file mode 100644 index 0000000..40e9f4c --- /dev/null +++ b/timestamp/src/main/res/layout/activity_settings.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + +