diff --git a/aes/build.gradle b/aes/build.gradle
index a81e6ad..4d3b680 100644
--- a/aes/build.gradle
+++ b/aes/build.gradle
@@ -61,10 +61,6 @@ dependencies {
// 二维码类库
implementation 'com.google.zxing:core:3.4.1'
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
- // 应用介绍页类库
- implementation 'io.github.medyo:android-about-page:2.0.0'
- // 吐司类库
- implementation 'com.github.getActivity:ToastUtils:10.5'
// 网络连接类库
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
@@ -74,8 +70,8 @@ dependencies {
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
implementation 'androidx.fragment:fragment:1.1.0'
- implementation 'com.google.android.material:material:1.4.0'
+ implementation 'com.google.android.material:material:1.0.0'
- implementation 'cc.winboll.studio:libappbase:2.1.5'
- implementation 'cc.winboll.studio:libapputils:9.4.4'
+ implementation 'cc.winboll.studio:libappbase:15.0.5'
+ implementation 'cc.winboll.studio:libapputils:15.0.6'
}
diff --git a/aes/build.properties b/aes/build.properties
index 41a9ff9..7c62764 100644
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,5 +1,5 @@
#Created by .winboll/winboll_app_build.gradle
-#Sun Mar 09 20:28:18 HKT 2025
+#Tue Mar 18 04:22:06 GMT 2025
stageCount=13
libraryProject=libaes
baseVersion=7.6
diff --git a/aes/src/main/AndroidManifest.xml b/aes/src/main/AndroidManifest.xml
index 0113548..bd314e6 100644
--- a/aes/src/main/AndroidManifest.xml
+++ b/aes/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/AESTheme"
+ android:theme="@style/MyAESTheme"
android:requestLegacyExternalStorage="true"
android:supportsRtl="true">
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 c0477b9..fd4a7af 100644
--- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
@@ -13,7 +13,6 @@ import android.view.View;
import android.widget.AdapterView;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.aes.R;
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
import cc.winboll.studio.libaes.beans.DrawerMenuBean;
@@ -31,6 +30,7 @@ import cc.winboll.studio.libapputils.app.IWinBollActivity;
import cc.winboll.studio.libapputils.bean.APPInfo;
import com.a4455jkjh.colorpicker.ColorPickerDialog;
import java.util.ArrayList;
+import android.widget.Toolbar;
public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
diff --git a/aes/src/main/res/values/colors.xml b/aes/src/main/res/values/colors.xml
new file mode 100644
index 0000000..87d3836
--- /dev/null
+++ b/aes/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+
+
+ #FF00B322
+ #FF005C12
+ #FF8DFFA2
+ #FFFFFB8D
+
diff --git a/aes/src/main/res/values/styles.xml b/aes/src/main/res/values/styles.xml
index c5c6ef3..1da88ba 100644
--- a/aes/src/main/res/values/styles.xml
+++ b/aes/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
-
diff --git a/libaes/build.gradle b/libaes/build.gradle
index 447b1b2..222d5eb 100644
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -36,10 +36,6 @@ dependencies {
// 二维码类库
implementation 'com.google.zxing:core:3.4.1'
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
- // 应用介绍页类库
- implementation 'io.github.medyo:android-about-page:2.0.0'
- // 吐司类库
- implementation 'com.github.getActivity:ToastUtils:10.5'
// 网络连接类库
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
@@ -49,8 +45,8 @@ dependencies {
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
implementation 'androidx.fragment:fragment:1.1.0'
- implementation 'com.google.android.material:material:1.4.0'
+ implementation 'com.google.android.material:material:1.0.0'
- implementation 'cc.winboll.studio:libappbase:2.1.5'
- implementation 'cc.winboll.studio:libapputils:9.4.4'
+ implementation 'cc.winboll.studio:libappbase:15.0.5'
+ implementation 'cc.winboll.studio:libapputils:15.0.6'
}
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 0a5825f..910b68b 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
@@ -16,7 +16,6 @@ import android.view.View;
import android.widget.AdapterView;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
@@ -195,7 +194,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
setContentView(R.layout.activity_drawerfragment);
mToolbar = findViewById(R.id.activitydrawerfragmentASupportToolbar1);
- setSupportActionBar(mToolbar);
+ setActionBar(mToolbar);
if (mActivityType == ActivityType.Main) {
initMainRootView();
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 81ec509..fe3f1c2 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
@@ -8,7 +8,7 @@ import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
import cc.winboll.studio.libapputils.bean.APPInfo;
import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
+import android.widget.Toolbar;
/**
* @Author ZhanGSKen@QQ.COM
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java
index a378d51..d79c186 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java
@@ -9,11 +9,11 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Toast;
import androidx.fragment.app.Fragment;
import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.views.AButton;
import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
public class TestAButtonFragment extends Fragment {
@@ -28,7 +28,7 @@ public class TestAButtonFragment extends Fragment {
@Override
public void onClick(View view) {
LogUtils.d(TAG, "onClick");
- Toast.makeText(getActivity(), "AButton", Toast.LENGTH_SHORT).show();
+ ToastUtils.show("AButton");
}
});
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 00be255..57924e0 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
@@ -4,14 +4,14 @@ package cc.winboll.studio.libaes.unittests;
* @Author ZhanGSKen@QQ.COM
* @Date 2024/06/30 15:00:51
*/
+import android.app.Activity;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
+import android.widget.Toolbar;
import androidx.fragment.app.Fragment;
import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
@@ -24,8 +24,8 @@ import java.util.ArrayList;
public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {
@Override
- public AppCompatActivity getActivity() {
- return this;
+ public Activity getActivity() {
+ return g;
}
@Override
@@ -42,7 +42,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity implement
public Toolbar initToolBar() {
return null;
}
-
+
@Override
public boolean isAddWinBollToolBar() {
return false;
@@ -52,7 +52,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity implement
public boolean isEnableDisplayHomeAsUp() {
return false;
}
-
+
public static final String TAG = "TestDrawerFragmentActivity";
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java
index 1c3b39f..b2d73d2 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java
@@ -5,6 +5,7 @@ package cc.winboll.studio.libaes.unittests;
* @Date 2024/07/16 01:35:56
* @Describe TestViewPageFragment
*/
+import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,14 +18,16 @@ import androidx.viewpager.widget.ViewPager;
import cc.winboll.studio.libaes.ImagePagerAdapter;
import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
import java.util.ArrayList;
import java.util.List;
-import cc.winboll.studio.libappbase.LogView;
public class TestViewPageFragment extends Fragment implements ViewPager.OnPageChangeListener, View.OnClickListener {
public static final String TAG = "TestViewPageFragment";
+ Context mContext;
LogView mLogView;
private ViewPager viewPager;
@@ -39,6 +42,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
mView = inflater.inflate(R.layout.fragment_viewpage, container, false);
+ mContext = getActivity().getContext();
mLogView = mView.findViewById(R.id.logview);
mLogView.start();
@@ -72,7 +76,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
//初始化所要显示的布局
void initData() {
ViewPager viewPager = mView.findViewById(R.id.fragmentviewpageViewPager1);
- LayoutInflater inflater = LayoutInflater.from(getActivity());
+ LayoutInflater inflater = LayoutInflater.from(mContext);
View view1 = inflater.inflate(R.layout.viewpage_atickprogressbar, viewPager, false);
View view2 = inflater.inflate(R.layout.viewpage_acard, viewPager, false);
View view3 = inflater.inflate(R.layout.viewpage_aohpctccard, viewPager, false);
@@ -193,7 +197,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
void initAOHPCTCSeekBar() {
AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1);
- seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher));
+ seekbar.setThumb(mContext.getDrawable(R.drawable.ic_launcher));
//seekbar.setThumbOffset(200);
//seekbar.setThumbOffset(1);
seekbar.setBlurRightDP(50);
@@ -201,14 +205,14 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
@Override
public void onOHPCommit() {
- Toast.makeText(getActivity(), "onOHPCommit ", Toast.LENGTH_SHORT).show();
+ ToastUtils.show("onOHPCommit");
}
});
}
void initAOHPCTCSeekBar2() {
AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2);
- seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_call));
+ seekbar.setThumb(mContext.getDrawable(R.drawable.ic_call));
//seekbar.setThumbOffset(200);
//seekbar.setThumbOffset(1);
seekbar.setBlurRightDP(50);
@@ -216,7 +220,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
@Override
public void onOHPCommit() {
- Toast.makeText(getActivity(), "onOHPCommit 2", Toast.LENGTH_SHORT).show();
+ ToastUtils.show("onOHPCommit 2");
}
});
}
diff --git a/libaes/src/main/res/values/colors.xml b/libaes/src/main/res/values/colors.xml
index f791df6..58d507b 100644
--- a/libaes/src/main/res/values/colors.xml
+++ b/libaes/src/main/res/values/colors.xml
@@ -1,10 +1,12 @@
+
#FF03AB4E
#FF027C39
#FF3DDC84
- #FFA9A9A9
+ #FFFFFB8D
+ #FFA9A9A9
#FF000000
#FFFFFFFF
#FF7D3F12
@@ -14,16 +16,16 @@
@color/colorPrimaryDark
@color/colorPrimary
@color/colorAccent
-
+
@color/colorAccent
@color/colorPrimary
-
+
@color/colorAccent
@color/colorPrimary
@color/colorPrimaryDark
-
+
-
+
+ -->
diff --git a/libaes/src/main/res/values/styles.xml b/libaes/src/main/res/values/styles.xml
index 2149e55..9c736be 100644
--- a/libaes/src/main/res/values/styles.xml
+++ b/libaes/src/main/res/values/styles.xml
@@ -1,7 +1,6 @@
-
-