diff --git a/apputils/build.gradle b/apputils/build.gradle index 4b136f9..76f3d30 100644 --- a/apputils/build.gradle +++ b/apputils/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.apputils" - minSdkVersion 21 - targetSdkVersion 30 + minSdkVersion 26 + targetSdkVersion 29 versionCode 1 // versionName 更新后需要手动设置 // 项目模块目录的 build.gradle 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "9.3" + versionName "9.4" if(true) { versionName = genVersionName("${versionName}") } @@ -49,7 +49,31 @@ android { } dependencies { - api project(':libapputils') + implementation project(':libapputils') - api fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) + + // 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.1' } diff --git a/apputils/build.properties b/apputils/build.properties index b76eeef..9335616 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Feb 12 19:50:18 HKT 2025 -stageCount=3 +#Fri Mar 07 19:11:42 GMT 2025 +stageCount=0 libraryProject=libapputils -baseVersion=9.3 -publishVersion=9.3.2 -buildCount=0 -baseBetaVersion=9.3.3 +baseVersion=9.4 +publishVersion=9.4.0 +buildCount=1 +baseBetaVersion=9.4.1 diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java index b46865d..5e69ad2 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java @@ -14,13 +14,14 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.apputils.R; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity; +import cc.winboll.studio.libapputils.activities.LogActivity; import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity; import cc.winboll.studio.libapputils.app.AboutActivityFactory; import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.app.WinBollActivityManager; import cc.winboll.studio.libapputils.bean.APPInfo; -import cc.winboll.studio.libapputils.log.LogActivity; import cc.winboll.studio.libapputils.view.AboutView; import cc.winboll.studio.libapputils.view.YesNoAlertDialog; import com.hjq.toast.ToastUtils; @@ -34,6 +35,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0; Toolbar mToolbar; + LogView mLogView; @Override public AppCompatActivity getActivity() { @@ -58,7 +60,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct return appInfo; //return null; } - + @Override public String getTag() { return TAG; @@ -84,6 +86,9 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + mLogView = findViewById(R.id.logview); + mLogView.start(); + // 初始化工具栏 mToolbar = findViewById(R.id.activitymainToolbar1); setSupportActionBar(mToolbar); diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java index 68028b0..6886697 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java @@ -26,7 +26,7 @@ public class TestStringToQrCodeViewActivity extends AppCompatActivity implements public APPInfo getAppInfo() { return null; } - + @Override public String getTag() { return TAG; diff --git a/apputils/src/main/res/layout/activity_main.xml b/apputils/src/main/res/layout/activity_main.xml index f371462..09c4a6d 100644 --- a/apputils/src/main/res/layout/activity_main.xml +++ b/apputils/src/main/res/layout/activity_main.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="TestLog" - android:textAllCaps="false" + android:textAllCaps="false" android:onClick="onTestLogClick"/>