diff --git a/aes/build.gradle b/aes/build.gradle
index 13025d9..40db0a1 100644
--- a/aes/build.gradle
+++ b/aes/build.gradle
@@ -24,12 +24,12 @@ android {
defaultConfig {
applicationId "cc.winboll.studio.aes"
minSdkVersion 24
- targetSdkVersion 29
+ targetSdkVersion 30
versionCode 1
// versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
- versionName "15.2"
+ versionName "15.6"
if(true) {
versionName = genVersionName("${versionName}")
}
diff --git a/aes/build.properties b/aes/build.properties
index 6c6ad79..ec4f107 100644
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:14:05 HKT 2025
-stageCount=7
+#Tue Apr 29 15:14:41 HKT 2025
+stageCount=1
libraryProject=libaes
-baseVersion=15.2
-publishVersion=15.2.6
+baseVersion=15.6
+publishVersion=15.6.0
buildCount=0
-baseBetaVersion=15.2.7
+baseBetaVersion=15.6.1
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 bc1ff3b..228cd19 100644
--- a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java
@@ -10,14 +10,13 @@ import android.content.Context;
import android.os.Bundle;
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.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";
@@ -64,13 +63,13 @@ public class AboutActivity extends WinBollActivity implements IWinBollActivity {
);
layout.addView(aboutView, params);
- GlobalApplication.getWinBollActivityManager().add(this);
+ GlobalApplication.getWinBoLLActivityManager().add(this);
}
@Override
protected void onDestroy() {
super.onDestroy();
- GlobalApplication.getWinBollActivityManager().registeRemove(this);
+ GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
}
public AboutView CreateAboutView() {
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 2dc8e06..b656adb 100644
--- a/aes/src/main/java/cc/winboll/studio/aes/App.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/App.java
@@ -8,6 +8,7 @@ package cc.winboll.studio.aes;
import android.view.Gravity;
import cc.winboll.studio.libappbase.GlobalApplication;
import com.hjq.toast.ToastUtils;
+import com.hjq.toast.style.WhiteToastStyle;
public class App extends GlobalApplication {
@@ -21,8 +22,8 @@ public class App extends GlobalApplication {
// 初始化 Toast 框架
ToastUtils.init(this);
// 设置 Toast 布局样式
- ToastUtils.setView(R.layout.view_toast);
- //ToastUtils.setStyle(new WhiteToastStyle());
+ //ToastUtils.setView(R.layout.view_toast);
+ ToastUtils.setStyle(new WhiteToastStyle());
ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
}
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 7d76e83..73fcd02 100644
--- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
@@ -25,12 +25,12 @@ 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.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
import com.a4455jkjh.colorpicker.ColorPickerDialog;
import com.hjq.toast.ToastUtils;
import java.util.ArrayList;
-public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
public static final String TAG = "MainActivity";
@@ -123,7 +123,7 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi
public boolean onOptionsItemSelected(MenuItem item) {
int nItemId = item.getItemId();
// if (item.getItemId() == R.id.item_log) {
-// WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
+// WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
// } else
if (nItemId == R.id.item_atoast) {
Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
diff --git a/aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java b/aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java
similarity index 86%
rename from aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java
rename to aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java
index a15318d..af25247 100644
--- a/aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java
@@ -5,17 +5,17 @@ import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import cc.winboll.studio.libaes.beans.AESThemeBean;
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;
/**
* @Author ZhanGSKen@AliYun.Com
* @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;
diff --git a/libaes/build.gradle b/libaes/build.gradle
index 6056965..84124b2 100644
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -9,7 +9,7 @@ android {
defaultConfig {
minSdkVersion 24
- targetSdkVersion 29
+ targetSdkVersion 30
}
buildTypes {
release {
@@ -45,12 +45,12 @@ dependencies {
api 'com.squareup.okhttp3:okhttp:4.4.1'
// AndroidX 类库
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.vectordrawable:vectordrawable:1.1.0'
//api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
//api 'androidx.fragment:fragment:1.1.0'
- api 'cc.winboll.studio:libapputils:15.2.2'
- api 'cc.winboll.studio:libappbase:15.2.2'
+ api 'cc.winboll.studio:libapputils:15.3.4'
+ api 'cc.winboll.studio:libappbase:15.7.6'
}
diff --git a/libaes/build.properties b/libaes/build.properties
index 740a6cf..83303dd 100644
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:13:53 HKT 2025
-stageCount=7
+#Tue Apr 29 15:14:21 HKT 2025
+stageCount=1
libraryProject=libaes
-baseVersion=15.2
-publishVersion=15.2.6
+baseVersion=15.6
+publishVersion=15.6.0
buildCount=0
-baseBetaVersion=15.2.7
+baseBetaVersion=15.6.1
diff --git a/libaes/src/main/AndroidManifest.xml b/libaes/src/main/AndroidManifest.xml
index 33e8010..d8cbd79 100644
--- a/libaes/src/main/AndroidManifest.xml
+++ b/libaes/src/main/AndroidManifest.xml
@@ -17,13 +17,13 @@
-
-
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 b353823..9698899 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
@@ -29,11 +29,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libaes.views.ADrawerMenuListView;
import cc.winboll.studio.libappbase.GlobalApplication;
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 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";
@@ -177,7 +177,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
getString(i);
}
} else if (R.id.item_log == item.getItemId()) {
- GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+ 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/unittests/SecondaryLibraryActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java
index 42cdef8..664a07d 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,14 +7,14 @@ 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.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
/**
* @Author ZhanGSKen@QQ.COM
* @Date 2024/06/15 00:58:10
* @Describe 第二级窗口
*/
-public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
public static final String TAG = "SecondaryLibraryActivity";
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 1ba071d..5fcfa97 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
@@ -11,9 +11,9 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.libaes.R;
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";
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java
index 2aa4f4d..02af7f9 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java
@@ -10,9 +10,9 @@ import android.os.Bundle;
import android.widget.Toolbar;
import cc.winboll.studio.libaes.R;
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";
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 2646e1c..bbfecd2 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
@@ -11,16 +11,15 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.Toast;
-import android.widget.Toolbar;
import androidx.fragment.app.Fragment;
import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
import cc.winboll.studio.libaes.beans.DrawerMenuBean;
import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
import java.util.ArrayList;
-public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
@Override
public Activity getActivity() {
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
index 1ed8022..5caab19 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
@@ -41,7 +41,7 @@ public class AESThemeUtil {
activity.setTheme(getThemeTypeID(activity));
}
- /*public static void applyWinBollTheme(T activity) {
+ /*public static void applyWinBoLLTheme(T activity) {
activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
}*/
@@ -53,7 +53,7 @@ public class AESThemeUtil {
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
}
- /*public static void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+ /*public static void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) {
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
}*/
@@ -65,7 +65,7 @@ public class AESThemeUtil {
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
}
- /*public static void inflateWinBollMenu(T activity, Menu menu) {
+ /*public static void inflateWinBoLLMenu(T activity, Menu menu) {
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
}*/
@@ -131,7 +131,7 @@ public class AESThemeUtil {
return false;
}
- public static boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
+ public static boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
int nThemeStyleID;
if (R.id.item_depththeme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
@@ -162,7 +162,7 @@ public class AESThemeUtil {
return false;
}
- public static boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
+ public static boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
int nThemeStyleID;
if (R.id.item_depththeme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java
index 991b8ef..1765310 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java
@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/24 15:08:52
- * @Describe WinBoll应用介绍视图
+ * @Describe WinBoLL应用介绍视图
*/
import android.content.Context;
import android.content.Intent;
@@ -43,7 +43,7 @@ public class AboutView extends LinearLayout {
Context mContext;
APPInfo mAPPInfo;
- WinBollServiceStatusView mWinBollServiceStatusView;
+ WinBoLLServiceStatusView mWinBoLLServiceStatusView;
OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
String mszAppName = "";
String mszAppAPKFolderName = "";
@@ -57,7 +57,7 @@ public class AboutView extends LinearLayout {
String mszHomePage = "";
String mszGitea = "";
int mnAppIcon = 0;
- String mszWinBollServerHost;
+ String mszWinBoLLServerHost;
String mszReleaseAPKName;
EditText metDevUserName;
EditText metDevUserPassword;
@@ -107,7 +107,7 @@ public class AboutView extends LinearLayout {
mszAppDescription = mAPPInfo.getAppDescription();
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 {
mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
@@ -115,7 +115,7 @@ public class AboutView extends LinearLayout {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
}
mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
- mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
+ mszHomePage = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
if (mAPPInfo.getAppGitAPPBranch().equals("")) {
mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName;
} else {
@@ -132,9 +132,9 @@ public class AboutView extends LinearLayout {
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());
+ 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);
@@ -143,9 +143,9 @@ public class AboutView extends LinearLayout {
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("", "");
+ mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBoLLServiceStatusView1);
+ mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost);
+ mWinBoLLServiceStatusView.setAuthInfo("", "");
//llMain.addView(mDevelopHostConnectionStatusView);
llMain.addView(createAboutPage());
addView(addedView);
@@ -291,7 +291,7 @@ public class AboutView extends LinearLayout {
GlobalApplication.setIsDebuging(true);
GlobalApplication.saveDebugStatus();
- GlobalApplication.getWinBollActivityManager().finishAll();
+ GlobalApplication.getWinBoLLActivityManager().finishAll();
context.startActivity(intent);
}
}
@@ -303,7 +303,7 @@ public class AboutView extends LinearLayout {
GlobalApplication.setIsDebuging(false);
GlobalApplication.saveDebugStatus();
- GlobalApplication.getWinBollActivityManager().finishAll();
+ GlobalApplication.getWinBoLLActivityManager().finishAll();
context.startActivity(intent);
}
}
@@ -323,7 +323,7 @@ public class AboutView extends LinearLayout {
new Thread(new Runnable() {
@Override
public void run() {
- String szUrl = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
+ String szUrl = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
// 构建包含认证信息的请求
String credential = "";
if (GlobalApplication.isDebuging()) {
@@ -331,8 +331,8 @@ public class AboutView extends LinearLayout {
PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
} else {
- String username = "WinBoll";
- String password = "WinBollPowerByZhanGSKen";
+ String username = "WinBoLL";
+ String password = "WinBoLLPowerByZhanGSKen";
credential = Credentials.basic(username, password);
}
@@ -384,7 +384,7 @@ public class AboutView extends LinearLayout {
YesNoAlertDialog.OnDialogResultListener mIsDownlaodUpdateListener = new YesNoAlertDialog.OnDialogResultListener() {
@Override
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));
mContext.startActivity(browserIntent);
}
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
index 9f1e48a..f2f8028 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java
@@ -11,14 +11,14 @@ import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
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;
public class AssistantService extends Service {
public final static String TAG = "AssistantService";
- WinBollClientServiceBean mWinBollServiceBean;
+ WinBoLLClientServiceBean mWinBoLLServiceBean;
MyServiceConnection mMyServiceConnection;
volatile boolean mIsServiceRunning;
@@ -30,7 +30,7 @@ public class AssistantService extends Service {
@Override
public void onCreate() {
super.onCreate();
- mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+ mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
if (mMyServiceConnection == null) {
mMyServiceConnection = new MyServiceConnection();
}
@@ -55,8 +55,8 @@ public class AssistantService extends Service {
// 运行服务内容
//
void run() {
- mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
- if (mWinBollServiceBean.isEnable()) {
+ mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+ if (mWinBoLLServiceBean.isEnable()) {
if (mIsServiceRunning == false) {
// 设置运行状态
mIsServiceRunning = true;
@@ -70,11 +70,11 @@ public class AssistantService extends Service {
// 唤醒和绑定主进程
//
void wakeupAndBindMain() {
- if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBollClientService.class.getName()) == false) {
- startForegroundService(new Intent(AssistantService.this, WinBollClientService.class));
+ if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBoLLClientService.class.getName()) == false) {
+ 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
public void onServiceDisconnected(ComponentName name) {
- mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(AssistantService.this);
- if (mWinBollServiceBean.isEnable()) {
+ 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
index 3d66468..33e511e 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java
@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:11:27
- * @Describe WinBoll UI 状态图标枚举
+ * @Describe WinBoLL UI 状态图标枚举
*/
import cc.winboll.studio.libaes.R;
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBollClientServiceBinder.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLClientServiceBinder.java
similarity index 51%
rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBollClientServiceBinder.java
rename to libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLClientServiceBinder.java
index eaf40d5..65087ad 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBollClientServiceBinder.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLClientServiceBinder.java
@@ -3,15 +3,15 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:08:45
- * @Describe WinBollService 服务 Binder。
+ * @Describe WinBoLLService 服务 Binder。
*/
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();
}
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
similarity index 64%
rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientService.java
rename to libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java
index 756e885..12fcd43 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientService.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java
@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:06:54
- * @Describe WinBoll 客户端服务
+ * @Describe WinBoLL 客户端服务
*/
import android.app.Service;
import android.content.ComponentName;
@@ -19,28 +19,28 @@ import cc.winboll.studio.libappbase.utils.ServiceUtils;
import cc.winboll.studio.libapputils.utils.PrefUtils;
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;
- volatile boolean mIsWinBollClientThreadRunning;
+ volatile boolean mIsWinBoLLClientThreadRunning;
volatile boolean mIsEnableService;
- volatile WinBollClientThread mWinBollClientThread;
+ volatile WinBoLLClientThread mWinBoLLClientThread;
- public boolean isWinBollClientThreadRunning() {
- return mIsWinBollClientThreadRunning;
+ public boolean isWinBoLLClientThreadRunning() {
+ return mIsWinBoLLClientThreadRunning;
}
@Override
- public WinBollClientService getService() {
- return WinBollClientService.this;
+ public WinBoLLClientService getService() {
+ return WinBoLLClientService.this;
}
@Override
public Drawable getCurrentStatusIconDrawable() {
- return mIsWinBollClientThreadRunning ?
+ return mIsWinBoLLClientThreadRunning ?
getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NORMAL))
: getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NEWS));
}
@@ -54,9 +54,9 @@ public class WinBollClientService extends Service implements IWinBollClientServi
public void onCreate() {
//ToastUtils.show("onCreate");
super.onCreate();
- mWinBollClientThread = null;
- mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
- mIsEnableService = mWinBollClientServiceBean.isEnable();
+ mWinBoLLClientThread = null;
+ mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+ mIsEnableService = mWinBoLLClientServiceBean.isEnable();
if (mMyServiceConnection == null) {
mMyServiceConnection = new MyServiceConnection();
@@ -74,23 +74,23 @@ public class WinBollClientService extends Service implements IWinBollClientServi
// 返回运行参数持久化存储后，服务状态控制参数
// 无论 Intent 传入如何，服务状态一直以持久化存储后的参数控制，
- // PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBollServiceBean，
+ // PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBoLLServiceBean，
// 不过本服务的应用方向会变得繁琐，
- // 现阶段只要满足手机端启动与停止本服务，WinBoll 客户端实例运行在手机端就可以了。
+ // 现阶段只要满足手机端启动与停止本服务，WinBoLL 客户端实例运行在手机端就可以了。
return mIsEnableService ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
}
synchronized void runMainThread() {
- if (mWinBollClientThread == null) {
+ if (mWinBoLLClientThread == null) {
//ToastUtils.show("runMainThread()");
- mWinBollClientThread = new WinBollClientThread();
- mWinBollClientThread.start();
+ mWinBoLLClientThread = new WinBoLLClientThread();
+ mWinBoLLClientThread.start();
}
}
- void syncWinBollClientThreadStatus() {
- mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
- mIsEnableService = mWinBollClientServiceBean.isEnable();
+ void syncWinBoLLClientThreadStatus() {
+ mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+ mIsEnableService = mWinBoLLClientServiceBean.isEnable();
LogUtils.d(TAG, String.format("mIsEnableService %s", mIsEnableService));
}
@@ -99,9 +99,9 @@ public class WinBollClientService extends Service implements IWinBollClientServi
//
void wakeupAndBindAssistant() {
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");
- 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
public void onServiceDisconnected(ComponentName name) {
- mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(WinBollClientService.this);
- if (mWinBollClientServiceBean.isEnable()) {
+ mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(WinBoLLClientService.this);
+ if (mWinBoLLClientServiceBean.isEnable()) {
// 唤醒守护进程
wakeupAndBindAssistant();
}
@@ -134,15 +134,15 @@ public class WinBollClientService extends Service implements IWinBollClientServi
super.onStart(intent, startId);
}
- void setWinBollServiceEnableStatus(boolean isEnable) {
- WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+ void setWinBoLLServiceEnableStatus(boolean isEnable) {
+ WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
bean.setIsEnable(isEnable);
- WinBollClientServiceBean.saveWinBollServiceBean(this, bean);
+ WinBoLLClientServiceBean.saveWinBoLLServiceBean(this, bean);
}
- boolean getWinBollServiceEnableStatus(Context context) {
- mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(context);
- return mWinBollClientServiceBean.isEnable();
+ boolean getWinBoLLServiceEnableStatus(Context context) {
+ mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(context);
+ return mWinBoLLClientServiceBean.isEnable();
}
/*public interface OnServiceStatusChangeListener {
@@ -153,24 +153,24 @@ public class WinBollClientService extends Service implements IWinBollClientServi
mOnServerStatusChangeListener = l;
}*/
- class WinBollClientThread extends Thread {
+ class WinBoLLClientThread extends Thread {
@Override
public void run() {
super.run();
- LogUtils.d(TAG, "run syncWinBollClientThreadStatus");
- syncWinBollClientThreadStatus();
+ LogUtils.d(TAG, "run syncWinBoLLClientThreadStatus");
+ syncWinBoLLClientThreadStatus();
if (mIsEnableService) {
- if (mIsWinBollClientThreadRunning == false) {
+ if (mIsWinBoLLClientThreadRunning == false) {
// 设置运行状态
- mIsWinBollClientThreadRunning = true;
- LogUtils.d(TAG, "WinBollClientThread run()");
+ mIsWinBoLLClientThreadRunning = true;
+ LogUtils.d(TAG, "WinBoLLClientThread run()");
// 唤醒守护进程
//wakeupAndBindAssistant();
while (mIsEnableService) {
// 显示运行状态
- WinBollServiceStatusView.startConnection();
+ WinBoLLServiceStatusView.startConnection();
LogUtils.d(TAG, String.format("while mIsEnableService is %s", mIsEnableService));
try {
@@ -178,13 +178,13 @@ public class WinBollClientService extends Service implements IWinBollClientServi
} catch (InterruptedException e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
}
- syncWinBollClientThreadStatus();
+ syncWinBoLLClientThreadStatus();
}
// 服务进程退出, 重置进程运行状态
- WinBollServiceStatusView.stopConnection();
- mIsWinBollClientThreadRunning = false;
- mWinBollClientThread = null;
+ WinBoLLServiceStatusView.stopConnection();
+ mIsWinBoLLClientThreadRunning = false;
+ mWinBoLLClientThread = null;
}
}
}
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientServiceBean.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientServiceBean.java
similarity index 69%
rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientServiceBean.java
rename to libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientServiceBean.java
index 271f1e0..000b5db 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientServiceBean.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientServiceBean.java
@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:05:15
- * @Describe WinBollService 运行参数配置
+ * @Describe WinBoLLService 运行参数配置
*/
import android.content.Context;
import android.util.JsonReader;
@@ -11,13 +11,13 @@ import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean;
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;
- public WinBollClientServiceBean() {
+ public WinBoLLClientServiceBean() {
isEnable = false;
}
@@ -31,13 +31,13 @@ public class WinBollClientServiceBean extends BaseBean {
@Override
public String getName() {
- return WinBollClientServiceBean.class.getName();
+ return WinBoLLClientServiceBean.class.getName();
}
@Override
public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
super.writeThisToJsonWriter(jsonWriter);
- WinBollClientServiceBean bean = this;
+ WinBoLLClientServiceBean bean = this;
jsonWriter.name("isEnable").value(bean.isEnable());
}
@@ -67,12 +67,12 @@ public class WinBollClientServiceBean extends BaseBean {
return this;
}
- public static WinBollClientServiceBean loadWinBollClientServiceBean(Context context) {
- WinBollClientServiceBean bean = WinBollClientServiceBean.loadBean(context, WinBollClientServiceBean.class);
- return bean == null ? new WinBollClientServiceBean() : bean;
+ public static WinBoLLClientServiceBean loadWinBoLLClientServiceBean(Context context) {
+ WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadBean(context, WinBoLLClientServiceBean.class);
+ return bean == null ? new WinBoLLClientServiceBean() : bean;
}
- public static boolean saveWinBollServiceBean(WinBollClientService service, WinBollClientServiceBean bean) {
- return WinBollClientServiceBean.saveBean(service, bean);
+ public static boolean saveWinBoLLServiceBean(WinBoLLClientService service, WinBoLLClientServiceBean bean) {
+ return WinBoLLClientServiceBean.saveBean(service, bean);
}
}
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollMail.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLMail.java
similarity index 69%
rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollMail.java
rename to libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLMail.java
index 3806106..6f49c90 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollMail.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLMail.java
@@ -3,15 +3,15 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 19:13:20
- * @Describe WinBoll 邮件服务
+ * @Describe WinBoLL 邮件服务
*/
import android.app.Service;
import android.content.Intent;
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
public IBinder onBind(Intent intent) {
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServerConnectionThread.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServerConnectionThread.java
similarity index 92%
rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServerConnectionThread.java
rename to libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServerConnectionThread.java
index 25ecd21..5e3e833 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServerConnectionThread.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServerConnectionThread.java
@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/29 15:57:28
- * @Describe WinBoll 服务器服务情况测试访问进程。
+ * @Describe WinBoLL 服务器服务情况测试访问进程。
*/
import cc.winboll.studio.libappbase.LogUtils;
import java.io.IOException;
@@ -20,9 +20,9 @@ interface TextCallback {
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 username;
@@ -33,12 +33,12 @@ public class WinBollServerConnectionThread extends Thread {
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);
}
// 修改原有构造函数，添加回调参数
- public WinBollServerConnectionThread(String url, String username, String password,
+ public WinBoLLServerConnectionThread(String url, String username, String password,
int connectTimeout, int readTimeout, int maxRetries, TextCallback callback) {
this.url = url;
this.username = username;
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
similarity index 84%
rename from libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java
rename to libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java
index 694779b..f91acc9 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java
@@ -3,8 +3,9 @@ package cc.winboll.studio.libaes.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 17:41:55
- * @Describe WinBoll 服务主机连接状态视图
+ * @Describe WinBoLL 服务主机连接状态视图
*/
+import cc.winboll.studio.libaes.R;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -18,10 +19,9 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
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.LogUtils;
-import cc.winboll.studio.libapputils.R;
import cc.winboll.studio.libapputils.utils.PrefUtils;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -32,23 +32,23 @@ import java.time.format.DateTimeFormatter;
//import okhttp3.Response;
//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_UPDATE_CONNECTION_STATUS = 1;
- static WinBollServiceStatusView _WinBollServiceStatusView;
+ static WinBoLLServiceStatusView _WinBoLLServiceStatusView;
Context mContext;
//boolean mIsConnected;
volatile ConnectionThread mConnectionThread;
String mszServerHost;
- WinBollClientService mWinBollService;
+ WinBoLLClientService mWinBoLLService;
ImageView mImageView;
TextView mTextView;
- WinBollServiceViewHandler mWinBollServiceViewHandler;
+ WinBoLLServiceViewHandler mWinBoLLServiceViewHandler;
//WebView mWebView;
static volatile ConnectionStatus mConnectionStatus;
View.OnClickListener mViewOnClickListener;
@@ -66,11 +66,11 @@ public class WinBollServiceStatusView extends LinearLayout {
ServiceConnection connection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
- IWinBollClientServiceBinder binder = (IWinBollClientServiceBinder) service;
- mWinBollService = binder.getService();
+ IWinBoLLClientServiceBinder binder = (IWinBoLLClientServiceBinder) service;
+ mWinBoLLService = binder.getService();
isBound = true;
// 可以在这里调用Service的方法进行通信，比如获取数据
- mImageView.setBackgroundDrawable(mWinBollService.getCurrentStatusIconDrawable());
+ mImageView.setBackgroundDrawable(mWinBoLLService.getCurrentStatusIconDrawable());
}
@Override
@@ -79,25 +79,25 @@ public class WinBollServiceStatusView extends LinearLayout {
}
};
- public WinBollServiceStatusView(Context context) {
+ public WinBoLLServiceStatusView(Context context) {
super(context);
mContext = context;
initView();
}
- public WinBollServiceStatusView(Context context, AttributeSet attrs) {
+ public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
super(context, attrs);
mContext = context;
initView();
}
- public WinBollServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
+ public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mContext = context;
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);
mContext = context;
initView();
@@ -110,13 +110,13 @@ public class WinBollServiceStatusView extends LinearLayout {
}
void initView() {
- _WinBollServiceStatusView = this;
+ _WinBoLLServiceStatusView = this;
mImageView = new ImageView(mContext);
setImageViewByConnection(mImageView, false);
mConnectionStatus = getConnectionStatus();
//mIsConnected = false;
- //mWinBollServerHostConnectionStatus = WinBollServerHostConnectionStatus.DISCONNECTED;
+ //mWinBoLLServerHostConnectionStatus = WinBoLLServerHostConnectionStatus.DISCONNECTED;
//ToastUtils.show("initView()");
mViewOnClickListener = new View.OnClickListener(){
@@ -125,10 +125,10 @@ public class WinBollServiceStatusView extends LinearLayout {
LogUtils.d(TAG, "onClick()");
if (mConnectionStatus == ConnectionStatus.CONNECTED) {
LogUtils.d(TAG, "Click to stop service.");
- WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
+ WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext);
bean.setIsEnable(false);
- WinBollClientServiceBean.saveBean(mContext, bean);
- Intent intent = new Intent(mContext, WinBollClientService.class);
+ WinBoLLClientServiceBean.saveBean(mContext, bean);
+ Intent intent = new Intent(mContext, WinBoLLClientService.class);
mContext.stopService(intent);
//stopConnectionThread();
mTextView.setText("");
@@ -136,10 +136,10 @@ public class WinBollServiceStatusView extends LinearLayout {
mConnectionStatus = ConnectionStatus.DISCONNECTED;
} else if (mConnectionStatus == ConnectionStatus.DISCONNECTED) {
LogUtils.d(TAG, "Click to start service.");
- WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
+ WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext);
bean.setIsEnable(true);
- WinBollClientServiceBean.saveBean(mContext, bean);
- Intent intent = new Intent(mContext, WinBollClientService.class);
+ WinBoLLClientServiceBean.saveBean(mContext, bean);
+ Intent intent = new Intent(mContext, WinBoLLClientService.class);
mContext.startService(intent);
//startConnectionThread();
}
@@ -148,7 +148,7 @@ public class WinBollServiceStatusView extends LinearLayout {
setOnClickListener(mViewOnClickListener);
addView(mImageView);
mTextView = new TextView(mContext);
- mWinBollServiceViewHandler = new WinBollServiceViewHandler(this);
+ mWinBoLLServiceViewHandler = new WinBoLLServiceViewHandler(this);
addView(mTextView);
/*mWebView = new WebView(mContext);
mWebView.setWebViewClient(new WebViewClient() {
@@ -161,8 +161,8 @@ public class WinBollServiceStatusView extends LinearLayout {
addView(mWebView);*/
}
- void checkWinBollServerStatusAndUpdateCurrentView() {
- LogUtils.d(TAG, "checkWinBollServerStatusAndUpdateCurrentView()");
+ void checkWinBoLLServerStatusAndUpdateCurrentView() {
+ LogUtils.d(TAG, "checkWinBoLLServerStatusAndUpdateCurrentView()");
/*if (getConnectionStatus() == ConnectionStatus.CONNECTED) {
mConnectionStatus = ConnectionStatus.CONNECTED;
} else {
@@ -170,8 +170,8 @@ public class WinBollServiceStatusView extends LinearLayout {
}*/
}
- public void setServerHost(String szWinBollServerHost) {
- mszServerHost = szWinBollServerHost;
+ public void setServerHost(String szWinBoLLServerHost) {
+ mszServerHost = szWinBoLLServerHost;
}
public void setAuthInfo(String username, String password) {
@@ -216,8 +216,8 @@ public class WinBollServiceStatusView extends LinearLayout {
// 按照指定格式格式化时间并输出
String formattedDateTime = now.format(formatter);
String msg = "ClientIP<" + formattedDateTime + ">: " + text;
- mWinBollServiceViewHandler.postMessageText(msg);
- mWinBollServiceViewHandler.postMessageConnectionStatus(true);
+ mWinBoLLServiceViewHandler.postMessageText(msg);
+ mWinBoLLServiceViewHandler.postMessageConnectionStatus(true);
}
@@ -227,8 +227,8 @@ public class WinBollServiceStatusView extends LinearLayout {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
// 处理网络请求失败
setImageViewByConnection(mImageView, false);
- mWinBollServiceViewHandler.postMessageText(e.getMessage());
- mWinBollServiceViewHandler.postMessageConnectionStatus(false);
+ mWinBoLLServiceViewHandler.postMessageText(e.getMessage());
+ mWinBoLLServiceViewHandler.postMessageConnectionStatus(false);
}
};
@@ -249,12 +249,12 @@ public class WinBollServiceStatusView extends LinearLayout {
username = PrefUtils.getString(mContext, "metDevUserName", "");
password = PrefUtils.getString(mContext, "metDevUserPassword", "");
} else {
- username = "WinBoll";
- password = "WinBollPowerByZhanGSKen";
+ username = "WinBoLL";
+ password = "WinBoLLPowerByZhanGSKen";
}
LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl));
- WinBollServerConnectionThread thread = new WinBollServerConnectionThread(
+ WinBoLLServerConnectionThread thread = new WinBoLLServerConnectionThread(
targetUrl,
username,
password,
@@ -263,7 +263,7 @@ public class WinBollServiceStatusView extends LinearLayout {
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 password = "your_password";
@@ -350,10 +350,10 @@ public class WinBollServiceStatusView extends LinearLayout {
}*/
- class WinBollServiceViewHandler extends Handler {
- WinBollServiceStatusView mDevelopHostConnectionStatusView;
+ class WinBoLLServiceViewHandler extends Handler {
+ WinBoLLServiceStatusView mDevelopHostConnectionStatusView;
- public WinBollServiceViewHandler(WinBollServiceStatusView view) {
+ public WinBoLLServiceViewHandler(WinBoLLServiceStatusView view) {
mDevelopHostConnectionStatusView = view;
}
@@ -384,14 +384,14 @@ public class WinBollServiceStatusView extends LinearLayout {
}
public static void startConnection() {
- if (_WinBollServiceStatusView != null) {
- _WinBollServiceStatusView.startConnectionThread();
+ if (_WinBoLLServiceStatusView != null) {
+ _WinBoLLServiceStatusView.startConnectionThread();
}
}
public static void stopConnection() {
- if (_WinBollServiceStatusView != null) {
- _WinBollServiceStatusView.stopConnectionThread();
+ if (_WinBoLLServiceStatusView != null) {
+ _WinBoLLServiceStatusView.stopConnectionThread();
}
}
@@ -448,7 +448,7 @@ public class WinBollServiceStatusView extends LinearLayout {
requestCIPWithBasicAuth();
} else if (mConnectionStatus == ConnectionStatus.CONNECTED
|| mConnectionStatus == ConnectionStatus.DISCONNECTED) {
- //ToastUtils.show("mWinBollServerHostConnectionStatus " + mConnectionStatus);
+ //ToastUtils.show("mWinBoLLServerHostConnectionStatus " + mConnectionStatus);
LogUtils.d(TAG, String.format("mConnectionStatus done %s", mConnectionStatus));
} else {
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
public void onServerStatusChange(boolean isServiceAlive) {
}
diff --git a/libaes/src/main/res/layout/view_about_dev.xml b/libaes/src/main/res/layout/view_about_dev.xml
index 629585f..1443e19 100644
--- a/libaes/src/main/res/layout/view_about_dev.xml
+++ b/libaes/src/main/res/layout/view_about_dev.xml
@@ -53,10 +53,10 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal">
-
+ android:id="@+id/viewaboutdevWinBoLLServiceStatusView1"/>
diff --git a/libaes/src/main/res/layout/view_about_www.xml b/libaes/src/main/res/layout/view_about_www.xml
index 6cd4e5c..8cbe538 100644
--- a/libaes/src/main/res/layout/view_about_www.xml
+++ b/libaes/src/main/res/layout/view_about_www.xml
@@ -12,10 +12,10 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal">
-
+ android:id="@+id/viewaboutwwwWinBoLLServiceStatusView1"/>
diff --git a/libaes/src/main/res/layout/view_toast.xml b/libaes/src/main/res/layout/view_toast.xml
deleted file mode 100644
index c4a65fc..0000000
--- a/libaes/src/main/res/layout/view_toast.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libaes/src/main/res/values-zh/string.xml b/libaes/src/main/res/values-zh/string.xml
index 2f9f8fb..8ea6345 100644
--- a/libaes/src/main/res/values-zh/string.xml
+++ b/libaes/src/main/res/values-zh/string.xml
@@ -2,7 +2,7 @@
libaes
- 云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoll APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)
+ 云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoLL APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)
https://winboll.cc/aes
关于
应用主题
diff --git a/libaes/src/main/res/values/strings.xml b/libaes/src/main/res/values/strings.xml
index 8cbd248..5f94d4c 100644
--- a/libaes/src/main/res/values/strings.xml
+++ b/libaes/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
libaes
- 云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoll APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)
+ 云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoLL APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)
https://winboll.cc/libaes
About
AppTheme