Merge remote-tracking branch 'origin/androidxdemo' into appbase

androidxdemo/build.gradle

@@ -18,15 +18,8 @@ def genVersionName(def versionName){
 }
 
 android {
-	productFlavors {
+    compileSdkVersion 32
-		beta {
+    buildToolsVersion "32.0.0"
-		}
-		stage {
-		}
-	}
-
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
@@ -36,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.0"
+        versionName "15.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -54,23 +47,26 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // SSH
-    implementation 'com.jcraft:jsch:0.1.55'
+    api 'com.jcraft:jsch:0.1.55'
     // Html 解析
-    implementation 'org.jsoup:jsoup:1.13.1'
+    api 'org.jsoup:jsoup:1.13.1'
     // 二维码类库
-    implementation 'com.google.zxing:core:3.4.1'
+    api 'com.google.zxing:core:3.4.1'
-    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
     // 应用介绍页类库
-    implementation 'io.github.medyo:android-about-page:2.0.0'
+    api 'io.github.medyo:android-about-page:2.0.0'
     // 吐司类库
-    implementation 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.github.getActivity:ToastUtils:10.5'
     // 网络连接类库
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    // Android 类库
+    // AndroidX 类库
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
+    api 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 11 18:25:43 GMT 2025
+#Mon Mar 24 06:19:57 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=1.0
+baseVersion=15.0
-publishVersion=1.0.0
+publishVersion=15.0.0
-buildCount=4
+buildCount=8
-baseBetaVersion=1.0.1
+baseBetaVersion=15.0.1

androidxdemo/src/main/AndroidManifest.xml

@@ -8,9 +8,9 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MyAppTheme"
         android:resizeableActivity="true"
-        android:name=".GlobalApplication">
+        android:name=".App">
 
         <activity
             android:name=".MainActivity"
@@ -34,4 +34,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -1,7 +1,6 @@
 package cc.winboll.studio.androidxdemo;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -22,6 +21,7 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -39,15 +39,15 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class GlobalApplication extends Application {
+public class App extends GlobalApplication {
 
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
     @Override
     public void onCreate() {
         super.onCreate();
-        CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerGlobal(this);
-        CrashHandler.getInstance().registerPart(this);
+        //CrashHandler.getInstance().registerPart(this);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {
@@ -252,7 +252,7 @@ public class GlobalApplication extends Application {
 
             private static String getKernel() {
                 try {
-                    return GlobalApplication.toString(new FileInputStream("/proc/version")).trim();
+                    return App.toString(new FileInputStream("/proc/version")).trim();
                 } catch (Throwable e) {
                     return e.getMessage();
                 }
@@ -331,4 +331,4 @@ public class GlobalApplication extends Application {
             restart();
         }
     }
-}
+}

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

@@ -3,17 +3,26 @@ package cc.winboll.studio.androidxdemo;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogView;
 
 public class MainActivity extends AppCompatActivity {
-    
+
+    LogView mLogView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-		
+
 		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
-        
+
+        mLogView = findViewById(R.id.logview);
     }
-    
+
-}
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+}

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

@@ -34,5 +34,18 @@
 
 	</LinearLayout>
 
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
+
 </LinearLayout>
 

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

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>