<autoinstaller>APK 15.0.0 release Publish.

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 17 09:51:04 HKT 2025
-stageCount=4
+#Sat Mar 15 04:31:43 GMT 2025
+stageCount=0
 libraryProject=libappbase
 baseVersion=15.0
-publishVersion=15.0.3
-buildCount=0
-baseBetaVersion=15.0.4
+publishVersion=15.0.0
+buildCount=1
+baseBetaVersion=15.0.1

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

@@ -37,10 +37,7 @@ public class MainActivity extends Activity {
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
         mLogView = findViewById(R.id.activitymainLogView1);
 
-        if (GlobalApplication.isDebuging()) {
-            mLogView.start(); 
-            ToastUtils.show("LogView start.");
-        }
+        if (GlobalApplication.isDebuging()) { mLogView.start(); }
     }
 
     @Override
@@ -92,7 +89,7 @@ public class MainActivity extends Activity {
     public void onTestSOS(View view) {
         Intent intent = new Intent(this, TestDemoService.class);
         stopService(intent);
-        if (App.isDebuging()) {
+        if(App.isDebuging()) {
             SOS.sosToAppBaseBeta(this, TestDemoService.class.getName());
         } else {
             SOS.sosToAppBase(this, TestDemoService.class.getName());
@@ -110,7 +107,7 @@ public class MainActivity extends Activity {
         Intent intent = new Intent(this, TestDemoService.class);
         intent.setAction(TestDemoService.ACTION_DISABLE);
         startService(intent);
-
+        
         Intent intentStop = new Intent(this, TestDemoService.class);
         stopService(intentStop);
     }
@@ -119,7 +116,7 @@ public class MainActivity extends Activity {
         Intent intent = new Intent(this, TestDemoService.class);
         stopService(intent);
     }
-
+    
     public void onSartTestDemoBindService(View view) {
         Intent intent = new Intent(this, TestDemoBindService.class);
         intent.setAction(TestDemoBindService.ACTION_ENABLE);

appbase/src/main/res/layout/activity_main.xml

@@ -179,16 +179,16 @@
 
 				</ScrollView>
 
+				<cc.winboll.studio.libappbase.LogView
+					android:layout_height="500dp"
+					android:layout_width="match_parent"
+					android:id="@+id/activitymainLogView1"/>
+
 			</LinearLayout>
 
 		</LinearLayout>
 
 	</ScrollView>
 
-    <cc.winboll.studio.libappbase.LogView
-        android:layout_height="300dp"
-        android:layout_width="match_parent"
-        android:id="@+id/activitymainLogView1"/>
-    
 </LinearLayout>
 

appbase/src/main/res/values/colors.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#FF00B322</color>
-    <color name="colorPrimaryDark">#FF005C12</color>
-    <color name="colorAccent">#FF8DFFA2</color>
-    <color name="colorText">#FFFFFB8D</color>
+    <color name="colorPrimary">#005800FF</color>
+    <color name="colorPrimaryDark">#005800FF</color>
+    <color name="colorAccent">#005800FF</color>
 </resources>

autoinstaller/build.gradle

@@ -18,18 +18,18 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.autoinstaller"
-        minSdkVersion 24
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 2
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "5.0" 
+        versionName "15.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,30 +41,10 @@ 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.1.0'
-    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 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
-    api 'androidx.lifecycle:lifecycle-livedata:1.0.0'
-    
-    //api 'cc.winboll.studio:libaes:6.3.2'
-    //api 'cc.winboll.studio:libapputils:8.3.8'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'cc.winboll.studio:libappbase:15.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 02:39:56 HKT 2025
-stageCount=4
+#Sat Mar 15 15:38:45 HKT 2025
+stageCount=1
 libraryProject=
-baseVersion=5.0
-publishVersion=5.0.3
+baseVersion=15.0
+publishVersion=15.0.0
 buildCount=0
-baseBetaVersion=5.0.4
+baseBetaVersion=15.0.1

autoinstaller/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         android:persistent="true"
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.Application">
+        android:theme="@style/MyAppTheme">
 
         <activity
             android:name=".MainActivity"

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java

@@ -5,24 +5,25 @@ package cc.winboll.studio.autoinstaller;
  * @Date 2024/04/28 02:39:58
  * @Describe 全局应用类
  */
-import android.view.Gravity;
-import com.hjq.toast.ToastUtils;
-import cc.winboll.studio.shared.app.WinBollApplication;
 
-public class App extends WinBollApplication {
+
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+
+public class App extends GlobalApplication {
     
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
         super.onCreate();
-        setIsDebug(BuildConfig.DEBUG);
+        setIsDebuging(this, BuildConfig.DEBUG);
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.toast_custom_view);
+        //ToastUtils.setView(R.layout.toast_custom_view);
         //ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
 }
 

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/FileListener.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller;
 
 import android.os.FileObserver;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class FileListener extends FileObserver {
 	public final static String TAG = "FileListener";

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

@@ -2,6 +2,7 @@ package cc.winboll.studio.autoinstaller;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
@@ -14,14 +15,14 @@ import android.widget.Switch;
 import android.widget.TextClock;
 import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
-import cc.winboll.studio.shared.log.LogView;
 import cc.winboll.studio.autoinstaller.MainActivity;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
 import cc.winboll.studio.autoinstaller.views.ListViewForScrollView;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -136,9 +137,10 @@ public class MainActivity extends Activity {
             ToastUtils.show("Installed APP package name is null.");
             return;
         }
-
+        
         Intent intent = getPackageManager().getLaunchIntentForPackage(mszInstalledPackageName);
         if (intent != null) {
+            ToastUtils.show("startActivity");
             startActivity(intent);
         } else {
             // 若没能获取到启动意图，可进行相应提示等操作，比如跳转到应用商店让用户下载该应用（示例）

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/beans/AppConfigs.java

@@ -10,11 +10,11 @@ import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.FileUtil;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.IOException;
 import java.io.Serializable;
 import java.io.StringReader;
 import java.io.StringWriter;
-import cc.winboll.studio.shared.log.LogUtils;
 
 public class AppConfigs implements Serializable {
 

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java

@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.os.Build;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 /**
  * @Author ZhanGSKen@QQ.COM

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/MainService.java

@@ -12,7 +12,6 @@ import android.os.IBinder;
 import android.os.Message;
 import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
 import cc.winboll.studio.autoinstaller.FileListener;
 import cc.winboll.studio.autoinstaller.MainActivity;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
@@ -21,7 +20,8 @@ import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
 import cc.winboll.studio.autoinstaller.utils.PackageUtil;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.io.File;
 import java.lang.ref.WeakReference;
 
@@ -75,6 +75,7 @@ public class MainService extends Service {
                 startWatchingFile(appConfigs.getWatchingFilePath());
 
                 LogUtils.d(TAG, "running...");
+                ToastUtils.show("running...");
 
             } else {
                 LogUtils.d(TAG, "_mIsServiceAlive is " + Boolean.toString(_mIsServiceAlive));

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java

@@ -8,7 +8,7 @@ package cc.winboll.studio.autoinstaller.utils;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class PackageUtil {
 

autoinstaller/src/main/res/layout/activity_main.xml

@@ -132,7 +132,7 @@
 
 	</LinearLayout>
 
-	<cc.winboll.studio.shared.log.LogView
+	<cc.winboll.studio.libappbase.LogView
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="200dp"

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

@@ -0,0 +1,13 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="MyAppTheme" parent="APPBaseTheme">
+        <item name="attrColorPrimary">@color/colorPrimary</item>
+        <item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme">
+        <item name="colorTittle">#FFFFFFFF</item>
+        <item name="colorTittleBackgound">#FF00A4B3</item>
+        <item name="colorText">#FFFFFFFF</item>
+        <item name="colorTextBackgound">#FF000000</item>
+	</style>
+</resources>

autoinstaller/src/main/res/values/themes.xml

@@ -1,14 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Application" parent="android:Theme.Material.Light.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="android:colorPrimary">@color/purple_500</item>
-        
-        <!-- Secondary brand color. -->
-        <item name="android:colorSecondary">@color/teal_200</item>
-        
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/purple_700</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 17 09:51:04 HKT 2025
-stageCount=4
+#Sat Mar 15 04:31:43 GMT 2025
+stageCount=0
 libraryProject=libappbase
 baseVersion=15.0
-publishVersion=15.0.3
-buildCount=0
-baseBetaVersion=15.0.4
+publishVersion=15.0.0
+buildCount=1
+baseBetaVersion=15.0.1

libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java

@@ -190,7 +190,6 @@ public class LogView extends RelativeLayout {
 
         // 加载标签表
         mListViewTags = findViewById(cc.winboll.studio.libappbase.R.id.tags_listview);
-        mListViewTags.setVerticalOffset(10);
         mTAGListAdapter = new TAGListAdapter(mContext, mapTAGList);
         mListViewTags.setAdapter(mTAGListAdapter);
 

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ToastUtils.java

@@ -28,6 +28,6 @@ public class ToastUtils {
     }
 
     public static void show(String message) {
-        Toast.makeText(getInstance().mContext, message, Toast.LENGTH_SHORT).show();
+        Toast.makeText(getInstance().mContext, "", Toast.LENGTH_SHORT).show();
     }
 }

libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java

@@ -12,9 +12,7 @@ import android.widget.ListView;
 import cc.winboll.studio.libappbase.LogUtils;
 
 public class HorizontalListView extends ListView {
-
     public static final String TAG = "HorizontalListView";
-    int verticalOffset = 0;
 
     public HorizontalListView(Context context) {
         super(context);
@@ -27,10 +25,25 @@ public class HorizontalListView extends ListView {
     public HorizontalListView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
-
-    public void setVerticalOffset(int verticalOffset) {
-        this.verticalOffset = verticalOffset;
-    }
+//    @Override
+//    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+//        super.onLayout(changed, l, t, r, b);
+//        int childCount = getChildCount();
+//        int left = getPaddingLeft();
+//        // 获取HorizontalListView的高度
+//        int viewHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
+//        for (int i = 0; i < childCount; i++) {
+//            View child = getChildAt(i);
+//            int width = child.getMeasuredWidth();
+//            int height = child.getMeasuredHeight();
+//            // 计算子项在垂直方向上的居中偏移量
+//            int verticalOffset = (viewHeight - height) / 2;
+//            // 设置子视图的位置，实现水平布局并垂直居中
+//            child.layout(left, getPaddingTop() + verticalOffset, left + width, getPaddingTop() + verticalOffset + height);
+//            left += width;
+//        }
+//    }
+//    
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
@@ -39,7 +52,7 @@ public class HorizontalListView extends ListView {
         int left = getPaddingLeft();
         int viewHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
         LogUtils.d(TAG, String.format("HorizontalListView的高度 %d", viewHeight));
-        
+        int verticalOffset = 20;
         for (int i = 0; i < childCount; i++) {
             View child = getChildAt(i);
             // 计算每个子视图的宽度和高度
@@ -47,7 +60,7 @@ public class HorizontalListView extends ListView {
             int height = child.getMeasuredHeight();
             //LogUtils.d(TAG, String.format("child : width %d , height %d", width, height));
             // 设置子视图的位置，实现水平布局
-
+            
             child.layout(left, verticalOffset, left + width, verticalOffset + height);
             left += width;
         }
@@ -55,11 +68,15 @@ public class HorizontalListView extends ListView {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        
         int newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
         //super.onMeasure(widthMeasureSpec, newHeightMeasureSpec);
         int newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
         //LogUtils.d(TAG, String.format("newWidthMeasureSpec %d, newHeightMeasureSpec %d", newWidthMeasureSpec, newHeightMeasureSpec));
         super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec);
+        
+//        ViewGroup.LayoutParams params = getLayoutParams();
+//        params.width = getMeasuredWidth();
     }
 }
 

libappbase/src/main/res/drawable/bg_border_round.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="#000000" /> <!-- 这里可调整边框宽度和颜色 -->
-    <solid android:color="@android:color/transparent" />
-    <corners 
-        android:bottomLeftRadius="6dip" 
-        android:bottomRightRadius="6dip" 
-        android:topLeftRadius="6dip" 
-        android:topRightRadius="6dip" /> 
-</shape>

libappbase/src/main/res/drawable/bg_shadow.xml

@@ -10,8 +10,8 @@
         <shape android:shape="rectangle" > 
             <gradient 
                 android:angle="270" 
-                android:endColor="@color/colorAccent" 
-                android:startColor="@color/colorAccent" /> 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
             <corners 
                 android:bottomLeftRadius="6dip" 
                 android:bottomRightRadius="6dip" 

libappbase/src/main/res/layout/item_logtag.xml

@@ -5,18 +5,18 @@
 	android:orientation="horizontal"
 	android:layout_width="wrap_content"
 	android:layout_height="match_parent"
-	android:background="@drawable/bg_border_round">
+	android:background="#FFEEEEEE">
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="@dimen/button_height"
-		android:layout_marginLeft="5dp"
-		android:id="@+id/viewlogtagTextView1"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        android:layout_marginLeft="5dp"
+        android:id="@+id/viewlogtagTextView1"/>
 
-	<CheckBox
-		android:layout_width="wrap_content"
-		android:layout_height="@dimen/button_height"
-		android:id="@+id/viewlogtagCheckBox1"/>
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        android:id="@+id/viewlogtagCheckBox1"/>
 
 </LinearLayout>
 

libappbase/src/main/res/layout/view_log.xml

@@ -72,29 +72,27 @@
 		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 		android:id="@+id/viewlogLinearLayout1"
 		android:gravity="center_vertical"
-		android:background="@drawable/bg_shadow">
+		android:background="#FFC0F4C2">
 
 		<CheckBox
 			android:layout_width="wrap_content"
-			android:layout_height="@dimen/button_height"
+			android:layout_height="wrap_content"
 			android:text="ALL"
-			android:id="@+id/viewlogCheckBox1"
-			android:background="@drawable/bg_border_round"
-			android:layout_marginLeft="5dp"
-			android:layout_marginRight="5dp"/>
+			android:id="@+id/viewlogCheckBox1"/>
 
 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:background="@drawable/bg_border"
 			android:scrollbars="none"
-			android:padding="5dp"
-			android:layout_weight="1.0">
+			android:layout_weight="1.0"
+			android:background="#FF97F2E3">
 
 			<cc.winboll.studio.libappbase.views.HorizontalListView
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:id="@+id/tags_listview"/>
+				android:background="@drawable/view_border"
+				android:id="@+id/tags_listview"
+				android:paddingLeft="10dp"/>
 
 		</HorizontalScrollView>
 

libappbase/src/main/res/values/dimens.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- 定义一个名为text_size_normal的尺寸，值为16sp -->
-    <dimen name="text_size_normal">16sp</dimen>
-    <!-- 定义一个名为margin_small的尺寸，值为8dp -->
-    <dimen name="margin_small">8dp</dimen>
-    <!-- 定义一个名为image_width的尺寸，值为200dp -->
-    <dimen name="button_height">24dp</dimen>
-</resources>