0933

aes/build.gradle

@@ -18,13 +18,13 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 30
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
-        minSdkVersion 24
+        minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
@@ -41,15 +41,32 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-	api project(':libaes')
+	implementation project(':libaes')
     
-    api fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    
+    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
+    implementation 'com.github.open-android:pinyin4j:2.5.0'
+
+    // https://github.com/baoyongzhang/android-PullRefreshLayout
+    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    
+    implementation 'io.github.medyo:android-about-page:2.0.0'
+    implementation 'com.github.getActivity:ToastUtils:10.5'
+    
+    implementation 'com.jcraft:jsch:0.1.55'
+    implementation 'org.jsoup:jsoup:1.13.1'
+    
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    
+    implementation 'cc.winboll.studio:libapputils:9.3.2'
+    implementation 'cc.winboll.studio:libappbase:1.5.6'
 }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Feb 06 03:29:07 GMT 2025
+#Fri Mar 07 01:30:12 GMT 2025
 stageCount=6
 libraryProject=libaes
 baseVersion=7.6
 publishVersion=7.6.5
-buildCount=16
+buildCount=20
 baseBetaVersion=7.6.6

aes/src/main/java/cc/winboll/studio/aes/MainActivity.java

@@ -26,11 +26,11 @@ import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
 import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
 import cc.winboll.studio.libapputils.app.IWinBollActivity;
 import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.log.LogUtils;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
 import java.util.ArrayList;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libapputils.app.AboutActivityFactory;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
 
@@ -65,12 +65,12 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi
 
     @Override
     public String getTag() {
-        return null;
+        return TAG;
     }
 
     @Override
     public Toolbar initToolBar() {
-        return null;
+        return mToolbar;
     }
 
     @Override
@@ -124,6 +124,9 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.toolbar_library, menu);
+        if(App.isDebuging()) {
+            getMenuInflater().inflate(cc.winboll.studio.libapputils.R.menu.toolbar_studio_debug, menu);
+        }
         return super.onCreateOptionsMenu(menu);
     }
 

libaes/build.gradle

@@ -4,14 +4,12 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
-    namespace 'cc.winboll.studio.libaes'
+    compileSdkVersion 30
-    
+    buildToolsVersion "30.0.3"
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 29
     }
     buildTypes {
         release {
@@ -19,28 +17,30 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-    api 'io.github.medyo:android-about-page:2.0.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.github.getActivity:ToastUtils:10.5'
-    api 'com.jcraft:jsch:0.1.55'
-    api 'org.jsoup:jsoup:1.13.1'
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
     
-    api 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
-    api 'androidx.fragment:fragment:1.0.0'
+    
-    api 'com.google.android.material:material:1.0.0'
+    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
+    implementation 'com.github.open-android:pinyin4j:2.5.0'
 
     // https://github.com/baoyongzhang/android-PullRefreshLayout
-    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
     
-    api 'cc.winboll.studio:libapputils:9.3.1'
+    implementation 'io.github.medyo:android-about-page:2.0.0'
-    api 'cc.winboll.studio:libappbase:1.2.0'
+    implementation 'com.github.getActivity:ToastUtils:10.5'
     
-    api fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.jcraft:jsch:0.1.55'
+    implementation 'org.jsoup:jsoup:1.13.1'
+    
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    
+    implementation 'cc.winboll.studio:libapputils:9.3.2'
+    implementation 'cc.winboll.studio:libappbase:1.5.6'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Feb 06 03:29:07 GMT 2025
+#Thu Feb 06 04:51:56 GMT 2025
 stageCount=6
 libraryProject=libaes
 baseVersion=7.6
 publishVersion=7.6.5
-buildCount=16
+buildCount=20
 baseBetaVersion=7.6.6

libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java

@@ -15,6 +15,7 @@ import android.view.MenuItem;
 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;
@@ -26,11 +27,10 @@ import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
-import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.app.IWinBollActivity;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
 
 public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener {
 

libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java

@@ -5,7 +5,7 @@ import android.content.DialogInterface;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
-import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.text.Collator;

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java

@@ -13,7 +13,7 @@ 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.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class TestAButtonFragment extends Fragment {
 

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java

@@ -10,16 +10,16 @@ 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 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.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
-import java.util.ArrayList;
 import cc.winboll.studio.libapputils.app.IWinBollActivity;
 import cc.winboll.studio.libapputils.bean.APPInfo;
-import androidx.appcompat.app.AppCompatActivity;
+import java.util.ArrayList;
-import androidx.appcompat.widget.Toolbar;
 
 public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {