Studio/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/aes' into appbase

Browse Source
This commit is contained in:
ZhanGSKen 2025-04-02 20:15:59 +08:00
commit f4d21d7b1a
7 changed files with 63 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aes/build.properties
View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Mon Mar 31 19:41:19 HKT 2025 #Wed Apr 02 20:09:04 HKT 2025
stageCount=5 stageCount=6
libraryProject=libaes libraryProject=libaes
baseVersion=15.2 baseVersion=15.2
publishVersion=15.2.4 publishVersion=15.2.5
buildCount=0 buildCount=0
baseBetaVersion=15.2.5 baseBetaVersion=15.2.6

13
aes/src/main/java/cc/winboll/studio/aes/App.java
View File

@ -5,19 +5,26 @@ package cc.winboll.studio.aes;
* @Date 2024/06/13 19:03:58 * @Date 2024/06/13 19:03:58
* @Describe AES应用类 * @Describe AES应用类
*/ */
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;
public class App extends GlobalApplication { public class App extends GlobalApplication {
public static final String TAG = "App"; public static final String TAG = "App";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
// 初始化 Toast 框架
ToastUtils.init(this); ToastUtils.init(this);
//ToastUtils.show("App onCreate"); // 设置 Toast 布局样式
ToastUtils.setView(R.layout.view_toast);
//ToastUtils.setStyle(new WhiteToastStyle());
ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
} }
} }

8
libaes/build.properties
View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Mon Mar 31 19:41:08 HKT 2025 #Wed Apr 02 20:08:50 HKT 2025
stageCount=5 stageCount=6
libraryProject=libaes libraryProject=libaes
baseVersion=15.2 baseVersion=15.2
publishVersion=15.2.4 publishVersion=15.2.5
buildCount=0 buildCount=0
baseBetaVersion=15.2.5 baseBetaVersion=15.2.6

11
libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java
View File

@ -118,7 +118,7 @@ public class AboutView extends LinearLayout {
} else { } else {
mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder(); mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
} }
if (GlobalApplication.isDebuging()) { if (GlobalApplication.isDebuging()) {
LayoutInflater inflater = LayoutInflater.from(mContext); LayoutInflater inflater = LayoutInflater.from(mContext);
@ -150,7 +150,7 @@ public class AboutView extends LinearLayout {
// 初始化标题栏 // 初始化标题栏
//setSubtitle(getContext().getString(R.string.text_about)); //setSubtitle(getContext().getString(R.string.text_about));
// LinearLayout llMain = findViewById(R.id.viewaboutLinearLayout1); // LinearLayout llMain = findViewById(R.id.viewaboutLinearLayout1);
// llMain.addView(createAboutPage()); // llMain.addView(createAboutPage());
@ -324,14 +324,17 @@ 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 {
credential = Credentials.basic("WinBoll", "WinBollPowerByZhanGSKen"); String username = "WinBoll";
String password = "WinBollPowerByZhanGSKen";
credential = Credentials.basic(username, password);
} }
OkHttpClient client = new OkHttpClient();
Request request = new Request.Builder() Request request = new Request.Builder()
.url(szUrl) .url(szUrl)
.header("Accept", "text/plain") // 设置正确的Content-Type头 .header("Accept", "text/plain") // 设置正确的Content-Type头
.header("Authorization", credential) .header("Authorization", credential)
.build(); .build();
OkHttpClient client = new OkHttpClient();
Call call = client.newCall(request); Call call = client.newCall(request);
call.enqueue(new Callback() { call.enqueue(new Callback() {
@Override @Override

1
libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java
View File

@ -252,6 +252,7 @@ public class WinBollServiceStatusView extends LinearLayout {
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,

69
libaes/src/main/res/drawable/toast_frame.xml
View File

@ -1,62 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android"
<!-- 边框阴影部分 --> android:shape="rectangle">
<!-- 相对边框的Offset设置(android:left, top, right, bottom) --> <solid android:color="#BF4C4C4C" />
<item <!-- 定义成圆角的 -->
android:left="0dp" <corners android:radius="15dp" />
android:top="0dp" </shape>
android:right="0dp"
android:bottom="0dp">
<shape android:shape="rectangle" >
<gradient
android:angle="270"
android:startColor="@color/colorToastShadow"
android:centerColor="@color/colorToastShadow"
android:endColor="@color/colorToastShadow"/>
<corners
android:bottomLeftRadius="10dip"
android:bottomRightRadius="10dip"
android:topLeftRadius="10dip"
android:topRightRadius="10dip" />
</shape>
</item>
<!-- 边框部分 -->
<item
android:left="0dp"
android:top="0dp"
android:right="1dp"
android:bottom="2dp">
<shape android:shape="rectangle" >
<gradient
android:angle="270"
android:startColor="@color/colorToastFrame"
android:centerColor="@color/colorToastFrame"
android:endColor="@color/colorToastFrame"/>
<corners
android:bottomLeftRadius="10dip"
android:bottomRightRadius="10dip"
android:topLeftRadius="10dip"
android:topRightRadius="10dip" />
</shape>
</item>
<!-- 背景主体部分 -->
<item
android:left="2dp"
android:top="2dp"
android:right="3dp"
android:bottom="3dp">
<shape android:shape="rectangle" >
<gradient
android:type="linear"
android:angle="90"
android:startColor="@color/colorToastBackgroung"
android:centerColor="@color/colorToastBackgroung"
android:endColor="@color/colorToastBackgroung"/>
<corners
android:bottomLeftRadius="10dip"
android:bottomRightRadius="10dip"
android:topLeftRadius="10dip"
android:topRightRadius="10dip" />
</shape>
</item>
</layer-list>

57
libaes/src/main/res/layout/view_toast.xml
View File

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