Compare commits

..

25 Commits

Author SHA1 Message Date
ZhanGSKen
7dc2668d42 <apputils>APK 15.3.3 release Publish. 2025-04-29 14:07:52 +08:00
ZhanGSKen
ff9f5b42b9 整理代码 2025-04-29 14:05:21 +08:00
ZhanGSKen
077a5fc616 更换主题基础类 2025-04-29 14:04:40 +08:00
ZhanGSKen
62fd671f6e 调整适配Android API 级别 2025-04-29 13:45:03 +08:00
ZhanGSKen
3dd66d387a Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-29 13:42:04 +08:00
ZhanGSKen
dab1412bc4 <libappbase>Library Release 15.7.5 2025-04-29 13:40:47 +08:00
ZhanGSKen
aca23ca727 <appbase>APK 15.7.5 release Publish. 2025-04-29 13:40:21 +08:00
ZhanGSKen
5e8070ae01 调整类库依赖,改为基本Android API依赖。 2025-04-29 13:39:36 +08:00
ZhanGSKen
d737766459 Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-29 13:16:20 +08:00
ZhanGSKen
f8e9afddd1 <libappbase>Library Release 15.7.4 2025-04-29 13:15:31 +08:00
ZhanGSKen
f8bb5a7852 <appbase>APK 15.7.4 release Publish. 2025-04-29 13:14:59 +08:00
ZhanGSKen
33726a306f 编译测试 2025-04-29 00:07:26 +08:00
ZhanGSKen
99199d445e <apputils>APK 15.3.2 release Publish. 2025-04-28 21:34:43 +08:00
ZhanGSKen
a629941054 编译测试 2025-04-28 21:22:06 +08:00
ZhanGSKen
3a2274d7a2 Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-28 21:20:38 +08:00
ZhanGSKen
b918b04068 编译检查 2025-04-27 21:07:46 +08:00
ZhanGSKen
f0326bc9a3 Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-27 21:04:10 +08:00
ZhanGSKen
455e38ac0c Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-27 20:52:28 +08:00
ZhanGSKen
559d41e46c <libapputils>Library Release 15.3.1 2025-04-27 13:42:58 +08:00
ZhanGSKen
ef9c0f08ae <apputils>APK 15.3.1 release Publish. 2025-04-27 13:42:46 +08:00
ZhanGSKen
18b078c644 与AppCompatActivity引用一样,类继承层数不能是两层。 2025-04-27 13:41:49 +08:00
ZhanGSKen
b68d8a58e3 <libapputils>Library Release 15.3.0 2025-04-27 11:20:08 +08:00
ZhanGSKen
9eec7060b9 <apputils>APK 15.3.0 release Publish. 2025-04-27 11:19:49 +08:00
ZhanGSKen
e572486b05 设置版本号 2025-04-27 11:17:19 +08:00
ZhanGSKen
7abe096779 移除类库依赖 2025-04-27 11:11:48 +08:00
51 changed files with 283 additions and 295 deletions

View File

