<aes>APK 7.6.7 release Publish.

aes/build.gradle

@@ -18,13 +18,13 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
-        minSdkVersion 24
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
@@ -41,29 +41,41 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
 	api project(':libaes')
-    
-    //api 'cc.winboll.studio:winboll-shared:1.6.5'
-    api 'io.github.medyo:android-about-page:2.0.0'
-    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'
-    api 'androidx.fragment:fragment:1.0.0'
-    api 'com.google.android.material:material:1.0.0'
-    
-    api 'cc.winboll.studio:libapputils:9.2.1'
-    api 'cc.winboll.studio:libappbase:1.0.3'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    implementation 'com.github.getActivity:XXPermissions:18.63'
+    // 下拉控件
+    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    // 拼音搜索
+    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
+    implementation 'com.github.open-android:pinyin4j:2.5.0'
+    // SSH
+    implementation 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    implementation 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    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'
+    
+    // Android 类库
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    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 'cc.winboll.studio:libappbase:2.1.5'
+    implementation 'cc.winboll.studio:libapputils:9.4.4'
 }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jan 19 04:58:59 GMT 2025
-stageCount=3
+#Sun Mar 09 11:28:39 HKT 2025
+stageCount=8
 libraryProject=libaes
 baseVersion=7.6
-publishVersion=7.6.2
-buildCount=4
-baseBetaVersion=7.6.3
+publishVersion=7.6.7
+buildCount=0
+baseBetaVersion=7.6.8

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/WinBoll.SupportThemeNoActionBar"
+        android:theme="@style/AESTheme"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true">
 

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

@@ -5,12 +5,224 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:05:52
  * @Describe 应用主窗口
  */
-import cc.winboll.studio.libaes.unittests.LibraryActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+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;
+import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
+import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
+import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity;
+import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
+import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
+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.libapputils.app.AboutActivityFactory;
+import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libapputils.bean.APPInfo;
+import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import java.util.ArrayList;
+
+public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
 
-public class MainActivity extends LibraryActivity {
-    
     public static final String TAG = "MainActivity";
-    
-    
-    
+
+    TestAButtonFragment mTestAButtonFragment;
+    TestViewPageFragment mTestViewPageFragment;
+
+    @Override
+    public AppCompatActivity getActivity() {
+        return this;
+    }
+
+    @Override
+    public APPInfo getAppInfo() {
+        String szBranchName = "aes";
+
+        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
+        appInfo.setAppName("AES");
+        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
+        appInfo.setAppDescription("AES Description");
+        appInfo.setAppGitName("APP");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
+        appInfo.setAppAPKName("AES");
+        appInfo.setAppAPKFolderName("AES");
+        return appInfo;
+        //return null;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    public Toolbar initToolBar() {
+        return mToolbar;
+    }
+
+    @Override
+    public boolean isAddWinBollToolBar() {
+        return false;
+    }
+
+    @Override
+    public boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (mTestAButtonFragment == null) {
+            mTestAButtonFragment = new TestAButtonFragment();
+            addFragment(mTestAButtonFragment);
+        }
+        showFragment(mTestAButtonFragment);
+        //setSubtitle(TAG);
+    }
+
+    @Override
+    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.initDrawerMenuItemList(listDrawerMenu);
+        LogUtils.d(TAG, "initDrawerMenuItemList");
+        //listDrawerMenu.clear();
+        // 添加抽屉菜单项
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.reinitDrawerMenuItemList(listDrawerMenu);
+        LogUtils.d(TAG, "reinitDrawerMenuItemList");
+        //listDrawerMenu.clear();
+        // 添加抽屉菜单项
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public DrawerFragmentActivity.ActivityType initActivityType() {
+        return DrawerFragmentActivity.ActivityType.Main;
+    }
+
+    @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);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        super.onItemClick(parent, view, position, id);
+        switch (position) {
+            case 0 : {
+                    if (mTestAButtonFragment == null) {
+                        mTestAButtonFragment = new TestAButtonFragment();
+                        addFragment(mTestAButtonFragment);
+                    }
+                    showFragment(mTestAButtonFragment);
+                    break;
+                }
+            case 1 : {
+                    if (mTestViewPageFragment == null) {
+                        mTestViewPageFragment = new TestViewPageFragment();
+                        addFragment(mTestViewPageFragment);
+                    }
+                    showFragment(mTestViewPageFragment);
+                    break;
+                }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int nItemId = item.getItemId();
+//        if (item.getItemId() == R.id.item_log) {
+//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
+//        } else 
+        if (nItemId == R.id.item_atoast) {
+            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
+        } else if (nItemId == R.id.item_atoolbar) {
+            Intent intent = new Intent(this, TestAToolbarActivity.class);
+            startActivity(intent);
+
+        } else if (nItemId == R.id.item_asupporttoolbar) {
+            Intent intent = new Intent(this, TestASupportToolbarActivity.class);
+            startActivity(intent);
+
+        } else if (nItemId == R.id.item_colordialog) {
+            ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary));
+            dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
+
+                    @Override
+                    public void beforeColorChanged() {
+                    }
+
+                    @Override
+                    public void onColorChanged(int color) {
+
+                    }
+
+                    @Override
+                    public void afterColorChanged() {
+                    }
+
+
+                });
+            dlg.show();
+
+        } else if (nItemId ==  R.id.item_dialogstoragepath) {
+            final StoragePathDialog dialog = new StoragePathDialog(this, 0);
+            dialog.setOnOKClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            dialog.show();
+
+        } else if (nItemId ==  R.id.item_localfileselectdialog) {
+            final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this);
+            dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() {
+                    @Override
+                    public void onOKClick(String sz) {
+                        Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
+                        //dialog.dismiss();
+                    }
+                });
+            dialog.open();
+
+        } else if (nItemId ==  R.id.item_secondarylibraryactivity) {
+            Intent intent = new Intent(this, SecondaryLibraryActivity.class);
+            startActivity(intent);
+        } else if (nItemId ==  R.id.item_drawerfragmentactivity) {
+            Intent intent = new Intent(this, TestDrawerFragmentActivity.class);
+            startActivity(intent);
+        } 
+        else if (nItemId ==  R.id.item_about) {
+            AboutActivityFactory.showAboutActivity(this, getAppInfo());
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
 }

