From f32563b906473b3a14a9116e32dc8455faf7ebdb Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 28 Sep 2025 21:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=9D=9E=E5=BF=85=E8=A6=81=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=88=B0WinBoLL=E9=A1=B9=E7=9B=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- aes/src/main/AndroidManifest.xml | 4 +- .../cc/winboll/studio/aes/AboutActivity.java | 9 +- .../main/java/cc/winboll/studio/aes/App.java | 2 +- .../cc/winboll/studio/aes/MainActivity.java | 14 +-- .../aes/TestActivityManagerActivity.java | 33 +++++++ .../layout/activity_testactivitymanager.xml | 15 +++ aes/src/main/res/menu/toolbar_library.xml | 3 + libaes/build.properties | 4 +- .../activitys/DrawerFragmentActivity.java | 3 +- .../IWinBoLLActivity.java | 5 +- .../libaes/{winboll => models}/APPInfo.java | 2 +- .../studio/libaes/models/WinBoLLModel.java | 92 ------------------ .../unittests/SecondaryLibraryActivity.java | 2 +- .../TestASupportToolbarActivity.java | 2 +- .../unittests/TestDrawerFragmentActivity.java | 2 +- .../MyActivityLifecycleCallbacks.java | 2 +- .../WinBoLLActivityManager.java | 8 +- .../libaes/{winboll => views}/AboutView.java | 40 ++------ .../libaes/winboll/AssistantService.java | 97 ------------------- .../winboll/EWUIStatusIconDrawable.java | 35 ------- .../studio/libaes/winboll/WinBoLL.java | 40 -------- .../libaes/winboll/WinBoLLClientService.java | 21 ---- .../winboll/WinBoLLServiceStatusView.java | 38 -------- libaes/src/main/res/layout/view_about_dev.xml | 64 ------------ libaes/src/main/res/layout/view_about_www.xml | 22 ----- 26 files changed, 91 insertions(+), 472 deletions(-) create mode 100644 aes/src/main/java/cc/winboll/studio/aes/TestActivityManagerActivity.java create mode 100644 aes/src/main/res/layout/activity_testactivitymanager.xml rename libaes/src/main/java/cc/winboll/studio/libaes/{winboll => interfaces}/IWinBoLLActivity.java (83%) rename libaes/src/main/java/cc/winboll/studio/libaes/{winboll => models}/APPInfo.java (99%) delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/models/WinBoLLModel.java rename libaes/src/main/java/cc/winboll/studio/libaes/{winboll => utils}/MyActivityLifecycleCallbacks.java (98%) rename libaes/src/main/java/cc/winboll/studio/libaes/{winboll => utils}/WinBoLLActivityManager.java (99%) rename libaes/src/main/java/cc/winboll/studio/libaes/{winboll => views}/AboutView.java (88%) delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLL.java delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java delete mode 100644 libaes/src/main/res/layout/view_about_dev.xml delete mode 100644 libaes/src/main/res/layout/view_about_www.xml diff --git a/aes/build.properties b/aes/build.properties index 0bfb241..08a63e1 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Sep 28 20:11:56 HKT 2025 +#Sun Sep 28 13:10:12 GMT 2025 stageCount=1 libraryProject=libaes baseVersion=15.10 publishVersion=15.10.0 -buildCount=0 +buildCount=5 baseBetaVersion=15.10.1 diff --git a/aes/src/main/AndroidManifest.xml b/aes/src/main/AndroidManifest.xml index d123b21..9396685 100644 --- a/aes/src/main/AndroidManifest.xml +++ b/aes/src/main/AndroidManifest.xml @@ -33,6 +33,8 @@ + + - + \ No newline at end of file diff --git a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java index a0c0532..ff88ed0 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java @@ -12,11 +12,10 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.libaes.winboll.APPInfo; -import cc.winboll.studio.libaes.winboll.AboutView; -import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libaes.winboll.IWinBoLLActivity; -import cc.winboll.studio.libaes.winboll.WinBoLLActivityManager; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; +import cc.winboll.studio.libaes.models.APPInfo; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; +import cc.winboll.studio.libaes.views.AboutView; public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity { diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 2dfcf0b..9b0fb3a 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -6,10 +6,10 @@ package cc.winboll.studio.aes; * @Describe AES应用类 */ import android.view.Gravity; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.GlobalApplication; import com.hjq.toast.ToastUtils; import com.hjq.toast.style.WhiteToastStyle; -import cc.winboll.studio.libaes.winboll.WinBoLLActivityManager; public class App extends GlobalApplication { diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index fc9ed9b..40a70db 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -15,9 +15,10 @@ import android.widget.AdapterView; import android.widget.Toast; import cc.winboll.studio.aes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; -import cc.winboll.studio.libaes.models.DrawerMenuBean; import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog; import cc.winboll.studio.libaes.dialogs.StoragePathDialog; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; +import cc.winboll.studio.libaes.models.DrawerMenuBean; import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity; import cc.winboll.studio.libaes.unittests.TestAButtonFragment; import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity; @@ -25,10 +26,10 @@ import cc.winboll.studio.libaes.unittests.TestAToolbarActivity; import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity; import cc.winboll.studio.libaes.unittests.TestViewPageFragment; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.ToastUtils; import com.a4455jkjh.colorpicker.ColorPickerDialog; -import com.hjq.toast.ToastUtils; import java.util.ArrayList; -import cc.winboll.studio.libaes.winboll.IWinBoLLActivity; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity { @@ -122,9 +123,10 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi @Override public boolean onOptionsItemSelected(MenuItem item) { int nItemId = item.getItemId(); -// if (item.getItemId() == R.id.item_log) { -// WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class); -// } else + if (item.getItemId() == R.id.item_testactivitymanager) { + WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, TestActivityManagerActivity.class); + //ToastUtils.show("item_testactivitymanager"); + } else if (nItemId == R.id.item_atoast) { Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show(); } else if (nItemId == R.id.item_atoolbar) { diff --git a/aes/src/main/java/cc/winboll/studio/aes/TestActivityManagerActivity.java b/aes/src/main/java/cc/winboll/studio/aes/TestActivityManagerActivity.java new file mode 100644 index 0000000..3f77f00 --- /dev/null +++ b/aes/src/main/java/cc/winboll/studio/aes/TestActivityManagerActivity.java @@ -0,0 +1,33 @@ +package cc.winboll.studio.aes; + +import android.app.Activity; +import android.os.Bundle; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; + +/** + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/09/28 21:07 + * @Describe 窗口管理类测试窗口 + */ +public class TestActivityManagerActivity extends Activity implements IWinBoLLActivity { + + public static final String TAG = "TestActivityManagerActivity"; + + @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_testactivitymanager); + + } + +} diff --git a/aes/src/main/res/layout/activity_testactivitymanager.xml b/aes/src/main/res/layout/activity_testactivitymanager.xml new file mode 100644 index 0000000..e030ebb --- /dev/null +++ b/aes/src/main/res/layout/activity_testactivitymanager.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/aes/src/main/res/menu/toolbar_library.xml b/aes/src/main/res/menu/toolbar_library.xml index b12aef8..7c1a41c 100644 --- a/aes/src/main/res/menu/toolbar_library.xml +++ b/aes/src/main/res/menu/toolbar_library.xml @@ -1,5 +1,8 @@ + diff --git a/libaes/build.properties b/libaes/build.properties index 60e38dd..08a63e1 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Sep 28 20:11:37 HKT 2025 +#Sun Sep 28 13:10:12 GMT 2025 stageCount=1 libraryProject=libaes baseVersion=15.10 publishVersion=15.10.0 -buildCount=0 +buildCount=5 baseBetaVersion=15.10.1 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java index 7fb5bd3..812089e 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java @@ -30,6 +30,7 @@ import cc.winboll.studio.libaes.views.ADrawerMenuListView; import cc.winboll.studio.libappbase.LogUtils; import com.baoyz.widget.PullRefreshLayout; import java.util.ArrayList; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { @@ -174,8 +175,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) { getString(i); } -// } else if (R.id.item_log == item.getItemId()) { -// GlobalApplication.getWinBoLLActivityManager().startLogActivity(this); } else if (R.id.item_about == item.getItemId()) { LogUtils.d(TAG, "onAbout"); } else if (android.R.id.home == item.getItemId()) { diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/interfaces/IWinBoLLActivity.java similarity index 83% rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLActivity.java rename to libaes/src/main/java/cc/winboll/studio/libaes/interfaces/IWinBoLLActivity.java index ace14d2..aa4805b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/interfaces/IWinBoLLActivity.java @@ -1,11 +1,12 @@ -package cc.winboll.studio.libaes.winboll; -import android.app.Activity; +package cc.winboll.studio.libaes.interfaces; /** * @Author ZhanGSKen * @Date 2025/05/10 09:34 * @Describe WinBoLL 窗口操作接口 */ + import android.app.Activity; + public abstract interface IWinBoLLActivity { public static final String TAG = "IWinBoLLActivity"; diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java b/libaes/src/main/java/cc/winboll/studio/libaes/models/APPInfo.java similarity index 99% rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java rename to libaes/src/main/java/cc/winboll/studio/libaes/models/APPInfo.java index 94248e8..cf097e0 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/models/APPInfo.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.libaes.winboll; +package cc.winboll.studio.libaes.models; /** * @Author ZhanGSKen diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/models/WinBoLLModel.java b/libaes/src/main/java/cc/winboll/studio/libaes/models/WinBoLLModel.java deleted file mode 100644 index c4cb165..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/models/WinBoLLModel.java +++ /dev/null @@ -1,92 +0,0 @@ -package cc.winboll.studio.libaes.models; - -/** - * @Author ZhanGSKen - * @Date 2025/05/10 10:16 - * @Describe WinBoLLModel - */ -import android.util.JsonReader; -import android.util.JsonWriter; -import cc.winboll.studio.libappbase.BaseBean; -import java.io.IOException; -import cc.winboll.studio.libappbase.APPModel; - -public class WinBoLLModel extends BaseBean { - - public static final String TAG = "WinBoLLModel"; - - String appPackageName; - String appMainServiveName; - - public WinBoLLModel() { - this.appPackageName = ""; - this.appMainServiveName = ""; - } - - public WinBoLLModel(boolean isDebuging, String appPackageName, String appMainServiveName) { - this.appPackageName = appPackageName; - this.appMainServiveName = appMainServiveName; - } - - public WinBoLLModel(String appPackageName, String appMainServiveName) { - this.appPackageName = appPackageName; - this.appMainServiveName = appMainServiveName; - } - - public void setAppPackageName(String appPackageName) { - this.appPackageName = appPackageName; - } - - public String getAppPackageName() { - return appPackageName; - } - - public void setAppMainServiveName(String appMainServiveName) { - this.appMainServiveName = appMainServiveName; - } - - public String getAppMainServiveName() { - return appMainServiveName; - } - - @Override - public String getName() { - return APPModel.class.getName(); - } - - @Override - public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException { - super.writeThisToJsonWriter(jsonWriter); - jsonWriter.name("appPackageName").value(getAppPackageName()); - jsonWriter.name("appMainServiveName").value(getAppMainServiveName()); - } - - @Override - public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException { - if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else { - if (name.equals("appPackageName")) { - setAppPackageName(jsonReader.nextString()); - } else if (name.equals("appMainServiveName")) { - setAppMainServiveName(jsonReader.nextString()); - } else { - return false; - } - } - return true; - } - - @Override - public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException { - jsonReader.beginObject(); - while (jsonReader.hasNext()) { - String name = jsonReader.nextName(); - if (!initObjectsFromJsonReader(jsonReader, name)) { - jsonReader.skipValue(); - } - } - // 结束 JSON 对象 - jsonReader.endObject(); - return this; - } -} - diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java index b6a5796..2373d6a 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java @@ -7,7 +7,7 @@ import android.view.MenuItem; import android.widget.Toast; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; -import cc.winboll.studio.libaes.winboll.IWinBoLLActivity; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; /** * @Author ZhanGSKen diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java index d953265..6fa37b6 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java @@ -10,8 +10,8 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libaes.R; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libaes.utils.AESThemeUtil; -import cc.winboll.studio.libaes.winboll.IWinBoLLActivity; public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity { diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java index 7488653..ab4fc2b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java @@ -14,10 +14,10 @@ import android.widget.Toast; import androidx.fragment.app.Fragment; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libaes.models.DrawerMenuBean; import cc.winboll.studio.libappbase.LogUtils; import java.util.ArrayList; -import cc.winboll.studio.libaes.winboll.IWinBoLLActivity; public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBoLLActivity { diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/MyActivityLifecycleCallbacks.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/MyActivityLifecycleCallbacks.java similarity index 98% rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/MyActivityLifecycleCallbacks.java rename to libaes/src/main/java/cc/winboll/studio/libaes/utils/MyActivityLifecycleCallbacks.java index c77c2c5..d32928d 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/MyActivityLifecycleCallbacks.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/MyActivityLifecycleCallbacks.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.libaes.winboll; +package cc.winboll.studio.libaes.utils; /** * @Author ZhanGSKen diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLActivityManager.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/WinBoLLActivityManager.java similarity index 99% rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLActivityManager.java rename to libaes/src/main/java/cc/winboll/studio/libaes/utils/WinBoLLActivityManager.java index 71921b0..7b56cfd 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLActivityManager.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/WinBoLLActivityManager.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.libaes.winboll; +package cc.winboll.studio.libaes.utils; /** * @Author ZhanGSKen @@ -10,16 +10,16 @@ package cc.winboll.studio.libaes.winboll; */ import android.app.Activity; import android.app.ActivityManager; -import android.app.TaskStackBuilder; import android.content.Context; import android.content.Intent; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.libappbase.LogActivity; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.ToastUtils; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import cc.winboll.studio.libappbase.LogActivity; -import cc.winboll.studio.libappbase.ToastUtils; public class WinBoLLActivityManager { diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java similarity index 88% rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java rename to libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java index a1ccd8f..41ddb8d 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.libaes.winboll; +package cc.winboll.studio.libaes.views; /** * @Author ZhanGSKen @@ -17,7 +17,10 @@ import android.view.View; import android.widget.EditText; import android.widget.LinearLayout; import cc.winboll.studio.libaes.R; +import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog; +import cc.winboll.studio.libaes.models.APPInfo; import cc.winboll.studio.libaes.utils.AppVersionUtils; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libapputils.utils.PrefUtils; @@ -31,8 +34,6 @@ import okhttp3.Credentials; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import mehdi.sakout.aboutpage.BuildConfig; -import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog; public class AboutView extends LinearLayout { @@ -43,7 +44,7 @@ public class AboutView extends LinearLayout { static Context _mContext; APPInfo mAPPInfo; - WinBoLLServiceStatusView mWinBoLLServiceStatusView; + //WinBoLLServiceStatusView mWinBoLLServiceStatusView; OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener; String mszAppName = ""; String mszAppAPKFolderName = ""; @@ -122,35 +123,8 @@ public class AboutView extends LinearLayout { } else { mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder(); } - - - if (GlobalApplication.isDebuging()) { - LayoutInflater inflater = LayoutInflater.from(_mContext); - View addedView = inflater.inflate(R.layout.view_about_dev, this, false); - LinearLayout llMain = addedView.findViewById(R.id.viewaboutdevLinearLayout1); - metDevUserName = addedView.findViewById(R.id.viewaboutdevEditText1); - metDevUserPassword = addedView.findViewById(R.id.viewaboutdevEditText2); - metDevUserName.setText(PrefUtils.getString(_mContext, "metDevUserName", "")); - metDevUserPassword.setText(PrefUtils.getString(_mContext, "metDevUserPassword", "")); - //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context); - mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBoLLServiceStatusView1); - mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost); - mWinBoLLServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString()); - //llMain.addView(mDevelopHostConnectionStatusView); - llMain.addView(createAboutPage()); - addView(addedView); - } else { - LayoutInflater inflater = LayoutInflater.from(_mContext); - View addedView = inflater.inflate(R.layout.view_about_www, this, false); - LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1); - //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context); - mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBoLLServiceStatusView1); - mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost); - mWinBoLLServiceStatusView.setAuthInfo("", ""); - //llMain.addView(mDevelopHostConnectionStatusView); - llMain.addView(createAboutPage()); - addView(addedView); - } + + addView(createAboutPage()); // 初始化标题栏 //setSubtitle(getContext().getString(R.string.text_about)); diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java deleted file mode 100644 index bdc107d..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java +++ /dev/null @@ -1,97 +0,0 @@ -package cc.winboll.studio.libaes.winboll; - -/** - * @Author ZhanGSKen - * @Date 2025/03/28 19:12:12 - * @Describe 应用主要服务组件类守护进程服务组件类 - */ -import android.app.Service; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.IBinder; -import cc.winboll.studio.libaes.models.WinBoLLClientServiceBean; -import cc.winboll.studio.libaes.winboll.AssistantService; -import cc.winboll.studio.libapputils.utils.ServiceUtils; - -public class AssistantService extends Service { - - public final static String TAG = "AssistantService"; - - WinBoLLClientServiceBean mWinBoLLServiceBean; - MyServiceConnection mMyServiceConnection; - volatile boolean mIsServiceRunning; - - @Override - public IBinder onBind(Intent intent) { - return null; - } - - @Override - public void onCreate() { - super.onCreate(); - mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this); - if (mMyServiceConnection == null) { - mMyServiceConnection = new MyServiceConnection(); - } - // 设置运行参数 - mIsServiceRunning = false; - run(); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - run(); - return START_STICKY; - } - - @Override - public void onDestroy() { - mIsServiceRunning = false; - super.onDestroy(); - } - - // - // 运行服务内容 - // - void run() { - mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this); - if (mWinBoLLServiceBean.isEnable()) { - if (mIsServiceRunning == false) { - // 设置运行状态 - mIsServiceRunning = true; - // 唤醒和绑定主进程 - wakeupAndBindMain(); - } - } - } - - // - // 唤醒和绑定主进程 - // - void wakeupAndBindMain() { - if (ServiceUtils.isServiceAlive(getApplicationContext(), WinBoLLClientService.class.getName()) == false) { - startForegroundService(new Intent(AssistantService.this, WinBoLLClientService.class)); - } - - bindService(new Intent(AssistantService.this, WinBoLLClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT); - } - - // - // 主进程与守护进程连接时需要用到此类 - // - class MyServiceConnection implements ServiceConnection { - @Override - public void onServiceConnected(ComponentName name, IBinder service) { - } - - @Override - public void onServiceDisconnected(ComponentName name) { - mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(AssistantService.this); - if (mWinBoLLServiceBean.isEnable()) { - wakeupAndBindMain(); - } - } - } -} diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java deleted file mode 100644 index 86fd15e..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java +++ /dev/null @@ -1,35 +0,0 @@ -package cc.winboll.studio.libaes.winboll; - -/** - * @Author ZhanGSKen - * @Date 2025/03/28 19:11:27 - * @Describe WinBoLL UI 状态图标枚举 - */ -import cc.winboll.studio.libaes.R; - -public enum EWUIStatusIconDrawable { - NORMAL(0), - NEWS(1) - ; - - static final String TAG = "WUIStatusIconDrawable"; - - static String[] _mlistCNName = { "正常", "新的消息" }; - - private int value = 0; - private EWUIStatusIconDrawable(int value) { //必须是private的，否则编译错误 - this.value = value; - } - - public static int getIconDrawableId(EWUIStatusIconDrawable drawableId) { - int res; - switch(drawableId){ - case NEWS : - res = R.drawable.ic_winbollbeta; - break; - default : - res = R.drawable.ic_winboll; - } - return res; - } -} diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLL.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLL.java deleted file mode 100644 index dd09222..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLL.java +++ /dev/null @@ -1,40 +0,0 @@ -package cc.winboll.studio.libaes.winboll; - -/** - * @Author ZhanGSKen - * @Date 2025/05/10 10:13 - * @Describe WinBoLL 系列应用通用管理类 - */ -import android.content.Context; -import android.content.Intent; -import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libaes.models.WinBoLLModel; - -public class WinBoLL { - - public static final String TAG = "WinBoLL"; - - public static final String ACTION_BIND = WinBoLL.class.getName() + ".ACTION_BIND"; - public static final String EXTRA_WINBOLLMODEL = "EXTRA_WINBOLLMODEL"; - - public static void bindToAPPBase(Context context, String appMainService) { - LogUtils.d(TAG, "bindToAPPBase(...)"); - String toPackage = "cc.winboll.studio.appbase"; - startBind(context, toPackage, appMainService); - } - - public static void bindToAPPBaseBeta(Context context, String appMainService) { - LogUtils.d(TAG, "bindToAPPBaseBeta(...)"); - String toPackage = "cc.winboll.studio.appbase.beta"; - startBind(context, toPackage, appMainService); - } - - static void startBind(Context context, String toPackage, String appMainService) { - Intent intent = new Intent(ACTION_BIND); - intent.putExtra(EXTRA_WINBOLLMODEL, (new WinBoLLModel(toPackage, appMainService)).toString()); - intent.setPackage(toPackage); - LogUtils.d(TAG, String.format("ACTION_BIND :\nTo Package : %s\nAPP Main Service : %s", toPackage, appMainService)); - context.sendBroadcast(intent); - } - -} diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java deleted file mode 100644 index d4e93a6..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java +++ /dev/null @@ -1,21 +0,0 @@ -package cc.winboll.studio.libaes.winboll; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; - -/** - * @Author ZhanGSKen - * @Date 2025/05/03 19:28 - */ -public class WinBoLLClientService extends Service { - - public static final String TAG = "WinBoLLClientService"; - - @Override - public IBinder onBind(Intent intent) { - - return null; - } - -} \ No newline at end of file diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java deleted file mode 100644 index 14a56e2..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java +++ /dev/null @@ -1,38 +0,0 @@ -package cc.winboll.studio.libaes.winboll; -import android.content.Context; -import android.util.AttributeSet; -import android.widget.LinearLayout; - -/** - * @Author ZhanGSKen - * @Date 2025/05/03 19:14 - */ -public class WinBoLLServiceStatusView extends LinearLayout { - - public static final String TAG = "WinBoLLServiceStatusView"; - - public WinBoLLServiceStatusView(Context context) { - super(context); - } - - public WinBoLLServiceStatusView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - - void setServerHost(String szWinBoLLServerHost) { - - } - - void setAuthInfo(String szDevUserName, String szDevUserPassword) { - - } -} diff --git a/libaes/src/main/res/layout/view_about_dev.xml b/libaes/src/main/res/layout/view_about_dev.xml deleted file mode 100644 index 1443e19..0000000 --- a/libaes/src/main/res/layout/view_about_dev.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libaes/src/main/res/layout/view_about_www.xml b/libaes/src/main/res/layout/view_about_www.xml deleted file mode 100644 index 8cbe538..0000000 --- a/libaes/src/main/res/layout/view_about_www.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -