Compare commits

...

10 Commits

17 changed files with 41 additions and 55 deletions

6
.gitmodules vendored
View File

@ -1,6 +0,0 @@
[submodule "winboll-x"]
path = winboll-x
url = https://gitea.winboll.cc/Studio/WinBollX.git
[submodule "libjc/jcc/libs"]
path = libjc/jcc/libs
url = https://gitea.winboll.cc/Studio/APP_libjc_jcc_libs.git

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Apr 26 12:27:57 GMT 2025
stageCount=6
#Sun Apr 27 00:07:35 GMT 2025
stageCount=7
libraryProject=libappbase
baseVersion=15.2
publishVersion=15.2.5
buildCount=4
baseBetaVersion=15.2.6
publishVersion=15.2.6
buildCount=0
baseBetaVersion=15.2.7

View File

@ -22,9 +22,8 @@ import cc.winboll.studio.libappbase.sos.SOS;
import cc.winboll.studio.libappbase.utils.ToastUtils;
import cc.winboll.studio.libappbase.widgets.StatusWidget;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
public class MainActivity extends WinBollActivityBase implements IWinBollActivity {
public class MainActivity extends WinBoLLActivity implements IWinBollActivity {
public static final String TAG = "MainActivity";

View File

@ -10,6 +10,7 @@ import android.os.Bundle;
import android.os.PersistableBundle;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.widget.Toast;
import cc.winboll.studio.appbase.App;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.libappbase.GlobalApplication;
@ -17,7 +18,7 @@ import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
public class WinBoLLActivity extends AppCompatActivity implements IWinBollActivity {
public static final String TAG = "WinBollActivityBase";
@ -45,14 +46,17 @@ public class WinBollActivityBase extends AppCompatActivity implements IWinBollAc
public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
super.onPostCreate(savedInstanceState, persistentState);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
GlobalApplication.getWinBollActivityManager().startLogActivity(this);
return true;
} else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
} else if (item.getItemId() == cc.winboll.studio.libappbase.R.id.item_about) {
Toast.makeText(getApplication(), "item_about", Toast.LENGTH_SHORT).show();
return true;
} else if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
//moveTaskToBack(true);
exit();
}

View File

@ -12,11 +12,11 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.WinBollActivityBase;
import cc.winboll.studio.appbase.WinBoLLActivity;
import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
public class New2Activity extends WinBollActivityBase implements IWinBollActivity {
public class New2Activity extends WinBoLLActivity implements IWinBollActivity {
public static final String TAG = "New2Activity";

View File

@ -11,11 +11,11 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.WinBollActivityBase;
import cc.winboll.studio.appbase.WinBoLLActivity;
import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
public class NewActivity extends WinBollActivityBase implements IWinBollActivity {
public class NewActivity extends WinBoLLActivity implements IWinBollActivity {
public static final String TAG = "NewActivity";

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:55 HKT 2025
#Sat Apr 26 16:55:12 GMT 2025
stageCount=2
libraryProject=libapputils
baseVersion=15.2
publishVersion=15.2.1
buildCount=0
buildCount=1
baseBetaVersion=15.2.2

View File

@ -2,11 +2,11 @@
buildscript {
repositories {
// Maven ~/.m2/repository
mavenLocal()
//mavenLocal()
//
//maven { url "file:///sdcard/.m2/repository" }
//
maven { url "file:///sdcard/ZhanGSKen/AIDE/MavenReps/repository" }
//maven { url "file:///sdcard/ZhanGSKen/AIDE/MavenReps/repository" }
maven { url 'https://maven.aliyun.com/repository/public/' }
maven { url 'https://maven.aliyun.com/repository/google/' }
@ -34,11 +34,11 @@ buildscript {
allprojects {
repositories {
// Maven ~/.m2/repository
mavenLocal()
//mavenLocal()
//
//maven { url "file:///sdcard/.m2/repository" }
//
maven { url "file:///sdcard/ZhanGSKen/AIDE/MavenReps/repository" }
//maven { url "file:///sdcard/ZhanGSKen/AIDE/MavenReps/repository" }
maven { url 'https://maven.aliyun.com/repository/public/' }
maven { url 'https://maven.aliyun.com/repository/google/' }
@ -48,7 +48,7 @@ allprojects {
maven { url "https://jitpack.io" }
mavenCentral()
google()
//mavenLocal()
mavenLocal()
// Nexus Maven
// "WinBoll Release"

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Apr 26 12:27:57 GMT 2025
stageCount=6
#Sun Apr 27 00:07:35 GMT 2025
stageCount=7
libraryProject=libappbase
baseVersion=15.2
publishVersion=15.2.5
buildCount=4
baseBetaVersion=15.2.6
publishVersion=15.2.6
buildCount=0
baseBetaVersion=15.2.7

View File

@ -4,20 +4,19 @@ package cc.winboll.studio.libappbase;
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/02/11 00:14:05
*/
import android.app.Activity;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
import cc.winboll.studio.libappbase.R;
public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener {
public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
private static final int MENUITEM_COPY = 0;
private static final int MENUITEM_RESTART = 1;
@ -39,10 +38,10 @@ public final class GlobalCrashActivity extends AppCompatActivity implements Menu
setContentView(R.layout.activity_globalcrash);
mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
mGlobalCrashReportView.setReport(mLog);
setSupportActionBar(mGlobalCrashReportView.getToolbar());
setActionBar(mGlobalCrashReportView.getToolbar());
getSupportActionBar().setTitle(CrashHandler.TITTLE);
getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
getActionBar().setTitle(CrashHandler.TITTLE);
getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
}
@Override

View File

@ -8,7 +8,6 @@ package cc.winboll.studio.libappbase;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.support.v7.widget.Toolbar;
import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet;
@ -17,6 +16,7 @@ import android.view.MenuItem;
import android.widget.LinearLayout;
import android.widget.TextView;
import cc.winboll.studio.libappbase.R;
import android.widget.Toolbar;
public class GlobalCrashReportView extends LinearLayout {

View File

@ -42,7 +42,8 @@ dependencies {
// https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
api 'com.android.support:recyclerview-v7:28.0.0'
api 'cc.winboll.studio:libappbase:15.2.0'
//api 'cc.winboll.studio:libappbase:15.2.0'
api project(':libappbase')
//
api 'com.google.zxing:core:3.4.1'

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:39 HKT 2025
#Sat Apr 26 16:55:12 GMT 2025
stageCount=2
libraryProject=libapputils
baseVersion=15.2
publishVersion=15.2.1
buildCount=0
buildCount=1
baseBetaVersion=15.2.2

View File

@ -1,14 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="AboutView">
<attr name="app_name" format="string" />
<attr name="app_apkfoldername" format="string" />
<attr name="app_apkname" format="string" />
<attr name="app_gitname" format="string" />
<attr name="app_gitowner" format="string" />
<attr name="app_gitappbranch" format="string" />
<attr name="app_gitappsubprojectfolder" format="string" />
<attr name="appdescription" format="string" />
<attr name="appicon" format="reference" />
</declare-styleable>
</resources>

@ -1 +0,0 @@
Subproject commit 645058e1e350a80eb4bfe33bd252f58f4dbe09c9

View File

@ -18,6 +18,7 @@
// APPUtils 项目编译设置
//include ':apputils'
//include ':libapputils'
//include ':libappbase'
//rootProject.name = "apputils"
// JC 项目编译设置

@ -1 +0,0 @@
Subproject commit d94d70050f92a24b407f35cbd93a8e9ed8b007d8