@@ -24,12 +24,12 @@ android {
defaultConfig { defaultConfig {
applicationId "cc.winboll.studio.aes" applicationId "cc.winboll.studio.aes"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 29
versionCode 1 versionCode 1
// versionName 更新后需要手动设置 // versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0 // 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.6" versionName "15.2"
if(true) { if(true) {
versionName = genVersionName("${versionName}") versionName = genVersionName("${versionName}")
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Tue Apr 29 15:14:21 HKT 2025 #Thu Apr 03 11:14:05 HKT 2025
stageCount=1 stageCount=7
libraryProject=libaes libraryProject=libaes
baseVersion=15.6 baseVersion=15.2
publishVersion=15.6.0 publishVersion=15.2.6
buildCount=0 buildCount=0
baseBetaVersion=15.6.1 baseBetaVersion=15.2.7

View File

@@ -10,13 +10,14 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.libaes.winboll.APPInfo; import cc.winboll.studio.libaes.winboll.APPInfo;
import cc.winboll.studio.libaes.winboll.AboutView; import cc.winboll.studio.libaes.winboll.AboutView;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity { public class AboutActivity extends WinBollActivity implements IWinBollActivity {
public static final String TAG = "AboutActivity"; public static final String TAG = "AboutActivity";
@@ -63,13 +64,13 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
); );
layout.addView(aboutView, params); layout.addView(aboutView, params);
GlobalApplication.getWinBoLLActivityManager().add(this); GlobalApplication.getWinBollActivityManager().add(this);
} }
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
GlobalApplication.getWinBoLLActivityManager().registeRemove(this); GlobalApplication.getWinBollActivityManager().registeRemove(this);
} }
public AboutView CreateAboutView() { public AboutView CreateAboutView() {

View File

@@ -8,7 +8,6 @@ package cc.winboll.studio.aes;
import android.view.Gravity; import android.view.Gravity;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.hjq.toast.style.WhiteToastStyle;
public class App extends GlobalApplication { public class App extends GlobalApplication {
@@ -22,8 +21,8 @@ public class App extends GlobalApplication {
// 初始化 Toast 框架 // 初始化 Toast 框架
ToastUtils.init(this); ToastUtils.init(this);
// 设置 Toast 布局样式 // 设置 Toast 布局样式
//ToastUtils.setView(R.layout.view_toast); ToastUtils.setView(R.layout.view_toast);
ToastUtils.setStyle(new WhiteToastStyle()); //ToastUtils.setStyle(new WhiteToastStyle());
ToastUtils.setGravity(Gravity.BOTTOM, 0, 200); ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
} }

View File

@@ -25,12 +25,12 @@ import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity; import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
import cc.winboll.studio.libaes.unittests.TestViewPageFragment; import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import com.a4455jkjh.colorpicker.ColorPickerDialog; import com.a4455jkjh.colorpicker.ColorPickerDialog;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import java.util.ArrayList; import java.util.ArrayList;
public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity { public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
public static final String TAG = "MainActivity"; public static final String TAG = "MainActivity";
@@ -123,7 +123,7 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
int nItemId = item.getItemId(); int nItemId = item.getItemId();
// if (item.getItemId() == R.id.item_log) { // if (item.getItemId() == R.id.item_log) {
// WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class); // WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
// } else // } else
if (nItemId == R.id.item_atoast) { if (nItemId == R.id.item_atoast) {
Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();

View File

@@ -5,17 +5,17 @@ import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import cc.winboll.studio.libaes.beans.AESThemeBean; import cc.winboll.studio.libaes.beans.AESThemeBean;
import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import android.view.MenuItem; import android.view.MenuItem;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/30 00:34:02 * @Date 2025/03/30 00:34:02
* @Describe WinBoLL 活动窗口通用基类 * @Describe WinBoll 活动窗口通用基类
*/ */
public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity { public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
public static final String TAG = "WinBoLLActivity"; public static final String TAG = "WinBollActivity";
protected volatile AESThemeBean.ThemeType mThemeType; protected volatile AESThemeBean.ThemeType mThemeType;

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Tue Apr 29 04:20:48 GMT 2025 #Tue Apr 29 13:40:44 HKT 2025
stageCount=4 stageCount=6
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.7 baseVersion=15.7
publishVersion=15.7.3 publishVersion=15.7.5
buildCount=5 buildCount=0
baseBetaVersion=15.7.4 baseBetaVersion=15.7.6

View File

@@ -4,11 +4,11 @@ import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.Toolbar;
import cc.winboll.studio.appbase.R; import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.activities.NewActivity; import cc.winboll.studio.appbase.activities.NewActivity;
import cc.winboll.studio.appbase.services.MainService; import cc.winboll.studio.appbase.services.MainService;
@@ -22,7 +22,6 @@ import cc.winboll.studio.libappbase.sos.SOS;
import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.utils.ToastUtils;
import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.widgets.StatusWidget;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; 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 WinBollActivityBase implements IWinBollActivity {
@@ -48,7 +47,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
mToolbar = findViewById(R.id.toolbar); mToolbar = findViewById(R.id.toolbar);
setSupportActionBar(mToolbar); setActionBar(mToolbar);
CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1); CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
cbIsDebugMode.setChecked(GlobalApplication.isDebuging()); cbIsDebugMode.setChecked(GlobalApplication.isDebuging());

View File

@@ -8,7 +8,6 @@ package cc.winboll.studio.appbase;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem; import android.view.MenuItem;
import cc.winboll.studio.appbase.App; import cc.winboll.studio.appbase.App;
import cc.winboll.studio.appbase.R; import cc.winboll.studio.appbase.R;
@@ -17,7 +16,7 @@ import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity { public class WinBollActivityBase extends Activity implements IWinBollActivity {
public static final String TAG = "WinBollActivityBase"; public static final String TAG = "WinBollActivityBase";

View File

@@ -7,10 +7,10 @@ package cc.winboll.studio.appbase.activities;
*/ */
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.Toolbar;
import cc.winboll.studio.appbase.R; import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.WinBollActivityBase; import cc.winboll.studio.appbase.WinBollActivityBase;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
@@ -41,7 +41,7 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit
// mLogView = findViewById(R.id.logview); // mLogView = findViewById(R.id.logview);
// mLogView.start(); // mLogView.start();
mToolbar = findViewById(R.id.toolbar); mToolbar = findViewById(R.id.toolbar);
setSupportActionBar(mToolbar); setActionBar(mToolbar);
} }

View File

@@ -6,10 +6,10 @@ package cc.winboll.studio.appbase.activities;
*/ */
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.Toolbar;
import cc.winboll.studio.appbase.R; import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.WinBollActivityBase; import cc.winboll.studio.appbase.WinBollActivityBase;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
@@ -39,7 +39,7 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity
// mLogView = findViewById(R.id.logview); // mLogView = findViewById(R.id.logview);
// mLogView.start(); // mLogView.start();
mToolbar = findViewById(R.id.toolbar); mToolbar = findViewById(R.id.toolbar);
setSupportActionBar(mToolbar); setActionBar(mToolbar);
} }

View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v7.widget.Toolbar <android.widget.Toolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/toolbar"/> android:id="@+id/toolbar"/>

View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v7.widget.Toolbar <android.widget.Toolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/toolbar"/> android:id="@+id/toolbar"/>

View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v7.widget.Toolbar <android.widget.Toolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/toolbar"/> android:id="@+id/toolbar"/>

View File

@@ -24,12 +24,12 @@ android {
defaultConfig { defaultConfig {
applicationId "cc.winboll.studio.apputils" applicationId "cc.winboll.studio.apputils"
minSdkVersion 26 minSdkVersion 26
targetSdkVersion 29 targetSdkVersion 30
versionCode 1 versionCode 1
// versionName 更新后需要手动设置 // versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0 // 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.2" versionName "15.3"
if(true) { if(true) {
versionName = genVersionName("${versionName}") versionName = genVersionName("${versionName}")
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:55 HKT 2025 #Tue Apr 29 14:07:52 HKT 2025
stageCount=2 stageCount=4
libraryProject=libapputils libraryProject=libapputils
baseVersion=15.2 baseVersion=15.3
publishVersion=15.2.1 publishVersion=15.3.3
buildCount=0 buildCount=0
baseBetaVersion=15.2.2 baseBetaVersion=15.3.4

View File

@@ -8,12 +8,11 @@ package cc.winboll.studio.apputils;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.support.v7.app.AppCompatActivity;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity { public class WinBollActivityBase extends Activity implements IWinBollActivity {
public static final String TAG = "WinBollActivityBase"; public static final String TAG = "WinBollActivityBase";

View File

@@ -9,7 +9,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 29
} }
buildTypes { buildTypes {
release { release {
@@ -45,12 +45,12 @@ dependencies {
api 'com.squareup.okhttp3:okhttp:4.4.1' api 'com.squareup.okhttp3:okhttp:4.4.1'
// AndroidX 类库 // AndroidX 类库
api 'androidx.appcompat:appcompat:1.1.0' api 'androidx.appcompat:appcompat:1.1.0'
//api 'com.google.android.material:material:1.4.0' api 'com.google.android.material:material:1.4.0'
//api 'androidx.viewpager:viewpager:1.0.0' //api 'androidx.viewpager:viewpager:1.0.0'
//api 'androidx.vectordrawable:vectordrawable:1.1.0' //api 'androidx.vectordrawable:vectordrawable:1.1.0'
//api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
//api 'androidx.fragment:fragment:1.1.0' //api 'androidx.fragment:fragment:1.1.0'
api 'cc.winboll.studio:libapputils:15.3.4' api 'cc.winboll.studio:libapputils:15.2.2'
api 'cc.winboll.studio:libappbase:15.7.6' api 'cc.winboll.studio:libappbase:15.2.2'
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Tue Apr 29 15:14:21 HKT 2025 #Thu Apr 03 11:13:53 HKT 2025
stageCount=1 stageCount=7
libraryProject=libaes libraryProject=libaes
baseVersion=15.6 baseVersion=15.2
publishVersion=15.6.0 publishVersion=15.2.6
buildCount=0 buildCount=0
baseBetaVersion=15.6.1 baseBetaVersion=15.2.7

View File

@@ -17,13 +17,13 @@
<activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity" <activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"
android:exported="true"/> android:exported="true"/>
<service android:name="cc.winboll.studio.libaes.winboll.WinBoLLClientService" <service android:name="cc.winboll.studio.libaes.winboll.WinBollClientService"
android:exported="true"/> android:exported="true"/>
<service android:name="cc.winboll.studio.libaes.winboll.AssistantService" <service android:name="cc.winboll.studio.libaes.winboll.AssistantService"
android:exported="true"/> android:exported="true"/>
<service android:name="cc.winboll.studio.libaes.winboll.WinBoLLMail" <service android:name="cc.winboll.studio.libaes.winboll.WinBollMail"
android:exported="true"/> android:exported="true"/>
</application> </application>

View File

@@ -29,11 +29,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libaes.views.ADrawerMenuListView; import cc.winboll.studio.libaes.views.ADrawerMenuListView;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import com.baoyz.widget.PullRefreshLayout; import com.baoyz.widget.PullRefreshLayout;
import java.util.ArrayList; import java.util.ArrayList;
public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity,AdapterView.OnItemClickListener { public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener {
public static final String TAG = "DrawerFragmentActivity"; public static final String TAG = "DrawerFragmentActivity";
@@ -177,7 +177,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
getString(i); getString(i);
} }
} else if (R.id.item_log == item.getItemId()) { } else if (R.id.item_log == item.getItemId()) {
GlobalApplication.getWinBoLLActivityManager().startLogActivity(this); GlobalApplication.getWinBollActivityManager().startLogActivity(this);
} else if (R.id.item_about == item.getItemId()) { } else if (R.id.item_about == item.getItemId()) {
LogUtils.d(TAG, "onAbout"); LogUtils.d(TAG, "onAbout");
} else if (android.R.id.home == item.getItemId()) { } else if (android.R.id.home == item.getItemId()) {

View File

@@ -7,14 +7,14 @@ import android.view.MenuItem;
import android.widget.Toast; import android.widget.Toast;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
/** /**
* @Author ZhanGSKen@QQ.COM * @Author ZhanGSKen@QQ.COM
* @Date 2024/06/15 00:58:10 * @Date 2024/06/15 00:58:10
* @Describe 第二级窗口 * @Describe 第二级窗口
*/ */
public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBoLLActivity { public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBollActivity {
public static final String TAG = "SecondaryLibraryActivity"; public static final String TAG = "SecondaryLibraryActivity";

View File

@@ -11,9 +11,9 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity { public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBollActivity {
public static final String TAG = "TestASupportToolbarActivity"; public static final String TAG = "TestASupportToolbarActivity";

View File

@@ -10,9 +10,9 @@ import android.os.Bundle;
import android.widget.Toolbar; import android.widget.Toolbar;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
public class TestAToolbarActivity extends Activity implements IWinBoLLActivity { public class TestAToolbarActivity extends Activity implements IWinBollActivity {
public static final String TAG = "TestAToolbarActivity"; public static final String TAG = "TestAToolbarActivity";

View File

@@ -11,15 +11,16 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.Toast; import android.widget.Toast;
import android.widget.Toolbar;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
import cc.winboll.studio.libaes.beans.DrawerMenuBean; import cc.winboll.studio.libaes.beans.DrawerMenuBean;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import java.util.ArrayList; import java.util.ArrayList;
public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBoLLActivity { public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {
@Override @Override
public Activity getActivity() { public Activity getActivity() {

View File

@@ -41,7 +41,7 @@ public class AESThemeUtil {
activity.setTheme(getThemeTypeID(activity)); activity.setTheme(getThemeTypeID(activity));
} }
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(T activity) { /*public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
activity.setTheme(getThemeTypeID(activity.getApplicationContext())); activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
}*/ }*/
@@ -53,7 +53,7 @@ public class AESThemeUtil {
activity.setTheme(AESThemeBean.getThemeStyleID(themeType)); activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
} }
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) { /*public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
activity.setTheme(AESThemeBean.getThemeStyleID(themeType)); activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
}*/ }*/
@@ -65,7 +65,7 @@ public class AESThemeUtil {
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
} }
/*public static <T extends WinBoLLActivity> void inflateWinBoLLMenu(T activity, Menu menu) { /*public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
}*/ }*/
@@ -131,7 +131,7 @@ public class AESThemeUtil {
return false; return false;
} }
public static <T extends AppCompatActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) { public static <T extends AppCompatActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
int nThemeStyleID; int nThemeStyleID;
if (R.id.item_depththeme == item.getItemId()) { if (R.id.item_depththeme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH); nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
@@ -162,7 +162,7 @@ public class AESThemeUtil {
return false; return false;
} }
public static <T extends DrawerFragmentActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) { public static <T extends DrawerFragmentActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
int nThemeStyleID; int nThemeStyleID;
if (R.id.item_depththeme == item.getItemId()) { if (R.id.item_depththeme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH); nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);

View File

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/24 15:08:52 * @Date 2025/03/24 15:08:52
* @Describe WinBoLL应用介绍视图 * @Describe WinBoll应用介绍视图
*/ */
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -43,7 +43,7 @@ public class AboutView extends LinearLayout {
Context mContext; Context mContext;
APPInfo mAPPInfo; APPInfo mAPPInfo;
WinBoLLServiceStatusView mWinBoLLServiceStatusView; WinBollServiceStatusView mWinBollServiceStatusView;
OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener; OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
String mszAppName = ""; String mszAppName = "";
String mszAppAPKFolderName = ""; String mszAppAPKFolderName = "";
@@ -57,7 +57,7 @@ public class AboutView extends LinearLayout {
String mszHomePage = ""; String mszHomePage = "";
String mszGitea = ""; String mszGitea = "";
int mnAppIcon = 0; int mnAppIcon = 0;
String mszWinBoLLServerHost; String mszWinBollServerHost;
String mszReleaseAPKName; String mszReleaseAPKName;
EditText metDevUserName; EditText metDevUserName;
EditText metDevUserPassword; EditText metDevUserPassword;
@@ -107,7 +107,7 @@ public class AboutView extends LinearLayout {
mszAppDescription = mAPPInfo.getAppDescription(); mszAppDescription = mAPPInfo.getAppDescription();
mnAppIcon = mAPPInfo.getAppIcon(); mnAppIcon = mAPPInfo.getAppIcon();
mszWinBoLLServerHost = GlobalApplication.isDebuging() ? "https://dev.winboll.cc": "https://www.winboll.cc"; mszWinBollServerHost = GlobalApplication.isDebuging() ? "https://dev.winboll.cc": "https://www.winboll.cc";
try { try {
mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName; mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
@@ -115,7 +115,7 @@ public class AboutView extends LinearLayout {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
} }
mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk"; mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
mszHomePage = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName; mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
if (mAPPInfo.getAppGitAPPBranch().equals("")) { if (mAPPInfo.getAppGitAPPBranch().equals("")) {
mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName; mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName;
} else { } else {
@@ -132,9 +132,9 @@ public class AboutView extends LinearLayout {
metDevUserName.setText(PrefUtils.getString(mContext, "metDevUserName", "")); metDevUserName.setText(PrefUtils.getString(mContext, "metDevUserName", ""));
metDevUserPassword.setText(PrefUtils.getString(mContext, "metDevUserPassword", "")); metDevUserPassword.setText(PrefUtils.getString(mContext, "metDevUserPassword", ""));
//mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context); //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBoLLServiceStatusView1); mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBollServiceStatusView1);
mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost); mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
mWinBoLLServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString()); mWinBollServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
//llMain.addView(mDevelopHostConnectionStatusView); //llMain.addView(mDevelopHostConnectionStatusView);
llMain.addView(createAboutPage()); llMain.addView(createAboutPage());
addView(addedView); addView(addedView);
@@ -143,9 +143,9 @@ public class AboutView extends LinearLayout {
View addedView = inflater.inflate(R.layout.view_about_www, this, false); View addedView = inflater.inflate(R.layout.view_about_www, this, false);
LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1); LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1);
//mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context); //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBoLLServiceStatusView1); mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBollServiceStatusView1);
mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost); mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
mWinBoLLServiceStatusView.setAuthInfo("", ""); mWinBollServiceStatusView.setAuthInfo("", "");
//llMain.addView(mDevelopHostConnectionStatusView); //llMain.addView(mDevelopHostConnectionStatusView);
llMain.addView(createAboutPage()); llMain.addView(createAboutPage());
addView(addedView); addView(addedView);
@@ -291,7 +291,7 @@ public class AboutView extends LinearLayout {
GlobalApplication.setIsDebuging(true); GlobalApplication.setIsDebuging(true);
GlobalApplication.saveDebugStatus(); GlobalApplication.saveDebugStatus();
GlobalApplication.getWinBoLLActivityManager().finishAll(); GlobalApplication.getWinBollActivityManager().finishAll();
context.startActivity(intent); context.startActivity(intent);
} }
} }
@@ -303,7 +303,7 @@ public class AboutView extends LinearLayout {
GlobalApplication.setIsDebuging(false); GlobalApplication.setIsDebuging(false);
GlobalApplication.saveDebugStatus(); GlobalApplication.saveDebugStatus();
GlobalApplication.getWinBoLLActivityManager().finishAll(); GlobalApplication.getWinBollActivityManager().finishAll();
context.startActivity(intent); context.startActivity(intent);
} }
} }
@@ -323,7 +323,7 @@ public class AboutView extends LinearLayout {
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
String szUrl = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName; String szUrl = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
// 构建包含认证信息的请求 // 构建包含认证信息的请求
String credential = ""; String credential = "";
if (GlobalApplication.isDebuging()) { if (GlobalApplication.isDebuging()) {
@@ -331,8 +331,8 @@ public class AboutView extends LinearLayout {
PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString()); PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString()); PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
} else { } else {
String username = "WinBoLL"; String username = "WinBoll";
String password = "WinBoLLPowerByZhanGSKen"; String password = "WinBollPowerByZhanGSKen";
credential = Credentials.basic(username, password); credential = Credentials.basic(username, password);
} }
@@ -384,7 +384,7 @@ public class AboutView extends LinearLayout {
YesNoAlertDialog.OnDialogResultListener mIsDownlaodUpdateListener = new YesNoAlertDialog.OnDialogResultListener() { YesNoAlertDialog.OnDialogResultListener mIsDownlaodUpdateListener = new YesNoAlertDialog.OnDialogResultListener() {
@Override @Override
public void onYes() { public void onYes() {
String szUrl = mszWinBoLLServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName; String szUrl = mszWinBollServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName;
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(szUrl)); Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(szUrl));
mContext.startActivity(browserIntent); mContext.startActivity(browserIntent);
} }

View File

@@ -11,14 +11,14 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.os.IBinder; import android.os.IBinder;
import cc.winboll.studio.libaes.winboll.WinBoLLClientService; import cc.winboll.studio.libaes.winboll.WinBollClientService;
import cc.winboll.studio.libappbase.utils.ServiceUtils; import cc.winboll.studio.libappbase.utils.ServiceUtils;
public class AssistantService extends Service { public class AssistantService extends Service {
public final static String TAG = "AssistantService"; public final static String TAG = "AssistantService";
WinBoLLClientServiceBean mWinBoLLServiceBean; WinBollClientServiceBean mWinBollServiceBean;
MyServiceConnection mMyServiceConnection; MyServiceConnection mMyServiceConnection;
volatile boolean mIsServiceRunning; volatile boolean mIsServiceRunning;
@@ -30,7 +30,7 @@ public class AssistantService extends Service {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this); mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
if (mMyServiceConnection == null) { if (mMyServiceConnection == null) {
mMyServiceConnection = new MyServiceConnection(); mMyServiceConnection = new MyServiceConnection();
} }
@@ -55,8 +55,8 @@ public class AssistantService extends Service {
// 运行服务内容 // 运行服务内容
// //
void run() { void run() {
mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this); mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
if (mWinBoLLServiceBean.isEnable()) { if (mWinBollServiceBean.isEnable()) {
if (mIsServiceRunning == false) { if (mIsServiceRunning == false) {
// 设置运行状态 // 设置运行状态
mIsServiceRunning = true; mIsServiceRunning = true;
@@ -70,11 +70,11 @@ public class AssistantService extends Service {
// 唤醒和绑定主进程 // 唤醒和绑定主进程
// //
void wakeupAndBindMain() { void wakeupAndBindMain() {
if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBoLLClientService.class.getName()) == false) { if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBollClientService.class.getName()) == false) {
startForegroundService(new Intent(AssistantService.this, WinBoLLClientService.class)); startForegroundService(new Intent(AssistantService.this, WinBollClientService.class));
} }
bindService(new Intent(AssistantService.this, WinBoLLClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT); bindService(new Intent(AssistantService.this, WinBollClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
} }
// //
@@ -87,8 +87,8 @@ public class AssistantService extends Service {
@Override @Override
public void onServiceDisconnected(ComponentName name) { public void onServiceDisconnected(ComponentName name) {
mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(AssistantService.this); mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(AssistantService.this);
if (mWinBoLLServiceBean.isEnable()) { if (mWinBollServiceBean.isEnable()) {
wakeupAndBindMain(); wakeupAndBindMain();
} }
} }

View File

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:11:27 * @Date 2025/03/28 19:11:27
* @Describe WinBoLL UI 状态图标枚举 * @Describe WinBoll UI 状态图标枚举
*/ */
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;

View File

@@ -3,15 +3,15 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:08:45 * @Date 2025/03/28 19:08:45
* @Describe WinBoLLService 服务 Binder * @Describe WinBollService 服务 Binder
*/ */
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
public interface IWinBoLLClientServiceBinder { public interface IWinBollClientServiceBinder {
public static final String TAG = "IWinBoLLClientServiceBinder"; public static final String TAG = "IWinBollClientServiceBinder";
public WinBoLLClientService getService(); public WinBollClientService getService();
public Drawable getCurrentStatusIconDrawable(); public Drawable getCurrentStatusIconDrawable();
} }

View File

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:06:54 * @Date 2025/03/28 19:06:54
* @Describe WinBoLL 客户端服务 * @Describe WinBoll 客户端服务
*/ */
import android.app.Service; import android.app.Service;
import android.content.ComponentName; import android.content.ComponentName;
@@ -19,28 +19,28 @@ import cc.winboll.studio.libappbase.utils.ServiceUtils;
import cc.winboll.studio.libapputils.utils.PrefUtils; import cc.winboll.studio.libapputils.utils.PrefUtils;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
public class WinBoLLClientService extends Service implements IWinBoLLClientServiceBinder { public class WinBollClientService extends Service implements IWinBollClientServiceBinder {
public static final String TAG = "WinBoLLClientService"; public static final String TAG = "WinBollClientService";
WinBoLLClientServiceBean mWinBoLLClientServiceBean; WinBollClientServiceBean mWinBollClientServiceBean;
MyServiceConnection mMyServiceConnection; MyServiceConnection mMyServiceConnection;
volatile boolean mIsWinBoLLClientThreadRunning; volatile boolean mIsWinBollClientThreadRunning;
volatile boolean mIsEnableService; volatile boolean mIsEnableService;
volatile WinBoLLClientThread mWinBoLLClientThread; volatile WinBollClientThread mWinBollClientThread;
public boolean isWinBoLLClientThreadRunning() { public boolean isWinBollClientThreadRunning() {
return mIsWinBoLLClientThreadRunning; return mIsWinBollClientThreadRunning;
} }
@Override @Override
public WinBoLLClientService getService() { public WinBollClientService getService() {
return WinBoLLClientService.this; return WinBollClientService.this;
} }
@Override @Override
public Drawable getCurrentStatusIconDrawable() { public Drawable getCurrentStatusIconDrawable() {
return mIsWinBoLLClientThreadRunning ? return mIsWinBollClientThreadRunning ?
getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NORMAL)) getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NORMAL))
: getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NEWS)); : getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NEWS));
} }
@@ -54,9 +54,9 @@ public class WinBoLLClientService extends Service implements IWinBoLLClientServi
public void onCreate() { public void onCreate() {
//ToastUtils.show("onCreate"); //ToastUtils.show("onCreate");
super.onCreate(); super.onCreate();
mWinBoLLClientThread = null; mWinBollClientThread = null;
mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this); mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
mIsEnableService = mWinBoLLClientServiceBean.isEnable(); mIsEnableService = mWinBollClientServiceBean.isEnable();
if (mMyServiceConnection == null) { if (mMyServiceConnection == null) {
mMyServiceConnection = new MyServiceConnection(); mMyServiceConnection = new MyServiceConnection();
@@ -74,23 +74,23 @@ public class WinBoLLClientService extends Service implements IWinBoLLClientServi
// 返回运行参数持久化存储后服务状态控制参数 // 返回运行参数持久化存储后服务状态控制参数
// 无论 Intent 传入如何服务状态一直以持久化存储后的参数控制 // 无论 Intent 传入如何服务状态一直以持久化存储后的参数控制
// PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBoLLServiceBean // PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBollServiceBean
// 不过本服务的应用方向会变得繁琐 // 不过本服务的应用方向会变得繁琐
// 现阶段只要满足手机端启动与停止本服务WinBoLL 客户端实例运行在手机端就可以了 // 现阶段只要满足手机端启动与停止本服务WinBoll 客户端实例运行在手机端就可以了
return mIsEnableService ? Service.START_STICKY: super.onStartCommand(intent, flags, startId); return mIsEnableService ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
} }
synchronized void runMainThread() { synchronized void runMainThread() {
if (mWinBoLLClientThread == null) { if (mWinBollClientThread == null) {
//ToastUtils.show("runMainThread()"); //ToastUtils.show("runMainThread()");
mWinBoLLClientThread = new WinBoLLClientThread(); mWinBollClientThread = new WinBollClientThread();
mWinBoLLClientThread.start(); mWinBollClientThread.start();
} }
} }
void syncWinBoLLClientThreadStatus() { void syncWinBollClientThreadStatus() {
mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this); mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
mIsEnableService = mWinBoLLClientServiceBean.isEnable(); mIsEnableService = mWinBollClientServiceBean.isEnable();
LogUtils.d(TAG, String.format("mIsEnableService %s", mIsEnableService)); LogUtils.d(TAG, String.format("mIsEnableService %s", mIsEnableService));
} }
@@ -99,9 +99,9 @@ public class WinBoLLClientService extends Service implements IWinBoLLClientServi
// //
void wakeupAndBindAssistant() { void wakeupAndBindAssistant() {
if (ServiceUtils.isServiceRunning(getApplicationContext(), AssistantService.class.getName()) == false) { if (ServiceUtils.isServiceRunning(getApplicationContext(), AssistantService.class.getName()) == false) {
startService(new Intent(WinBoLLClientService.this, AssistantService.class)); startService(new Intent(WinBollClientService.this, AssistantService.class));
//LogUtils.d(TAG, "call wakeupAndBindAssistant() : Binding... AssistantService"); //LogUtils.d(TAG, "call wakeupAndBindAssistant() : Binding... AssistantService");
bindService(new Intent(WinBoLLClientService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT); bindService(new Intent(WinBollClientService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
} }
} }
@@ -115,8 +115,8 @@ public class WinBoLLClientService extends Service implements IWinBoLLClientServi
@Override @Override
public void onServiceDisconnected(ComponentName name) { public void onServiceDisconnected(ComponentName name) {
mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(WinBoLLClientService.this); mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(WinBollClientService.this);
if (mWinBoLLClientServiceBean.isEnable()) { if (mWinBollClientServiceBean.isEnable()) {
// 唤醒守护进程 // 唤醒守护进程
wakeupAndBindAssistant(); wakeupAndBindAssistant();
} }
@@ -134,15 +134,15 @@ public class WinBoLLClientService extends Service implements IWinBoLLClientServi
super.onStart(intent, startId); super.onStart(intent, startId);
} }
void setWinBoLLServiceEnableStatus(boolean isEnable) { void setWinBollServiceEnableStatus(boolean isEnable) {
WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this); WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
bean.setIsEnable(isEnable); bean.setIsEnable(isEnable);
WinBoLLClientServiceBean.saveWinBoLLServiceBean(this, bean); WinBollClientServiceBean.saveWinBollServiceBean(this, bean);
} }
boolean getWinBoLLServiceEnableStatus(Context context) { boolean getWinBollServiceEnableStatus(Context context) {
mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(context); mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(context);
return mWinBoLLClientServiceBean.isEnable(); return mWinBollClientServiceBean.isEnable();
} }
/*public interface OnServiceStatusChangeListener { /*public interface OnServiceStatusChangeListener {
@@ -153,24 +153,24 @@ public class WinBoLLClientService extends Service implements IWinBoLLClientServi
mOnServerStatusChangeListener = l; mOnServerStatusChangeListener = l;
}*/ }*/
class WinBoLLClientThread extends Thread { class WinBollClientThread extends Thread {
@Override @Override
public void run() { public void run() {
super.run(); super.run();
LogUtils.d(TAG, "run syncWinBoLLClientThreadStatus"); LogUtils.d(TAG, "run syncWinBollClientThreadStatus");
syncWinBoLLClientThreadStatus(); syncWinBollClientThreadStatus();
if (mIsEnableService) { if (mIsEnableService) {
if (mIsWinBoLLClientThreadRunning == false) { if (mIsWinBollClientThreadRunning == false) {
// 设置运行状态 // 设置运行状态
mIsWinBoLLClientThreadRunning = true; mIsWinBollClientThreadRunning = true;
LogUtils.d(TAG, "WinBoLLClientThread run()"); LogUtils.d(TAG, "WinBollClientThread run()");
// 唤醒守护进程 // 唤醒守护进程
//wakeupAndBindAssistant(); //wakeupAndBindAssistant();
while (mIsEnableService) { while (mIsEnableService) {
// 显示运行状态 // 显示运行状态
WinBoLLServiceStatusView.startConnection(); WinBollServiceStatusView.startConnection();
LogUtils.d(TAG, String.format("while mIsEnableService is %s", mIsEnableService)); LogUtils.d(TAG, String.format("while mIsEnableService is %s", mIsEnableService));
try { try {
@@ -178,13 +178,13 @@ public class WinBoLLClientService extends Service implements IWinBoLLClientServi
} catch (InterruptedException e) { } catch (InterruptedException e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
} }
syncWinBoLLClientThreadStatus(); syncWinBollClientThreadStatus();
} }
// 服务进程退出, 重置进程运行状态 // 服务进程退出, 重置进程运行状态
WinBoLLServiceStatusView.stopConnection(); WinBollServiceStatusView.stopConnection();
mIsWinBoLLClientThreadRunning = false; mIsWinBollClientThreadRunning = false;
mWinBoLLClientThread = null; mWinBollClientThread = null;
} }
} }
} }

View File

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:05:15 * @Date 2025/03/28 19:05:15
* @Describe WinBoLLService 运行参数配置 * @Describe WinBollService 运行参数配置
*/ */
import android.content.Context; import android.content.Context;
import android.util.JsonReader; import android.util.JsonReader;
@@ -11,13 +11,13 @@ import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.BaseBean;
import java.io.IOException; import java.io.IOException;
public class WinBoLLClientServiceBean extends BaseBean { public class WinBollClientServiceBean extends BaseBean {
public static final String TAG = "WinBoLLClientServiceBean"; public static final String TAG = "WinBollClientServiceBean";
volatile boolean isEnable; volatile boolean isEnable;
public WinBoLLClientServiceBean() { public WinBollClientServiceBean() {
isEnable = false; isEnable = false;
} }
@@ -31,13 +31,13 @@ public class WinBoLLClientServiceBean extends BaseBean {
@Override @Override
public String getName() { public String getName() {
return WinBoLLClientServiceBean.class.getName(); return WinBollClientServiceBean.class.getName();
} }
@Override @Override
public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException { public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
super.writeThisToJsonWriter(jsonWriter); super.writeThisToJsonWriter(jsonWriter);
WinBoLLClientServiceBean bean = this; WinBollClientServiceBean bean = this;
jsonWriter.name("isEnable").value(bean.isEnable()); jsonWriter.name("isEnable").value(bean.isEnable());
} }
@@ -67,12 +67,12 @@ public class WinBoLLClientServiceBean extends BaseBean {
return this; return this;
} }
public static WinBoLLClientServiceBean loadWinBoLLClientServiceBean(Context context) { public static WinBollClientServiceBean loadWinBollClientServiceBean(Context context) {
WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadBean(context, WinBoLLClientServiceBean.class); WinBollClientServiceBean bean = WinBollClientServiceBean.loadBean(context, WinBollClientServiceBean.class);
return bean == null ? new WinBoLLClientServiceBean() : bean; return bean == null ? new WinBollClientServiceBean() : bean;
} }
public static boolean saveWinBoLLServiceBean(WinBoLLClientService service, WinBoLLClientServiceBean bean) { public static boolean saveWinBollServiceBean(WinBollClientService service, WinBollClientServiceBean bean) {
return WinBoLLClientServiceBean.saveBean(service, bean); return WinBollClientServiceBean.saveBean(service, bean);
} }
} }

View File

@@ -3,15 +3,15 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:13:20 * @Date 2025/03/28 19:13:20
* @Describe WinBoLL 邮件服务 * @Describe WinBoll 邮件服务
*/ */
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
public class WinBoLLMail extends Service { public class WinBollMail extends Service {
public static final String TAG = "WinBoLLMail"; public static final String TAG = "WinBollMail";
@Override @Override
public IBinder onBind(Intent intent) { public IBinder onBind(Intent intent) {

View File

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/29 15:57:28 * @Date 2025/03/29 15:57:28
* @Describe WinBoLL 服务器服务情况测试访问进程 * @Describe WinBoll 服务器服务情况测试访问进程
*/ */
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import java.io.IOException; import java.io.IOException;
@@ -20,9 +20,9 @@ interface TextCallback {
void onFailure(Exception e); void onFailure(Exception e);
} }
public class WinBoLLServerConnectionThread extends Thread { public class WinBollServerConnectionThread extends Thread {
public static final String TAG = "WinBoLLClientService"; public static final String TAG = "WinBollClientService";
private final String url; private final String url;
private final String username; private final String username;
@@ -33,12 +33,12 @@ public class WinBoLLServerConnectionThread extends Thread {
private final TextCallback callback; // 新增回调成员变量 private final TextCallback callback; // 新增回调成员变量
// 新增带回调的构造函数 // 新增带回调的构造函数
public WinBoLLServerConnectionThread(String url, String username, String password, TextCallback callback) { public WinBollServerConnectionThread(String url, String username, String password, TextCallback callback) {
this(url, username, password, 10000, 10000, 5, callback); this(url, username, password, 10000, 10000, 5, callback);
} }
// 修改原有构造函数添加回调参数 // 修改原有构造函数添加回调参数
public WinBoLLServerConnectionThread(String url, String username, String password, public WinBollServerConnectionThread(String url, String username, String password,
int connectTimeout, int readTimeout, int maxRetries, TextCallback callback) { int connectTimeout, int readTimeout, int maxRetries, TextCallback callback) {
this.url = url; this.url = url;
this.username = username; this.username = username;

View File

@@ -3,9 +3,8 @@ package cc.winboll.studio.libaes.winboll;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 17:41:55 * @Date 2025/03/28 17:41:55
* @Describe WinBoLL 服务主机连接状态视图 * @Describe WinBoll 服务主机连接状态视图
*/ */
import cc.winboll.studio.libaes.R;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -19,9 +18,10 @@ import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import cc.winboll.studio.libaes.winboll.WinBoLLClientService; import cc.winboll.studio.libaes.winboll.WinBollClientService;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libapputils.R;
import cc.winboll.studio.libapputils.utils.PrefUtils; import cc.winboll.studio.libapputils.utils.PrefUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@@ -32,23 +32,23 @@ import java.time.format.DateTimeFormatter;
//import okhttp3.Response; //import okhttp3.Response;
//import okhttp3.Route; //import okhttp3.Route;
public class WinBoLLServiceStatusView extends LinearLayout { public class WinBollServiceStatusView extends LinearLayout {
public static final String TAG = "WinBoLLServiceStatusView"; public static final String TAG = "WinBollServiceStatusView";
public static final int MSG_CONNECTION_INFO = 0; public static final int MSG_CONNECTION_INFO = 0;
public static final int MSG_UPDATE_CONNECTION_STATUS = 1; public static final int MSG_UPDATE_CONNECTION_STATUS = 1;
static WinBoLLServiceStatusView _WinBoLLServiceStatusView; static WinBollServiceStatusView _WinBollServiceStatusView;
Context mContext; Context mContext;
//boolean mIsConnected; //boolean mIsConnected;
volatile ConnectionThread mConnectionThread; volatile ConnectionThread mConnectionThread;
String mszServerHost; String mszServerHost;
WinBoLLClientService mWinBoLLService; WinBollClientService mWinBollService;
ImageView mImageView; ImageView mImageView;
TextView mTextView; TextView mTextView;
WinBoLLServiceViewHandler mWinBoLLServiceViewHandler; WinBollServiceViewHandler mWinBollServiceViewHandler;
//WebView mWebView; //WebView mWebView;
static volatile ConnectionStatus mConnectionStatus; static volatile ConnectionStatus mConnectionStatus;
View.OnClickListener mViewOnClickListener; View.OnClickListener mViewOnClickListener;
@@ -66,11 +66,11 @@ public class WinBoLLServiceStatusView extends LinearLayout {
ServiceConnection connection = new ServiceConnection() { ServiceConnection connection = new ServiceConnection() {
@Override @Override
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
IWinBoLLClientServiceBinder binder = (IWinBoLLClientServiceBinder) service; IWinBollClientServiceBinder binder = (IWinBollClientServiceBinder) service;
mWinBoLLService = binder.getService(); mWinBollService = binder.getService();
isBound = true; isBound = true;
// 可以在这里调用Service的方法进行通信比如获取数据 // 可以在这里调用Service的方法进行通信比如获取数据
mImageView.setBackgroundDrawable(mWinBoLLService.getCurrentStatusIconDrawable()); mImageView.setBackgroundDrawable(mWinBollService.getCurrentStatusIconDrawable());
} }
@Override @Override
@@ -79,25 +79,25 @@ public class WinBoLLServiceStatusView extends LinearLayout {
} }
}; };
public WinBoLLServiceStatusView(Context context) { public WinBollServiceStatusView(Context context) {
super(context); super(context);
mContext = context; mContext = context;
initView(); initView();
} }
public WinBoLLServiceStatusView(Context context, AttributeSet attrs) { public WinBollServiceStatusView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
mContext = context; mContext = context;
initView(); initView();
} }
public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) { public WinBollServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
mContext = context; mContext = context;
initView(); initView();
} }
public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { public WinBollServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
mContext = context; mContext = context;
initView(); initView();
@@ -110,13 +110,13 @@ public class WinBoLLServiceStatusView extends LinearLayout {
} }
void initView() { void initView() {
_WinBoLLServiceStatusView = this; _WinBollServiceStatusView = this;
mImageView = new ImageView(mContext); mImageView = new ImageView(mContext);
setImageViewByConnection(mImageView, false); setImageViewByConnection(mImageView, false);
mConnectionStatus = getConnectionStatus(); mConnectionStatus = getConnectionStatus();
//mIsConnected = false; //mIsConnected = false;
//mWinBoLLServerHostConnectionStatus = WinBoLLServerHostConnectionStatus.DISCONNECTED; //mWinBollServerHostConnectionStatus = WinBollServerHostConnectionStatus.DISCONNECTED;
//ToastUtils.show("initView()"); //ToastUtils.show("initView()");
mViewOnClickListener = new View.OnClickListener(){ mViewOnClickListener = new View.OnClickListener(){
@@ -125,10 +125,10 @@ public class WinBoLLServiceStatusView extends LinearLayout {
LogUtils.d(TAG, "onClick()"); LogUtils.d(TAG, "onClick()");
if (mConnectionStatus == ConnectionStatus.CONNECTED) { if (mConnectionStatus == ConnectionStatus.CONNECTED) {
LogUtils.d(TAG, "Click to stop service."); LogUtils.d(TAG, "Click to stop service.");
WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext); WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
bean.setIsEnable(false); bean.setIsEnable(false);
WinBoLLClientServiceBean.saveBean(mContext, bean); WinBollClientServiceBean.saveBean(mContext, bean);
Intent intent = new Intent(mContext, WinBoLLClientService.class); Intent intent = new Intent(mContext, WinBollClientService.class);
mContext.stopService(intent); mContext.stopService(intent);
//stopConnectionThread(); //stopConnectionThread();
mTextView.setText(""); mTextView.setText("");
@@ -136,10 +136,10 @@ public class WinBoLLServiceStatusView extends LinearLayout {
mConnectionStatus = ConnectionStatus.DISCONNECTED; mConnectionStatus = ConnectionStatus.DISCONNECTED;
} else if (mConnectionStatus == ConnectionStatus.DISCONNECTED) { } else if (mConnectionStatus == ConnectionStatus.DISCONNECTED) {
LogUtils.d(TAG, "Click to start service."); LogUtils.d(TAG, "Click to start service.");
WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext); WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
bean.setIsEnable(true); bean.setIsEnable(true);
WinBoLLClientServiceBean.saveBean(mContext, bean); WinBollClientServiceBean.saveBean(mContext, bean);
Intent intent = new Intent(mContext, WinBoLLClientService.class); Intent intent = new Intent(mContext, WinBollClientService.class);
mContext.startService(intent); mContext.startService(intent);
//startConnectionThread(); //startConnectionThread();
} }
@@ -148,7 +148,7 @@ public class WinBoLLServiceStatusView extends LinearLayout {
setOnClickListener(mViewOnClickListener); setOnClickListener(mViewOnClickListener);
addView(mImageView); addView(mImageView);
mTextView = new TextView(mContext); mTextView = new TextView(mContext);
mWinBoLLServiceViewHandler = new WinBoLLServiceViewHandler(this); mWinBollServiceViewHandler = new WinBollServiceViewHandler(this);
addView(mTextView); addView(mTextView);
/*mWebView = new WebView(mContext); /*mWebView = new WebView(mContext);
mWebView.setWebViewClient(new WebViewClient() { mWebView.setWebViewClient(new WebViewClient() {
@@ -161,8 +161,8 @@ public class WinBoLLServiceStatusView extends LinearLayout {
addView(mWebView);*/ addView(mWebView);*/
} }
void checkWinBoLLServerStatusAndUpdateCurrentView() { void checkWinBollServerStatusAndUpdateCurrentView() {
LogUtils.d(TAG, "checkWinBoLLServerStatusAndUpdateCurrentView()"); LogUtils.d(TAG, "checkWinBollServerStatusAndUpdateCurrentView()");
/*if (getConnectionStatus() == ConnectionStatus.CONNECTED) { /*if (getConnectionStatus() == ConnectionStatus.CONNECTED) {
mConnectionStatus = ConnectionStatus.CONNECTED; mConnectionStatus = ConnectionStatus.CONNECTED;
} else { } else {
@@ -170,8 +170,8 @@ public class WinBoLLServiceStatusView extends LinearLayout {
}*/ }*/
} }
public void setServerHost(String szWinBoLLServerHost) { public void setServerHost(String szWinBollServerHost) {
mszServerHost = szWinBoLLServerHost; mszServerHost = szWinBollServerHost;
} }
public void setAuthInfo(String username, String password) { public void setAuthInfo(String username, String password) {
@@ -216,8 +216,8 @@ public class WinBoLLServiceStatusView extends LinearLayout {
// 按照指定格式格式化时间并输出 // 按照指定格式格式化时间并输出
String formattedDateTime = now.format(formatter); String formattedDateTime = now.format(formatter);
String msg = "ClientIP<" + formattedDateTime + ">: " + text; String msg = "ClientIP<" + formattedDateTime + ">: " + text;
mWinBoLLServiceViewHandler.postMessageText(msg); mWinBollServiceViewHandler.postMessageText(msg);
mWinBoLLServiceViewHandler.postMessageConnectionStatus(true); mWinBollServiceViewHandler.postMessageConnectionStatus(true);
} }
@@ -227,8 +227,8 @@ public class WinBoLLServiceStatusView extends LinearLayout {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
// 处理网络请求失败 // 处理网络请求失败
setImageViewByConnection(mImageView, false); setImageViewByConnection(mImageView, false);
mWinBoLLServiceViewHandler.postMessageText(e.getMessage()); mWinBollServiceViewHandler.postMessageText(e.getMessage());
mWinBoLLServiceViewHandler.postMessageConnectionStatus(false); mWinBollServiceViewHandler.postMessageConnectionStatus(false);
} }
}; };
@@ -249,12 +249,12 @@ public class WinBoLLServiceStatusView extends LinearLayout {
username = PrefUtils.getString(mContext, "metDevUserName", ""); username = PrefUtils.getString(mContext, "metDevUserName", "");
password = PrefUtils.getString(mContext, "metDevUserPassword", ""); password = PrefUtils.getString(mContext, "metDevUserPassword", "");
} else { } else {
username = "WinBoLL"; username = "WinBoll";
password = "WinBoLLPowerByZhanGSKen"; password = "WinBollPowerByZhanGSKen";
} }
LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl)); LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl));
WinBoLLServerConnectionThread thread = new WinBoLLServerConnectionThread( WinBollServerConnectionThread thread = new WinBollServerConnectionThread(
targetUrl, targetUrl,
username, username,
password, password,
@@ -263,7 +263,7 @@ public class WinBoLLServiceStatusView extends LinearLayout {
thread.start(); thread.start();
} }
/*void requestWithBasicAuth(final WinBoLLServiceViewHandler textViewHandler, String targetUrl, final String username, final String password) { /*void requestWithBasicAuth(final WinBollServiceViewHandler textViewHandler, String targetUrl, final String username, final String password) {
// 用户名和密码替换为实际的认证信息 // 用户名和密码替换为实际的认证信息
//String username = "your_username"; //String username = "your_username";
//String password = "your_password"; //String password = "your_password";
@@ -350,10 +350,10 @@ public class WinBoLLServiceStatusView extends LinearLayout {
}*/ }*/
class WinBoLLServiceViewHandler extends Handler { class WinBollServiceViewHandler extends Handler {
WinBoLLServiceStatusView mDevelopHostConnectionStatusView; WinBollServiceStatusView mDevelopHostConnectionStatusView;
public WinBoLLServiceViewHandler(WinBoLLServiceStatusView view) { public WinBollServiceViewHandler(WinBollServiceStatusView view) {
mDevelopHostConnectionStatusView = view; mDevelopHostConnectionStatusView = view;
} }
@@ -384,14 +384,14 @@ public class WinBoLLServiceStatusView extends LinearLayout {
} }
public static void startConnection() { public static void startConnection() {
if (_WinBoLLServiceStatusView != null) { if (_WinBollServiceStatusView != null) {
_WinBoLLServiceStatusView.startConnectionThread(); _WinBollServiceStatusView.startConnectionThread();
} }
} }
public static void stopConnection() { public static void stopConnection() {
if (_WinBoLLServiceStatusView != null) { if (_WinBollServiceStatusView != null) {
_WinBoLLServiceStatusView.stopConnectionThread(); _WinBollServiceStatusView.stopConnectionThread();
} }
} }
@@ -448,7 +448,7 @@ public class WinBoLLServiceStatusView extends LinearLayout {
requestCIPWithBasicAuth(); requestCIPWithBasicAuth();
} else if (mConnectionStatus == ConnectionStatus.CONNECTED } else if (mConnectionStatus == ConnectionStatus.CONNECTED
|| mConnectionStatus == ConnectionStatus.DISCONNECTED) { || mConnectionStatus == ConnectionStatus.DISCONNECTED) {
//ToastUtils.show("mWinBoLLServerHostConnectionStatus " + mConnectionStatus); //ToastUtils.show("mWinBollServerHostConnectionStatus " + mConnectionStatus);
LogUtils.d(TAG, String.format("mConnectionStatus done %s", mConnectionStatus)); LogUtils.d(TAG, String.format("mConnectionStatus done %s", mConnectionStatus));
} else { } else {
LogUtils.d(TAG, String.format("mConnectionStatus unknow %s", mConnectionStatus)); LogUtils.d(TAG, String.format("mConnectionStatus unknow %s", mConnectionStatus));
@@ -465,7 +465,7 @@ public class WinBoLLServiceStatusView extends LinearLayout {
} }
} }
/*WinBoLLService.OnServiceStatusChangeListener mOnServerStatusChangeListener = new WinBoLLService.OnServiceStatusChangeListener(){ /*WinBollService.OnServiceStatusChangeListener mOnServerStatusChangeListener = new WinBollService.OnServiceStatusChangeListener(){
@Override @Override
public void onServerStatusChange(boolean isServiceAlive) { public void onServerStatusChange(boolean isServiceAlive) {
} }

View File

@@ -53,10 +53,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView <cc.winboll.studio.libaes.winboll.WinBollServiceStatusView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/viewaboutdevWinBoLLServiceStatusView1"/> android:id="@+id/viewaboutdevWinBollServiceStatusView1"/>
</LinearLayout> </LinearLayout>

View File

@@ -12,10 +12,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView <cc.winboll.studio.libaes.winboll.WinBollServiceStatusView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/viewaboutwwwWinBoLLServiceStatusView1"/> android:id="@+id/viewaboutwwwWinBollServiceStatusView1"/>
</LinearLayout> </LinearLayout>

View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:background="@drawable/toast_frame"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textStyle="bold"
android:textColor="#FFFFFFFF"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_launcher"/>
<TextView
android:id="@android:id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textColor="#FFFFFFFF"/>
</LinearLayout>
</LinearLayout>

View File

@@ -2,7 +2,7 @@
<resources> <resources>
<string name="lib_name">libaes</string> <string name="lib_name">libaes</string>
<string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考请勿直接引用。(WinBoLL APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string> <string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考请勿直接引用。(WinBoll APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string>
<string name="lib_home">https://winboll.cc/aes</string> <string name="lib_home">https://winboll.cc/aes</string>
<string name="text_about">关于</string> <string name="text_about">关于</string>
<string name="text_AppTheme">应用主题</string> <string name="text_AppTheme">应用主题</string>

View File

@@ -2,7 +2,7 @@
<resources> <resources>
<string name="lib_name">libaes</string> <string name="lib_name">libaes</string>
<string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考请勿直接引用。(WinBoLL APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string> <string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考请勿直接引用。(WinBoll APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string>
<string name="lib_home">https://winboll.cc/libaes</string> <string name="lib_home">https://winboll.cc/libaes</string>
<string name="text_about">About</string> <string name="text_about">About</string>
<string name="text_AppTheme">AppTheme</string> <string name="text_AppTheme">AppTheme</string>

View File

@@ -22,25 +22,4 @@ android {
dependencies { dependencies {
api fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
// Android 类库
//api 'com.android.support:appcompat-v7:28.0.0'
api('com.android.support:appcompat-v7:28.0.0'){
//exclude group: "com.android.support", module: "support-vector-drawable"
exclude group: "com.android.support:animated-vector-drawable:28.0.0"
}
// https://mvnrepository.com/artifact/com.android.support/support-compat
//api 'com.android.support:support-compat:28.0.0' // 保留原有依赖(可选)
// https://mvnrepository.com/artifact/com.android.support/support-v4
api 'com.android.support:support-v4:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-media-compat
api 'com.android.support:support-media-compat:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-core-utils
api 'com.android.support:support-core-utils:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-core-ui
api 'com.android.support:support-core-ui:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-fragment
api 'com.android.support:support-fragment:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
api 'com.android.support:recyclerview-v7:28.0.0'
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Tue Apr 29 04:20:48 GMT 2025 #Tue Apr 29 13:40:21 HKT 2025
stageCount=4 stageCount=6
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.7 baseVersion=15.7
publishVersion=15.7.3 publishVersion=15.7.5
buildCount=5 buildCount=0
baseBetaVersion=15.7.4 baseBetaVersion=15.7.6

View File

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

View File

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

View File

@@ -7,7 +7,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/viewglobalcrashreportLinearLayout1"> android:id="@+id/viewglobalcrashreportLinearLayout1">
<android.support.v7.widget.Toolbar <android.widget.Toolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/viewglobalcrashreportToolbar1"/> android:id="@+id/viewglobalcrashreportToolbar1"/>

View File

@@ -1,25 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/item_minimal" android:id="@+id/item_minimal"
android:title="MINIMAL" android:title="MINIMAL"
android:icon="@drawable/ic_winboll_point" android:icon="@drawable/ic_winboll_point"/>
app:showAsAction="always"/>
<item <item
android:id="@+id/item_about" android:id="@+id/item_about"
android:title="ABOUT" android:title="ABOUT"
android:icon="@drawable/ic_winboll_logo" android:icon="@drawable/ic_winboll_logo"/>
app:showAsAction="always"/>
<item <item
android:id="@+id/item_help" android:id="@+id/item_help"
android:title="HELP" android:title="HELP"
android:icon="@drawable/ic_winboll_help" android:icon="@drawable/ic_winboll_help"/>
app:showAsAction="always"/>
<item <item
android:id="@+id/item_log" android:id="@+id/item_log"
android:title="LOG" android:title="LOG"
android:icon="@drawable/ic_winboll_log" android:icon="@drawable/ic_winboll_log"/>
app:showAsAction="always"/>
</menu> </menu>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="APPBaseTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
<item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item> <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
</style> </style>

View File

@@ -9,7 +9,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 30
} }
buildTypes { buildTypes {
release { release {
@@ -21,28 +21,7 @@ android {
dependencies { dependencies {
api fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
// Android 类库 api 'cc.winboll.studio:libappbase:15.7.5'
//api 'com.android.support:appcompat-v7:28.0.0'
api('com.android.support:appcompat-v7:28.0.0'){
//exclude group: "com.android.support", module: "support-vector-drawable"
exclude group: "com.android.support:animated-vector-drawable:28.0.0"
}
// https://mvnrepository.com/artifact/com.android.support/support-compat
//api 'com.android.support:support-compat:28.0.0' // 保留原有依赖(可选)
// https://mvnrepository.com/artifact/com.android.support/support-v4
api 'com.android.support:support-v4:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-media-compat
api 'com.android.support:support-media-compat:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-core-utils
api 'com.android.support:support-core-utils:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-core-ui
api 'com.android.support:support-core-ui:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-fragment
api 'com.android.support:support-fragment:28.0.0'
// 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 'com.google.zxing:core:3.4.1' api 'com.google.zxing:core:3.4.1'

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:39 HKT 2025 #Tue Apr 29 14:07:52 HKT 2025
stageCount=2 stageCount=4
libraryProject=libapputils libraryProject=libapputils
baseVersion=15.2 baseVersion=15.3
publishVersion=15.2.1 publishVersion=15.3.3
buildCount=0 buildCount=0
baseBetaVersion=15.2.2 baseBetaVersion=15.3.4

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="AppTheme" parent="@android:style/Theme.Material.Light"> <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
</style> </style>
</resources> </resources>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="UtilsTheme" parent="APPBaseTheme"> <style name="UtilsTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
</style> </style>
</resources> </resources>