Merge remote-tracking branch 'origin/aes' into appbase
This commit is contained in:
commit
f4d21d7b1a
@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Mon Mar 31 19:41:19 HKT 2025
|
||||
stageCount=5
|
||||
#Wed Apr 02 20:09:04 HKT 2025
|
||||
stageCount=6
|
||||
libraryProject=libaes
|
||||
baseVersion=15.2
|
||||
publishVersion=15.2.4
|
||||
publishVersion=15.2.5
|
||||
buildCount=0
|
||||
baseBetaVersion=15.2.5
|
||||
baseBetaVersion=15.2.6
|
||||
|
@ -5,19 +5,26 @@ package cc.winboll.studio.aes;
|
||||
* @Date 2024/06/13 19:03:58
|
||||
* @Describe AES应用类
|
||||
*/
|
||||
import android.view.Gravity;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
import com.hjq.toast.ToastUtils;
|
||||
|
||||
|
||||
public class App extends GlobalApplication {
|
||||
|
||||
|
||||
public static final String TAG = "App";
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
// 初始化 Toast 框架
|
||||
ToastUtils.init(this);
|
||||
//ToastUtils.show("App onCreate");
|
||||
// 设置 Toast 布局样式
|
||||
ToastUtils.setView(R.layout.view_toast);
|
||||
//ToastUtils.setStyle(new WhiteToastStyle());
|
||||
ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Mon Mar 31 19:41:08 HKT 2025
|
||||
stageCount=5
|
||||
#Wed Apr 02 20:08:50 HKT 2025
|
||||
stageCount=6
|
||||
libraryProject=libaes
|
||||
baseVersion=15.2
|
||||
publishVersion=15.2.4
|
||||
publishVersion=15.2.5
|
||||
buildCount=0
|
||||
baseBetaVersion=15.2.5
|
||||
baseBetaVersion=15.2.6
|
||||
|
@ -118,7 +118,7 @@ public class AboutView extends LinearLayout {
|
||||
} else {
|
||||
mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (GlobalApplication.isDebuging()) {
|
||||
LayoutInflater inflater = LayoutInflater.from(mContext);
|
||||
@ -150,7 +150,7 @@ public class AboutView extends LinearLayout {
|
||||
|
||||
// 初始化标题栏
|
||||
//setSubtitle(getContext().getString(R.string.text_about));
|
||||
|
||||
|
||||
// LinearLayout llMain = findViewById(R.id.viewaboutLinearLayout1);
|
||||
// llMain.addView(createAboutPage());
|
||||
|
||||
@ -324,14 +324,17 @@ public class AboutView extends LinearLayout {
|
||||
PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
|
||||
PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
|
||||
} 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()
|
||||
.url(szUrl)
|
||||
.header("Accept", "text/plain") // 设置正确的Content-Type头
|
||||
.header("Authorization", credential)
|
||||
.build();
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
Call call = client.newCall(request);
|
||||
call.enqueue(new Callback() {
|
||||
@Override
|
||||
|
@ -252,6 +252,7 @@ public class WinBollServiceStatusView extends LinearLayout {
|
||||
username = "WinBoll";
|
||||
password = "WinBollPowerByZhanGSKen";
|
||||
}
|
||||
|
||||
LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl));
|
||||
WinBollServerConnectionThread thread = new WinBollServerConnectionThread(
|
||||
targetUrl,
|
||||
|
@ -1,62 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<!-- 边框阴影部分 -->
|
||||
<!-- 相对边框的Offset设置(android:left, top, right, bottom) -->
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp"
|
||||
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>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#BF4C4C4C" />
|
||||
<!-- 定义成圆角的 -->
|
||||
<corners android:radius="15dp" />
|
||||
</shape>
|
||||
|
@ -1,35 +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">
|
||||
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:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:id="@+id/customtoastTextView1"
|
||||
android:background="#FFFFFFFF"
|
||||
android:gravity="center_horizontal"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/app_name"
|
||||
android:textStyle="bold"
|
||||
android:textColor="#FFFFFFFF"/>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="#FFE8E8E8"/>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:text="Text"
|
||||
android:id="@+id/customtoastTextView2"
|
||||
android:background="#FFFFFFFF"
|
||||
android:gravity="center_horizontal"/>
|
||||
<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>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user