aes/src/main/res/menu/toolbar_library.xml

@@ -13,7 +13,7 @@
     <item
         android:id="@+id/item_localfileselectdialog"
         android:title="LocalFileSelectDialog"/>
-    
+
     <item
         android:id="@+id/item_atoolbar"
         android:title="Test AToolbar"/>

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 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
     }
     buildTypes {
         release {
@@ -19,30 +17,40 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-    //api 'cc.winboll.studio:winboll-shared:1.6.5'
-    
-    api 'io.github.medyo:android-about-page:2.0.0'
-    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'
-    api 'androidx.fragment:fragment:1.0.0'
-    api 'com.google.android.material:material:1.0.0'
-    
-    // https://github.com/baoyongzhang/android-PullRefreshLayout
-    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    
-    api 'cc.winboll.studio:libapputils:9.2.1'
-    api 'cc.winboll.studio:libappbase:1.0.3'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    implementation 'com.github.getActivity:XXPermissions:18.63'
+    // 下拉控件
+    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    // 拼音搜索
+    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
+    implementation 'com.github.open-android:pinyin4j:2.5.0'
+    // SSH
+    implementation 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    implementation 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    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'
+    
+    // Android 类库
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    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 'cc.winboll.studio:libappbase:2.1.5'
+    implementation 'cc.winboll.studio:libapputils:9.4.4'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jan 19 04:58:59 GMT 2025
-stageCount=3
+#Sun Mar 09 11:28:39 HKT 2025
+stageCount=8
 libraryProject=libaes
 baseVersion=7.6
-publishVersion=7.6.2
-buildCount=4
-baseBetaVersion=7.6.3
+publishVersion=7.6.7
+buildCount=0
+baseBetaVersion=7.6.8

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

@@ -27,18 +27,19 @@ 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;
 
-public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener {
 
     public static final String TAG = "DrawerFragmentActivity";
 
     static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
     static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
 
-    protected Context mContext;
+    //protected Context mContext;
     ActivityType mActivityType;
     ActionBarDrawerToggle mActionBarDrawerToggle;
     DrawerLayout mDrawerLayout;
@@ -58,7 +59,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        mContext = this;
+        //mContext = this;
         mThemeType = getThemeType();
         setThemeStyle();
         super.onCreate(savedInstanceState);
@@ -72,7 +73,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.onDestroy();
     }
 
-    @Override
+    /*@Override
     public Intent getIntent() {
         // TODO: Implement this method
         return super.getIntent();
@@ -80,7 +81,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     public Context getContext() {
         return this.mContext;
-    }
+    }*/
 
     @Override
     public MenuInflater getMenuInflater() {
@@ -88,20 +89,20 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         return super.getMenuInflater();
     }
 
-    public void setSubtitle(CharSequence context) {
+    /*public void setSubtitle(CharSequence context) {
         // TODO: Implement this method
         getSupportActionBar().setSubtitle(context);
-    }
+    }*/
 
     @Override
     public void recreate() {
         super.recreate();
     }
 
-    @Override
+    /*@Override
     public boolean moveTaskToBack(boolean nonRoot) {
         return super.moveTaskToBack(nonRoot);
-    }
+    }*/
 
     @Override
     public void startActivity(Intent intent) {
@@ -113,7 +114,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.startActivityForResult(intent, requestCode, options);
     }
 
-    @Override
+    /*@Override
     public FragmentManager getSupportFragmentManager() {
         return super.getSupportFragmentManager();
     }
@@ -131,7 +132,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     public void setTitle(int resId) {
         // TODO: Implement this method
         getSupportActionBar().setTitle(resId);
-    }
+    }*/
 
     @Override
     public SharedPreferences getSharedPreferences(String name, int mode) {
@@ -151,7 +152,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     void setThemeStyle() {
         //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(this));
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     boolean checkThemeStyleChange() {
@@ -163,7 +164,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
          SHAREDPREFERENCES_NAME, MODE_PRIVATE);
          return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
          */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(this));
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     @Override

libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java

@@ -8,7 +8,7 @@ package cc.winboll.studio.libaes.beans;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libapputils.bean.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 public class AESThemeBean extends BaseBean {
@@ -16,7 +16,7 @@ public class AESThemeBean extends BaseBean {
     public static final String TAG = "AESThemeBean";
 
     public enum ThemeType {
-        DEFAULT("默认主题"),
+        AES("默认主题"),
         DEPTH("深奥主题"),
         SKY("天空主题"),
         GOLDEN("辉煌主题"),
@@ -42,7 +42,7 @@ public class AESThemeBean extends BaseBean {
     }
     
     // 保存当前主题
-    int currentThemeStyleID = getThemeStyleID(ThemeType.DEFAULT);
+    int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
     
     public AESThemeBean() {
     }
@@ -99,7 +99,7 @@ public class AESThemeBean extends BaseBean {
     }
 
     public static int getThemeStyleID(ThemeType themeType) {
-        int themeStyleID = R.style.DefaultAESTheme;
+        int themeStyleID = R.style.AESTheme;
         if (AESThemeBean.ThemeType.DEPTH == themeType) {
             themeStyleID = R.style.DepthAESTheme;
         } else if (AESThemeBean.ThemeType.SKY == themeType) {
@@ -110,15 +110,15 @@ public class AESThemeBean extends BaseBean {
             themeStyleID = R.style.MemorAESTheme;
         } else if (AESThemeBean.ThemeType.TAO == themeType) {
             themeStyleID = R.style.TaoAESTheme;
-        } else if (AESThemeBean.ThemeType.DEFAULT == themeType) {
-            themeStyleID = R.style.DefaultAESTheme;
+        } else if (AESThemeBean.ThemeType.AES == themeType) {
+            themeStyleID = R.style.AESTheme;
         }
         //LogUtils.d(TAG, "themeStyleID " + Integer.toString(themeStyleID));
         return themeStyleID;
     }
 
     public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
-        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.DEFAULT;
+        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES;
         if (R.style.DepthAESTheme == nThemeStyleID) {
             themeStyle = AESThemeBean.ThemeType.DEPTH ;
         } else if (R.style.SkyAESTheme == nThemeStyleID) {
@@ -129,8 +129,8 @@ public class AESThemeBean extends BaseBean {
             themeStyle = AESThemeBean.ThemeType.MEMOR ;
         } else if (R.style.TaoAESTheme == nThemeStyleID) {
             themeStyle = AESThemeBean.ThemeType.TAO ;
-        } else if (R.style.DefaultAESTheme == nThemeStyleID) {
-            themeStyle = AESThemeBean.ThemeType.DEFAULT;
+        } else if (R.style.AESTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.AES;
         }
         //LogUtils.d(TAG, "themeStyle " + Integer.toString(themeStyle.ordinal()));
         return themeStyle;

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/LibraryActivity.java

@@ -1,170 +0,0 @@
-package cc.winboll.studio.libaes.unittests;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/06/14 03:43:23
- * @Describe AES类库主窗口
- */
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Toast;
-import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.beans.DrawerMenuBean;
-import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
-import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
-import cc.winboll.studio.libapputils.log.LogUtils;
-import com.a4455jkjh.colorpicker.ColorPickerDialog;
-import java.util.ArrayList;
-
-public class LibraryActivity extends DrawerFragmentActivity {
-
-    public static final String TAG = "LibraryActivity";
-
-    TestAButtonFragment mTestAButtonFragment;
-    TestViewPageFragment mTestViewPageFragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (mTestAButtonFragment == null) {
-            mTestAButtonFragment = new TestAButtonFragment();
-            addFragment(mTestAButtonFragment);
-        }
-        showFragment(mTestAButtonFragment);
-        setSubtitle(TAG);
-    }
-
-    @Override
-    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.initDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "initDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.reinitDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "reinitDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public DrawerFragmentActivity.ActivityType initActivityType() {
-        return DrawerFragmentActivity.ActivityType.Main;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_library, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        super.onItemClick(parent, view, position, id);
-        switch (position) {
-            case 0 : {
-                    if (mTestAButtonFragment == null) {
-                        mTestAButtonFragment = new TestAButtonFragment();
-                        addFragment(mTestAButtonFragment);
-                    }
-                    showFragment(mTestAButtonFragment);
-                    break;
-                }
-            case 1 : {
-                    if (mTestViewPageFragment == null) {
-                        mTestViewPageFragment = new TestViewPageFragment();
-                        addFragment(mTestViewPageFragment);
-                    }
-                    showFragment(mTestViewPageFragment);
-                    break;
-                }
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int nItemId = item.getItemId();
-//        if (item.getItemId() == R.id.item_log) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
-//        } else 
-        if (nItemId == R.id.item_atoast) {
-            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
-        } else if (nItemId == R.id.item_atoolbar) {
-            Intent intent = new Intent(this, TestAToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_asupporttoolbar) {
-            Intent intent = new Intent(this, TestASupportToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_colordialog) {
-            ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary));
-            dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
-
-                    @Override
-                    public void beforeColorChanged() {
-                    }
-
-                    @Override
-                    public void onColorChanged(int color) {
-
-                    }
-
-                    @Override
-                    public void afterColorChanged() {
-                    }
-
-
-                });
-            dlg.show();
-
-        } else if (nItemId ==  R.id.item_dialogstoragepath) {
-            final StoragePathDialog dialog = new StoragePathDialog(this, 0);
-            dialog.setOnOKClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        dialog.dismiss();
-                    }
-                });
-            dialog.show();
-
-        } else if (nItemId ==  R.id.item_localfileselectdialog) {
-            final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this);
-            dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() {
-                    @Override
-                    public void onOKClick(String sz) {
-                        Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
-                        //dialog.dismiss();
-                    }
-                });
-            dialog.open();
-
-        } else if (nItemId ==  R.id.item_secondarylibraryactivity) {
-            Intent intent = new Intent(this, SecondaryLibraryActivity.class);
-            startActivity(intent);
-        } else if (nItemId ==  R.id.item_drawerfragmentactivity) {
-            Intent intent = new Intent(this, TestDrawerFragmentActivity.class);
-            startActivity(intent);
-        } 
-//        else if (nItemId ==  R.id.item_about) {
-//            Intent intent = new Intent(this, AboutActivity.class);
-//            startActivity(intent);
-//        }
-
-        return super.onOptionsItemSelected(item);
-    }
-}

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

@@ -6,6 +6,9 @@ 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.libapputils.bean.APPInfo;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 /**
  * @Author ZhanGSKen@QQ.COM
@@ -18,6 +21,36 @@ public class SecondaryLibraryActivity extends DrawerFragmentActivity {
 
     SecondaryLibraryFragment mSecondaryLibraryFragment;
 
+    @Override
+    public AppCompatActivity getActivity() {
+        return this;
+    }
+    
+    @Override
+    public APPInfo getAppInfo() {
+        return null;
+    }
+
+    @Override
+    public String getTag() {
+        return null;
+    }
+
+    @Override
+    public Toolbar initToolBar() {
+        return null;
+    }
+
+    @Override
+    public boolean isAddWinBollToolBar() {
+        return false;
+    }
+
+    @Override
+    public boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -43,7 +76,7 @@ public class SecondaryLibraryActivity extends DrawerFragmentActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int nItemId = item.getItemId();
         if (nItemId == R.id.item_test) {
-            Toast.makeText(getApplication(), "item_test", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(), "item_test", Toast.LENGTH_SHORT).show();
         }
         return super.onOptionsItemSelected(item);
     }

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,20 +10,56 @@ 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 cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libapputils.bean.APPInfo;
 import java.util.ArrayList;
 
-public class TestDrawerFragmentActivity extends DrawerFragmentActivity {
+public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {
+
+    @Override
+    public AppCompatActivity getActivity() {
+        return this;
+    }
+
+    @Override
+    public APPInfo getAppInfo() {
+        return null;
+    }
+
+    @Override
+    public String getTag() {
+        return null;
+    }
+
+    @Override
+    public Toolbar initToolBar() {
+        return null;
+    }
+    
+    @Override
+    public boolean isAddWinBollToolBar() {
+        return false;
+    }
+
+    @Override
+    public boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+    
 
     public static final String TAG = "TestDrawerFragmentActivity";
 
     TestFragment1 mTestFragment1;
     TestFragment2 mTestFragment2;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -66,7 +102,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity {
         super.onItemClick(parent, view, position, id);
         switch (position) {
             case 0 : {
-                    Toast.makeText(getContext(), "0", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplicationContext(), "0", Toast.LENGTH_SHORT).show();
                     //LogUtils.d(TAG, "MenuItem 1");
                     showFragment(mTestFragment1);
                     break;

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

@@ -19,10 +19,13 @@ import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 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";
+    
+    LogView mLogView;
 
     private ViewPager viewPager;
     private List<View> views; //用来存放放进ViewPager里面的布局
@@ -36,6 +39,9 @@ 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);
+        
+        mLogView = mView.findViewById(R.id.logview);
+        mLogView.start();
 
         //viewPager = findViewById(R.id.activitymainViewPager1);
         initData();
@@ -60,6 +66,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
         initPoint();//初始化页面下方的点
         viewPager.setOnPageChangeListener(this);
         initAOHPCTCSeekBar();
+        initAOHPCTCSeekBar2();
     }
 
     //初始化所要显示的布局
@@ -187,7 +194,9 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
     void initAOHPCTCSeekBar() {
         AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1);
         seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher));
-        seekbar.setThumbOffset(10);
+        //seekbar.setThumbOffset(200);
+        //seekbar.setThumbOffset(1);
+        seekbar.setBlurRightDP(50);
         seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
 
                 @Override
@@ -196,4 +205,19 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
                 }
             });
     }
+    
+    void initAOHPCTCSeekBar2() {
+        AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2);
+        seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_call));
+        //seekbar.setThumbOffset(200);
+        //seekbar.setThumbOffset(1);
+        seekbar.setBlurRightDP(50);
+        seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
+
+                @Override
+                public void onOHPCommit() {
+                    Toast.makeText(getActivity(), "onOHPCommit 2", Toast.LENGTH_SHORT).show();
+                }
+            });
+    }
 }

libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java

@@ -11,8 +11,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
 
 public class AESThemeUtil {
 
@@ -25,7 +25,7 @@ public class AESThemeUtil {
 
     public static <T extends Context> int getThemeTypeID(T context) {
         AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
-        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT): bean.getCurrentThemeTypeID();
+        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
     }
     
     public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
@@ -41,9 +41,9 @@ public class AESThemeUtil {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
+    /*public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
         activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
-    }
+    }*/
 
     public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
@@ -53,9 +53,9 @@ public class AESThemeUtil {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
     }
 
-    public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+    /*public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
-    }
+    }*/
 
     public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
@@ -65,9 +65,9 @@ public class AESThemeUtil {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
+    /*public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
-    }
+    }*/
 
     public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) {
         int nThemeStyleID;
@@ -92,7 +92,7 @@ public class AESThemeUtil {
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         }
@@ -123,7 +123,7 @@ public class AESThemeUtil {
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         }
@@ -131,7 +131,7 @@ public class AESThemeUtil {
         return false;
     }
 
-    public static <T extends WinBollActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
+    public static <T extends AppCompatActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
         int nThemeStyleID;
         if (R.id.item_depththeme == item.getItemId()) {
             nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
@@ -154,7 +154,38 @@ public class AESThemeUtil {
             saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
             return true;
         } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        }
+
+        return false;
+    }
+    
+    public static <T extends DrawerFragmentActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
+        int nThemeStyleID;
+        if (R.id.item_depththeme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_skytheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_goldentheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_memortheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_taotheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_defaulttheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
             saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
             return true;
         }

libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java

@@ -6,18 +6,28 @@ package cc.winboll.studio.libaes.views;
  * @Describe AOneHundredPercantClickToCommitSeekBar
  */
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.SeekBar;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class AOHPCTCSeekBar extends SeekBar {
 
     public static final String TAG = "AOHPCTCSeekBar";
 
+    Context mContext;
+
+    int thumbWidth = 1;
+    int progressBarWidth = 1;
+    // 设置按钮模糊右边边缘像素
+    int blurRightDP = 1;
+
     // 可开始拉动的起始位置(百分比值)
-    static final int ENABLE_POST_PERCENT_X = 20;
+    //static final int ENABLE_POST_PERCENT_X = 20;
+    //int seekablePosition;
     // 最小拉动值，滑块拉动值要超过这个值，确定事件才会提交。
-    static final int TO_MIN_VALUE = 15;
+    //static final int TO_MIN_VALUE = 15;
     // 外部接口对象，确定事件提交会调用该对象的方法
     OnOHPCListener mOnOHPCListener;
     // 是否从起点拉动的标志
@@ -25,6 +35,10 @@ public class AOHPCTCSeekBar extends SeekBar {
     // 拉动的滑动值
     int mnTo = 0;
 
+    public void setBlurRightDP(int blurRight) {
+        this.blurRightDP = blurRight;
+    }
+    
     public void setOnOHPCListener(OnOHPCListener listener) {
         mOnOHPCListener = listener;
     }
@@ -35,10 +49,12 @@ public class AOHPCTCSeekBar extends SeekBar {
 
     public AOHPCTCSeekBar(Context context) {
         super(context);
+        initView(context);
     }
 
     public AOHPCTCSeekBar(Context context, AttributeSet attrs) {
         super(context, attrs);
+        initView(context);
 
         //LogUtils.d(TAG, "AOHPCTCSeekBar(...)");
 
@@ -61,12 +77,23 @@ public class AOHPCTCSeekBar extends SeekBar {
 
     public AOHPCTCSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        initView(context);
+    }
+
+    void initView(Context context) {
+        LogUtils.d(TAG, "initView(...)");
+        mContext = context;
+//        Drawable thumbDrawable = getThumb();
+//        if (thumbDrawable!= null) {
+//            int iconWidth = thumbDrawable.getIntrinsicWidth();
+//            LogUtils.d(TAG, String.format("iconWidth %d", iconWidth));
+//            seekablePosition = iconWidth;
+//        }
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-
     }
 
     @Override
@@ -74,33 +101,52 @@ public class AOHPCTCSeekBar extends SeekBar {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             //LogUtils.d(TAG, "ACTION_DOWN");
             // 有效的拖动起始位置(ENABLE_POST_PERCENT_X)%
-            int nEnablePostX = ((getRight() - getLeft()) * ENABLE_POST_PERCENT_X / 100) + getLeft();
-
-            if ((getLeft() < event.getX())
-                && (event.getX() < nEnablePostX)) {
-                //LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX()));
+            //int nEnablePostX = ((getRight() - getLeft()) * ENABLE_POST_PERCENT_X / 100) + getLeft();
+            //int nEnablePostX = ((getRight() - getLeft()) * seekablePosition / 100) + getLeft();
+            /*LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX()));
+            LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth));
+            LogUtils.d(TAG, String.format("mIsStartTo %s", mIsStartTo));
+            */
+            if (thumbWidth + blurRightDP > event.getX() && event.getX() > 0) {
                 mIsStartTo = true;
-                return super.dispatchTouchEvent(event);
-            }
-            if (!mIsStartTo) {
-                resetView();
-                return false;
+                return true;
+                //return super.dispatchTouchEvent(event);
             }
+//            if (!mIsStartTo) {
+//                resetView();
+//                return false;
+//            }
         } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
             //LogUtils.d(TAG, "ACTION_MOVE");
+            /*LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX()));
+            LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth));
+            LogUtils.d(TAG, String.format("mIsStartTo %s", mIsStartTo));
+            */
             if (mIsStartTo) {
-                mnTo++;
+                return super.dispatchTouchEvent(event);
+            } else {
+                return false;
             }
-        } else if (event.getAction() == MotionEvent.ACTION_UP) {
+        } else if (event.getAction() == MotionEvent.ACTION_UP 
+                   || event.getAction() == MotionEvent.ACTION_CANCEL) {
             //LogUtils.d(TAG, Integer.toString(getProgress()));
             // 提交100%确定事件
-            if ((getProgress() == 100) && (mnTo > TO_MIN_VALUE)) {
-                //LogUtils.d(TAG, "Commit mnTo is " + Integer.toString(mnTo));
-                mOnOHPCListener.onOHPCommit();
-                //resetView();
-                //return true;
-            }
-            resetView();
+//            if (getProgress() == progressBarWidth) {
+//                //((getProgress() == 100) && (mnTo > TO_MIN_VALUE)) {
+//                //LogUtils.d(TAG, "Commit mnTo is " + Integer.toString(mnTo));
+//                mOnOHPCListener.onOHPCommit();
+//                resetView();
+//                //return true;
+//            } else {
+//                resetView();
+//                mIsStartTo = false;
+//            }
+//
+              if (getProgress() == progressBarWidth) {
+                  mOnOHPCListener.onOHPCommit();
+              }
+              mIsStartTo = false;
+              resetView();
             return false;
         }
         //LogUtils.d(TAG, "dispatchTouchEvent End");
@@ -114,4 +160,31 @@ public class AOHPCTCSeekBar extends SeekBar {
         mnTo = 0;
         mIsStartTo = false;
     }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int width = MeasureSpec.getSize(widthMeasureSpec);
+        int height = MeasureSpec.getSize(heightMeasureSpec);
+        LogUtils.d(TAG, String.format("width %d height %d", width, height));
+
+        // 使用width和height进行后续操作
+
+        // 获取SeekBar的图标
+        Drawable thumbDrawable = getThumb();
+        if (thumbDrawable != null) {
+            // 获取图标宽度
+            thumbWidth = thumbDrawable.getIntrinsicWidth();
+            // 获取进度条宽度
+            progressBarWidth = width;//getWidth();// - getPaddingLeft() - getPaddingRight();
+            // 计算百分比
+            //float percentage = (float) thumbWidth / progressBarWidth * 100;
+            LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth));
+            //LogUtils.d(TAG, String.format("Thumb width / ProgressBar width percentage: %f", percentage));
+
+            //seekablePosition = (int)percentage;
+            setThumbOffset(0);
+            setMax(progressBarWidth);
+        }
+    }
 }

libaes/src/main/res/drawable/ic_call.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0,0 1,21 16.5V20A1,1 0,0 1,20 21A17,17 0,0 1,3 4A1,1 0,0 1,4 3H7.5A1,1 0,0 1,8.5 4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z"/>
+
+</vector>

libaes/src/main/res/layout/activity_library.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<FrameLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:id="@+id/activitylibraryFrameLayout1"/>
-
-</LinearLayout>
-

libaes/src/main/res/layout/fragment_viewpage.xml

@@ -2,7 +2,7 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:gravity="center_vertical">
@@ -12,49 +12,69 @@
 		android:layout_height="wrap_content"
 		android:text="AOHPCTCSeekBar"/>
 
-	<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
-		android:layout_width="300dp"
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/fragmentviewpageAOHPCTCSeekBar1"/>
+		android:gravity="center">
 
-    <androidx.viewpager.widget.ViewPager
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1.0"
-        android:id="@+id/fragmentviewpageViewPager1"/>
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_width="300dp"
+			android:layout_height="wrap_content"
+			android:id="@+id/fragmentviewpageAOHPCTCSeekBar1"
+			android:padding="10dp"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:id="@+id/fragmentviewpageLinearLayout1">
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_width="300dp"
+			android:layout_height="wrap_content"
+			android:id="@+id/fragmentviewpageAOHPCTCSeekBar2"
+			android:padding="10dp"/>
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            tools:ignore="ContentDescription"/>
+	</LinearLayout>
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            tools:ignore="ContentDescription"/>
+	<androidx.viewpager.widget.ViewPager
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/fragmentviewpageViewPager1"/>
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            tools:ignore="ContentDescription"/>
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:orientation="horizontal"
+		android:gravity="center"
+		android:id="@+id/fragmentviewpageLinearLayout1">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            tools:ignore="ContentDescription"/>
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="5dp"
+			tools:ignore="ContentDescription"/>
 
-    </LinearLayout>
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="5dp"
+			tools:ignore="ContentDescription"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="5dp"
+			tools:ignore="ContentDescription"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="5dp"
+			tools:ignore="ContentDescription"/>
+
+	</LinearLayout>
+
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="300dp"
+		android:id="@+id/logview"/>
 
 </LinearLayout>
 

libaes/src/main/res/values/attrs.xml

@@ -32,6 +32,13 @@
         <attr name="attrASupportToolbarEndColor"/>
     </declare-styleable>
     
+    <declare-styleable name="AButton">
+        <attr name="attrAButtonTextColor" format="color" />
+        <attr name="attrAButtonPrimary" format="color" />
+        <attr name="attrAButtonPrimaryDark" format="color" />
+        <attr name="attrAButtonAccent" format="color" />
+    </declare-styleable>
+    
     <attr name="ActionSheetList" format="reference"/>
     <!--<declare-styleable name="AToolbarStyle">
 		<attr name="attrAToolbarStartColor" format="color" />

libaes/src/main/res/values/styles.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
-    <style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+
+    <style name="AESTheme" parent="WinBoll.SupportThemeNoActionBar">
         <item name="colorTextColor">#FF000000</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">#FF03AB4E</item>
+        <item name="colorPrimaryDark">#FF027C39</item>
+        <item name="colorAccent">#FF3DDC84</item>
         <item name="android:textColor">#FF000000</item>
         <item name="aToolbar">@style/AESAToolbar</item>
         <item name="aSupportToolbar">@style/AESASupportToolbar</item>
@@ -24,158 +24,196 @@
         <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
         <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
     </style>
-    
 
-    <style name="DefaultAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorTextColor">#FF000000</item>
-        <item name="colorPrimary">#FF03AB4E</item>
-        <item name="colorPrimaryDark">#FF027C39</item>
-        <item name="colorAccent">#FF3DDC84</item>
-        <item name="android:textColor">#FF000000</item>
-        <item name="aToolbar">@style/DefaultAToolbar</item>
-        <item name="aSupportToolbar">@style/DefaultASupportToolbar</item>
-    </style>
-
-    <style name="DefaultAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="DefaultASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-    
-
-    <style name="DepthAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="DepthAESTheme" parent="AESTheme">
         <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FF2566FE</item>
         <item name="colorPrimaryDark">#FF1359FF</item>
         <item name="colorAccent">#FF8BAEFF</item>
         <item name="android:textColor">#FF000000</item>
-        <item name="aToolbar">@style/DepthAToolbar</item>
-        <item name="aSupportToolbar">@style/DepthASupportToolbar</item>
     </style>
 
-    <style name="DepthAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="DepthASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-    
-    <style name="SkyAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="SkyAESTheme" parent="AESTheme">
         <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FF1E98D4</item>
         <item name="colorPrimaryDark">#FF046A9C</item>
         <item name="colorAccent">#FF8CD9FF</item>
         <item name="android:textColor">#FF000000</item>
-        <item name="aToolbar">@style/SkyAToolbar</item>
-        <item name="aSupportToolbar">@style/SkyASupportToolbar</item>
     </style>
 
-    <style name="SkyAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="SkyASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-    
-    <style name="GoldenAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="GoldenAESTheme" parent="AESTheme">
         <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FFFFE22A</item>
         <item name="colorPrimaryDark">#FFAE9600</item>
         <item name="colorAccent">#FFFFED78</item>
         <item name="android:textColor">#FF000000</item>
-        <item name="aToolbar">@style/GoldenAToolbar</item>
-        <item name="aSupportToolbar">@style/GoldenASupportToolbar</item>
     </style>
 
-    <style name="GoldenAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="GoldenASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-    
-    <style name="MemorAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="MemorAESTheme" parent="AESTheme">
         <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FFCE1ED4</item>
         <item name="colorPrimaryDark">#FFB500BC</item>
         <item name="colorAccent">#FFE653EB</item>
         <item name="android:textColor">#FF000000</item>
-        <item name="aToolbar">@style/MemorAToolbar</item>
-        <item name="aSupportToolbar">@style/MemorASupportToolbar</item>
     </style>
 
-    <style name="MemorAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="MemorASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-    
-    <style name="TaoAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="TaoAESTheme" parent="AESTheme">
         <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FF9F9F9F</item>
         <item name="colorPrimaryDark">#FF5E5E5E</item>
         <item name="colorAccent">#FFD9D9D9</item>
         <item name="android:textColor">#FF000000</item>
-        <item name="aToolbar">@style/TaoAToolbar</item>
-        <item name="aSupportToolbar">@style/TaoASupportToolbar</item>
+    </style>
+
+    <!--<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorTextColor">#FF000000</item>
+    <item name="colorPrimary">@color/colorPrimary</item>
+    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+    <item name="colorAccent">@color/colorAccent</item>
+    <item name="android:textColor">#FF000000</item>
+    <item name="aToolbar">@style/AESAToolbar</item>
+    <item name="aSupportToolbar">@style/AESASupportToolbar</item>
+    </style>
+
+    <style name="AESAToolbar">
+    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="AESASupportToolbar">
+    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>-->
+
+    <!--<style name="DepthAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorTextColor">#FF000000</item>
+    <item name="colorPrimary">#FF2566FE</item>
+    <item name="colorPrimaryDark">#FF1359FF</item>
+    <item name="colorAccent">#FF8BAEFF</item>
+    <item name="android:textColor">#FF000000</item>
+    <item name="aToolbar">@style/DepthAToolbar</item>
+    <item name="aSupportToolbar">@style/DepthASupportToolbar</item>
+    </style>
+
+    <style name="DepthAToolbar">
+    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="DepthASupportToolbar">
+    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="SkyAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorTextColor">#FF000000</item>
+    <item name="colorPrimary">#FF1E98D4</item>
+    <item name="colorPrimaryDark">#FF046A9C</item>
+    <item name="colorAccent">#FF8CD9FF</item>
+    <item name="android:textColor">#FF000000</item>
+    <item name="aToolbar">@style/SkyAToolbar</item>
+    <item name="aSupportToolbar">@style/SkyASupportToolbar</item>
+    </style>
+
+    <style name="SkyAToolbar">
+    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="SkyASupportToolbar">
+    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="GoldenAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorTextColor">#FF000000</item>
+    <item name="colorPrimary">#FFFFE22A</item>
+    <item name="colorPrimaryDark">#FFAE9600</item>
+    <item name="colorAccent">#FFFFED78</item>
+    <item name="android:textColor">#FF000000</item>
+    <item name="aToolbar">@style/GoldenAToolbar</item>
+    <item name="aSupportToolbar">@style/GoldenASupportToolbar</item>
+    </style>
+
+    <style name="GoldenAToolbar">
+    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="GoldenASupportToolbar">
+    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="MemorAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorTextColor">#FF000000</item>
+    <item name="colorPrimary">#FFCE1ED4</item>
+    <item name="colorPrimaryDark">#FFB500BC</item>
+    <item name="colorAccent">#FFE653EB</item>
+    <item name="android:textColor">#FF000000</item>
+    <item name="aToolbar">@style/MemorAToolbar</item>
+    <item name="aSupportToolbar">@style/MemorASupportToolbar</item>
+    </style>
+
+    <style name="MemorAToolbar">
+    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="MemorASupportToolbar">
+    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="TaoAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorTextColor">#FF000000</item>
+    <item name="colorPrimary">#FF9F9F9F</item>
+    <item name="colorPrimaryDark">#FF5E5E5E</item>
+    <item name="colorAccent">#FFD9D9D9</item>
+    <item name="android:textColor">#FF000000</item>
+    <item name="aToolbar">@style/TaoAToolbar</item>
+    <item name="aSupportToolbar">@style/TaoASupportToolbar</item>
     </style>
 
     <style name="TaoAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="TaoASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-    
+    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>-->
+
     <!--<style name="AToolbar">
-        <item name="attrAToolbarTitleTextColor">#FF2DDA27</item>
-        <item name="attrAToolbarStartColor">#FF2DDA27</item>
-        <item name="attrAToolbarCenterColor">#FF2DDA27</item>
-		<item name="attrAToolbarEndColor">#FF2DDA27</item>
+    <item name="attrAToolbarTitleTextColor">#FF2DDA27</item>
+    <item name="attrAToolbarStartColor">#FF2DDA27</item>
+    <item name="attrAToolbarCenterColor">#FF2DDA27</item>
+    <item name="attrAToolbarEndColor">#FF2DDA27</item>
     </style>-->
 
     <!--对话框的样式-->