<contacts>APK 15.3.2 release Publish.

aes/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.6" 
+        versionName "15.8" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon May 12 18:10:35 HKT 2025
-stageCount=4
+#Tue May 13 11:22:39 HKT 2025
+stageCount=1
 libraryProject=libaes
-baseVersion=15.6
-publishVersion=15.6.3
+baseVersion=15.8
+publishVersion=15.8.0
 buildCount=0
-baseBetaVersion=15.6.4
+baseBetaVersion=15.8.1

androiddemo/build.gradle

@@ -24,7 +24,7 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
@@ -67,6 +67,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
     
-    api 'cc.winboll.studio:libapputils:15.2.2'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.1'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 03:17:18 GMT 2025
+#Mon May 19 21:45:28 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=21
+buildCount=25
 baseBetaVersion=15.0.1

androidxdemo/build.gradle

@@ -24,7 +24,7 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
@@ -67,7 +67,7 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libaes:15.2.6'
-    api 'cc.winboll.studio:libapputils:15.2.2'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libaes:15.8.0'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.1'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 03:15:55 GMT 2025
+#Mon May 19 21:43:40 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=18
+buildCount=22
 baseBetaVersion=15.0.1

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

@@ -22,9 +22,9 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.winboll.studio.androidxdemo.R;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
+import com.hjq.toast.style.WhiteToastStyle;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -53,8 +53,8 @@ public class App extends GlobalApplication {
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.view_toast);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
         
         //CrashHandler.getInstance().registerGlobal(this);

appbase/build.gradle

@@ -30,7 +30,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.7"
+        versionName "15.8"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 11 19:36:35 GMT 2025
-stageCount=7
+#Tue May 20 03:28:00 GMT 2025
+stageCount=2
 libraryProject=libappbase
-baseVersion=15.7
-publishVersion=15.7.6
-buildCount=15
-baseBetaVersion=15.7.7
+baseVersion=15.8
+publishVersion=15.8.1
+buildCount=1
+baseBetaVersion=15.8.2

apputils/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.3" 
+        versionName "15.8" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 15:04:17 HKT 2025
-stageCount=5
+#Tue May 13 11:18:09 HKT 2025
+stageCount=2
 libraryProject=libapputils
-baseVersion=15.3
-publishVersion=15.3.4
+baseVersion=15.8
+publishVersion=15.8.1
 buildCount=0
-baseBetaVersion=15.3.5
+baseBetaVersion=15.8.2

apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java

@@ -20,18 +20,7 @@ import cc.winboll.studio.libapputils.views.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
-
-    @Override
-    public Activity getActivity() {
-        return super.getActivity();
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
+public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AssetsHtmlActivity";
 
@@ -43,12 +32,17 @@ public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLA
 
     // Assets 文件夹里的 Html 文件的名称
     String mszHtmlFileName;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
 
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         return super.onCreateOptionsMenu(menu);

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

@@ -217,10 +217,10 @@ final public class MainActivity extends Activity {
         if (item.getItemId() == R.id.item_exit) {
             //exit();
             return true;
-        } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
-            Intent intent = new Intent(this, TestStringToQRCodeViewActivity.class);
-            startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
-            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, TestStringToQrCodeViewActivity.class);
+//        } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
+//            Intent intent = new Intent(this, TestStringToQRCodeViewActivity.class);
+//            startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
+//            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, TestStringToQrCodeViewActivity.class);
         } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
             Intent intent = new Intent(this, QRCodeDecodeActivity.class);
             startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);

apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java

@@ -0,0 +1,24 @@
+package cc.winboll.studio.apputils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/05/13 11:15
+ * @Describe WinBoLLActivity
+ */
+import android.app.Activity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+
+public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "WinBoLLActivity";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+}

build.gradle

@@ -25,14 +25,7 @@ buildscript {
         //mavenLocal()
         
         // WinBoLL.CC 紧急备用 Maven 仓库
-        //maven { url 'https://spare-maven.winboll.cc/repository/' }
-        maven {
-            url 'sftp://studio@winboll.cc:2222//winboll/spare-maven/repository/'
-            credentials {
-                username 'studio'
-                password 'winbollstudio'
-            }
-        }
+        maven { url 'https://spare-maven.winboll.cc/repository/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
@@ -47,6 +40,7 @@ allprojects {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
         }
+        
         // Nexus Maven 库地址
         // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
@@ -67,14 +61,7 @@ allprojects {
         //mavenLocal()
         
         // WinBoLL.CC 紧急备用 Maven 仓库
-        //maven { url 'https://spare-maven.winboll.cc/repository/' }
-        maven {
-            url 'sftp://studio@winboll.cc:2222//winboll/spare-maven/repository/'
-            credentials {
-                username 'studio'
-                password 'winbollstudio'
-            }
-        }
+        maven { url 'https://spare-maven.winboll.cc/repository/' }
     }
     ext {
         // 定义全局变量，常用于版本管理

contacts/build.gradle

@@ -24,12 +24,12 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.contacts"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "15.3" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -45,6 +45,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'cc.winboll.studio:libaes:15.8.0'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.1'
     
     // 权限请求框架：https://github.com/getActivity/XXPermissions
     api 'com.github.getActivity:XXPermissions:18.63'
@@ -81,8 +84,4 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libaes:15.2.4'
-    api 'cc.winboll.studio:libapputils:15.2.1'
-    api 'cc.winboll.studio:libappbase:15.2.2'
 }

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Apr 13 02:46:09 HKT 2025
-stageCount=8
+#Tue May 20 13:02:18 HKT 2025
+stageCount=3
 libraryProject=
-baseVersion=15.2
-publishVersion=15.2.7
+baseVersion=15.3
+publishVersion=15.3.2
 buildCount=0
-baseBetaVersion=15.2.8
+baseBetaVersion=15.3.3

contacts/src/main/AndroidManifest.xml

@@ -42,7 +42,8 @@
         android:icon="@drawable/ic_winboll"
         android:label="@string/app_name"
         android:theme="@style/MyAppTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".MainActivity"
@@ -192,4 +193,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -7,7 +7,7 @@ package cc.winboll.studio.contacts;
  */
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
 import com.hjq.toast.ToastUtils;
 
 public class App extends GlobalApplication {
@@ -20,8 +20,8 @@ public class App extends GlobalApplication {
         // 这样可以预先设置日志与数据的存储根目录。
         //setIsDebuging(BuildConfig.DEBUG);
         super.onCreate();
-        // 设置 WinBoll 应用 UI 类型
-        WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
+        // 设置 WinBoLL 应用 UI 类型
+        getWinBoLLActivityManager().setWinBoLLUI_TYPE(WinBoLLActivityManager.WinBoLLUI_TYPE.Aplication);
         
         //LogUtils.d(TAG, "onCreate");
         

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

@@ -32,22 +32,21 @@ import cc.winboll.studio.contacts.fragments.CallLogFragment;
 import cc.winboll.studio.contacts.fragments.ContactsFragment;
 import cc.winboll.studio.contacts.fragments.LogFragment;
 import cc.winboll.studio.contacts.services.MainService;
-import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;
 
-final public class MainActivity extends AppCompatActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
+final public class MainActivity extends AppCompatActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
 	public static final String TAG = "MainActivity";
 
     public static final int REQUEST_HOME_ACTIVITY = 0;
     public static final int REQUEST_ABOUT_ACTIVITY = 1;
 
-    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";
+    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoLL.ACTION_SOS";
 
     static MainActivity _MainActivity;
     LogView mLogView;
@@ -71,10 +70,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 
     private static final int DIALER_REQUEST_CODE = 1;
 
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
 //    @Override
 //    public APPInfo getAppInfo() {
@@ -95,6 +94,17 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //        return null;
 //    }
 
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
@@ -111,7 +121,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //            // 显示后退按钮
 //            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 //        }
-        getSupportActionBar().setSubtitle(getTag());
+        getSupportActionBar().setSubtitle(TAG);
 
         tabLayout = findViewById(R.id.tabLayout);
         viewPager = findViewById(R.id.viewPager);
@@ -339,7 +349,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //
 //        if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) {
 //            try {
-//                WinBollActivity clazzActivity = UnitTestActivity.class.newInstance();
+//                WinBoLLActivity clazzActivity = UnitTestActivity.class.newInstance();
 //                String tag = clazzActivity.getTag();
 //                LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
 //                Intent subIntent = new Intent(this, UnitTestActivity.class);
@@ -357,8 +367,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //                }
 //
 //                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
-//                //startWinBollActivity(subIntent, tag);
-//                WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class);
+//                //startWinBoLLActivity(subIntent, tag);
+//                WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class);
 //            } catch (IllegalAccessException | InstantiationException | IOException e) {
 //                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
 //                // 函数处理异常返回失败
@@ -371,10 +381,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //        return true;
 //    }
 
-    @Override
-    public String getTag() {
-        return TAG;
-    }
+//    @Override
+//    public String getTag() {
+//        return TAG;
+//    }
 
 //    @Override
 //    public void onBackPressed() {
@@ -386,7 +396,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //
 //            @Override
 //            public void onYes() {
-//                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+//                WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll();
 //            }
 //
 //            @Override
@@ -408,7 +418,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         if (item.getItemId() == R.id.item_settings) {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
-            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class);
+            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, CallActivity.class);
         }
 //        } else 
 //        if (item.getItemId() == R.id.item_exit) {

contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java

@@ -10,14 +10,15 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class AboutActivity extends WinBollActivity implements IWinBollActivity {
+public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -64,13 +65,13 @@ public class AboutActivity extends WinBollActivity implements IWinBollActivity {
         );
         layout.addView(aboutView, params);
 
-        GlobalApplication.getWinBollActivityManager().add(this);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        GlobalApplication.getWinBollActivityManager().registeRemove(this);
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
     }
 
     public AboutView CreateAboutView() {

contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java

@@ -24,6 +24,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.contacts.App;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.adapters.PhoneConnectRuleAdapter;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
@@ -34,15 +35,13 @@ import cc.winboll.studio.contacts.bobulltoon.TomCat;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.views.DuInfoTextView;
-import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
 import java.util.List;
-import cc.winboll.studio.contacts.App;
 
-public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {
+public class SettingsActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "SettingsActivity";
 
@@ -177,6 +176,8 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         etDunResumeSecondCount.setEnabled(!isEnableDun);
         etDunResumeCount.setEnabled(!isEnableDun);
 
+        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
+        etBoBullToonURL.setText(Rules.getInstance(this).getBoBullToonURL());
     }
 
     public static void notifyDunInfoUpdate() {
@@ -201,6 +202,11 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         settingsModel.setIsEnableDun(isEnableDun);
         Rules.getInstance(this).saveDun();
         Rules.getInstance(this).reload();
+        
+        // 重新加载盾牌参数
+        etDunTotalCount.setText(Integer.toString(settingsModel.getDunTotalCount()));
+        etDunResumeSecondCount.setText(Integer.toString(settingsModel.getDunResumeSecondCount()));
+        etDunResumeCount.setText(Integer.toString(settingsModel.getDunResumeCount()));
     }
 
     void updateStreamVolumeTextView() {
@@ -233,7 +239,18 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         }
     }
 
+    public void onResetBoBullToonURL(View view) {
+        Rules.getInstance(this).resetDefaultBoBullToonURL();
+        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
+        etBoBullToonURL.setText(Rules.getInstance(this).getBoBullToonURL());
+    }
+
     public void onDownloadBoBullToon(View view) {
+        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
+        if (!etBoBullToonURL.getText().toString().trim().equals(Rules.getInstance(this).getBoBullToonURL())) {
+            Rules.getInstance(this).setBoBullToonURL(etBoBullToonURL.getText().toString().trim());
+        }
+
         final TomCat tomCat = TomCat.getInstance(this);
         new Thread(new Runnable() {
                 @Override
@@ -247,8 +264,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
             }).start();
     }
 
-
-
     public void onSearchBoBullToonPhone(View view) {
         TomCat tomCat = TomCat.getInstance(this);
         EditText etPhone = findViewById(R.id.activitysettingsEditText1);
@@ -311,8 +326,8 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
             }
         }
     }
-    
+
     public void onAbout(View view) {
-        App.getWinBollActivityManager().startWinBollActivity(this, AboutActivity.class);
+        App.getWinBoLLActivityManager().startWinBoLLActivity(this, AboutActivity.class);
     }
 }

contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java

@@ -11,9 +11,9 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
+public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "WinBollActivity";
 

contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java

@@ -14,6 +14,7 @@ import cc.winboll.studio.contacts.utils.IntUtils;
 public class SettingsModel extends BaseBean {
 
     public static final String TAG = "SettingsModel";
+    
     public static final int MAX_INTRANGE = 666666;
     public static final int MIN_INTRANGE = 1;
     
@@ -27,6 +28,8 @@ public class SettingsModel extends BaseBean {
     int dunResumeCount;
     // 是否启用云盾
     boolean isEnableDun;
+    // BoBullToon 应用模块数据请求地址
+    String szBoBullToon_URL;
 
     public SettingsModel() {
         this.dunTotalCount = 6;
@@ -34,14 +37,24 @@ public class SettingsModel extends BaseBean {
         this.dunResumeSecondCount = 60;
         this.dunResumeCount = 1;
         this.isEnableDun = false;
+        this.szBoBullToon_URL = "";
     }
 
-    public SettingsModel(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount, int dunResumeCount, boolean isEnableDun) {
+    public SettingsModel(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount, int dunResumeCount, boolean isEnableDun, String szBoBullToon_URL) {
         this.dunTotalCount = getSettingsModelRangeInt(dunTotalCount);
         this.dunCurrentCount = getSettingsModelRangeInt(dunCurrentCount);
         this.dunResumeSecondCount = getSettingsModelRangeInt(dunResumeSecondCount);
         this.dunResumeCount = getSettingsModelRangeInt(dunResumeCount);
         this.isEnableDun = isEnableDun;
+        this.szBoBullToon_URL = szBoBullToon_URL;
+    }
+
+    public void setBoBullToon_URL(String boBullToon_URL) {
+        this.szBoBullToon_URL = boBullToon_URL;
+    }
+
+    public String getBoBullToon_URL() {
+        return szBoBullToon_URL;
     }
 
     public void setDunTotalCount(int dunTotalCount) {
@@ -102,7 +115,8 @@ public class SettingsModel extends BaseBean {
         jsonWriter.name("dunResumeSecondCount").value(getDunResumeSecondCount());
         jsonWriter.name("dunResumeCount").value(getDunResumeCount());
         jsonWriter.name("isEnableDun").value(isEnableDun());
-
+        jsonWriter.name("szBoBullToon_URL").value(getBoBullToon_URL());
+        
     }
 
     @Override
@@ -118,6 +132,8 @@ public class SettingsModel extends BaseBean {
                 setDunResumeCount(getSettingsModelRangeInt(jsonReader.nextInt()));
             } else if (name.equals("isEnableDun")) {
                 setIsEnableDun(jsonReader.nextBoolean());
+            } else if (name.equals("szBoBullToon_URL")) {
+                setBoBullToon_URL(jsonReader.nextString());
             } else {
                 return false;
             }

contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java

@@ -6,6 +6,8 @@ package cc.winboll.studio.contacts.bobulltoon;
  * @Describe 汤姆猫管家 ：使用 BoBullToon 项目，对通讯地址进行筛选判断的好朋友。
  */
 import android.content.Context;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
@@ -28,6 +30,7 @@ public class TomCat {
     public static final String TAG = "TomCat";
 
     List<String> listPhoneBoBullToon = new ArrayList<String>();
+    String mszBoBullToon_URL;
 
     static volatile TomCat _TomCat;
     Context mContext;
@@ -41,8 +44,12 @@ public class TomCat {
         }
         return _TomCat;
     }
+    
+    public String getDefaultBobulltoonUrl() {
+        return mContext.getString(R.string.default_bobulltoon_url);
+    }
 
-    void downloadAndExtractZip(String zipUrl, String destinationFolder) throws IOException {
+    boolean downloadAndExtractZip(String zipUrl, String destinationFolder) throws IOException {
         OkHttpClient client = new OkHttpClient();
         Request request = new Request.Builder()
             .url(zipUrl)
@@ -95,13 +102,16 @@ public class TomCat {
             // 删除临时 ZIP 文件
             tempZipFile.delete();
             LogUtils.d(TAG, "已更新 BoBullToon 数据");
+            return true;
         } catch (Exception e) {
+            ToastUtils.show(e.getMessage());
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            return false;
         }
     }
 
     public boolean downloadBoBullToon() {
-        String zipUrl = "http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip"; // 替换为实际的 ZIP 文件 URL
+        String zipUrl = Rules.getInstance(mContext).getBoBullToonURL(); // 替换为实际的 ZIP 文件 URL
         String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
         try {
             // 删除旧文件
@@ -113,9 +123,11 @@ public class TomCat {
             }
 
             // 更新新文件
-            downloadAndExtractZip(zipUrl, destinationFolder);
-            LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
-            return true;
+            if(downloadAndExtractZip(zipUrl, destinationFolder)) {
+                LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
+                return true;
+            }
+            return false;
         } catch (IOException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }

contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java

@@ -18,6 +18,7 @@ import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.regex.Pattern;
+import cc.winboll.studio.contacts.bobulltoon.TomCat;
 
 public class Rules {
 
@@ -84,6 +85,20 @@ public class Rules {
         PhoneConnectRuleModel.saveBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleModel.class);
     }
 
+    public void resetDefaultBoBullToonURL() {
+        mSettingsModel.setBoBullToon_URL(TomCat.getInstance(mContext).getDefaultBobulltoonUrl());
+        saveDun();
+    }
+
+    public void setBoBullToonURL(String szUrl) {
+        mSettingsModel.setBoBullToon_URL(szUrl);
+        saveDun();
+    }
+
+    public String getBoBullToonURL() {
+        return mSettingsModel.getBoBullToon_URL();
+    }
+
     public void loadDun() {
         mSettingsModel = SettingsModel.loadBean(mContext, SettingsModel.class);
         if (mSettingsModel == null) {
@@ -109,8 +124,12 @@ public class Rules {
         boolean isDefend = false; // 盾牌是否生效
         boolean isConnect = true; // 防御结果是否连接
 
+        // 进行盾牌层数预计缩减计算
+        int nDunCurrentCount = mSettingsModel.getDunCurrentCount() - 1;
+        LogUtils.d(TAG, String.format("nDunCurrentCount : %d", nDunCurrentCount));
+
         // 如果盾值小于1，则解除防御
-        if (!isDefend && mSettingsModel.getDunCurrentCount() < 1) {
+        if (!isDefend && nDunCurrentCount < 1) {
             // 盾层为1以下，防御解除
             LogUtils.d(TAG, "盾层为1以下，防御解除");
             isDefend = true;
@@ -174,17 +193,17 @@ public class Rules {
             // 就减少防御盾牌层数。
             // 每校验一次规则，云盾防御层数减1
             // 当云盾防御层数为0时，再次进行以下程序段则恢复满值防御。
-            int newDunCount = mSettingsModel.getDunCurrentCount() - 1;
+            int newDunCount = nDunCurrentCount;
             LogUtils.d(TAG, String.format("新的防御层数预计为 %d", newDunCount));
 
-            // 保证盾值在[0，DunTotalCount]之内其他值一律重置为 DunTotalCount。
-            if (newDunCount < 0 || newDunCount > mSettingsModel.getDunTotalCount()) {
-                mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
-                LogUtils.d(TAG, String.format("盾值不在[0，%d]区间，恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount()));
-            } else {
+            // 保证盾值在[1，DunTotalCount]之内其他值一律重置为 DunTotalCount。
+            if (newDunCount > 0 && newDunCount < mSettingsModel.getDunTotalCount()) {
                 mSettingsModel.setDunCurrentCount(newDunCount);
                 LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount));
-            }
+            } else {
+                mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
+                LogUtils.d(TAG, String.format("盾值不在[0，%d]区间，恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount()));
+            } 
 
             saveDun();
             SettingsActivity.notifyDunInfoUpdate();

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

@@ -18,6 +18,7 @@ import android.content.ServiceConnection;
 import android.media.AudioManager;
 import android.os.Binder;
 import android.os.IBinder;
+import cc.winboll.studio.contacts.App;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
 import cc.winboll.studio.contacts.beans.RingTongBean;
 import cc.winboll.studio.contacts.bobulltoon.TomCat;
@@ -29,11 +30,9 @@ import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.threads.MainServiceThread;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
+import cc.winboll.studio.libappbase.winboll.WinBoLL;
 import java.util.Timer;
 import java.util.TimerTask;
-import cc.winboll.studio.libappbase.sos.WinBoll;
-import cc.winboll.studio.contacts.App;
-import cc.winboll.studio.libappbase.sos.APPModel;
 
 public class MainService extends Service {
 
@@ -129,11 +128,11 @@ public class MainService extends Service {
             isServiceRunning = true;
             // 唤醒守护进程
             wakeupAndBindAssistant();
-            // 召唤 WinBoll APP 绑定本服务
+            // 召唤 WinBoLL APP 绑定本服务
             if (App.isDebuging()) {
-                WinBoll.bindToAPPBaseBeta(this, MainService.class.getName());
+                WinBoLL.bindToAPPBaseBeta(this, MainService.class.getName());
             } else {
-                WinBoll.bindToAPPBase(this, MainService.class.getName());
+                WinBoLL.bindToAPPBase(this, MainService.class.getName());
             }
 
             // 初始化服务运行参数

contacts/src/main/res/layout/activity_settings.xml

@@ -195,16 +195,29 @@
 				android:text="拨不通电话记录查询："/>
 
 			<LinearLayout
-				android:orientation="vertical"
+				android:orientation="horizontal"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:gravity="right"
 				android:layout_margin="10dp">
 
+				<EditText
+					android:layout_width="0dp"
+					android:ems="10"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.0"
+					android:id="@+id/bobulltoonurl_et"/>
+
 				<Button
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="下载 BoBullToon"
+					android:text="重置地址"
+					android:onClick="onResetBoBullToonURL"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="下载数据"
 					android:onClick="onDownloadBoBullToon"/>
 
 			</LinearLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- WinBoll 默认方案 -->
+    <!-- WinBoLL 默认方案 -->
     <color name="colorPrimary">#FF196ABC</color>
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>

contacts/src/main/res/values/strings.xml

@@ -2,5 +2,6 @@
 <resources>
 
     <string name="app_name">Contacts</string>
+    <string name="default_bobulltoon_url">http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip</string>
 
 </resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MyAppTheme" parent="APPBaseTheme">
+    <style name="MyAppTheme" parent="AESTheme">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -8,7 +8,7 @@
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+    <style name="GlobalCrashActivityTheme" parent="AESTheme">
         <item name="colorTittle">@color/colorAccent</item>
         <item name="colorTittleBackgound">@color/colorPrimary</item>
         <item name="colorText">@color/colorAccent</item>

contacts/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">winboll.cc</domain>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">10.8.0.12</domain>
+    </domain-config>
+</network-security-config>

libaes/build.gradle

@@ -21,9 +21,8 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    //api 'cc.winboll.studio:libaes:15.6.0'
-    api 'cc.winboll.studio:libapputils:15.3.4'
-    api 'cc.winboll.studio:libappbase:15.7.6'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.0'
     
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon May 12 18:10:35 HKT 2025
-stageCount=4
+#Tue May 13 11:22:23 HKT 2025
+stageCount=1
 libraryProject=libaes
-baseVersion=15.6
-publishVersion=15.6.3
+baseVersion=15.8
+publishVersion=15.8.0
 buildCount=0
-baseBetaVersion=15.6.4
+baseBetaVersion=15.8.1

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

@@ -176,8 +176,8 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
             for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
                 getString(i);
             }
-        } else if (R.id.item_log == item.getItemId()) {
-            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
+//        } else if (R.id.item_log == item.getItemId()) {
+//            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
         } else if (R.id.item_about == item.getItemId()) {
             LogUtils.d(TAG, "onAbout");
         } else if (android.R.id.home == item.getItemId()) {

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 11 19:36:35 GMT 2025
-stageCount=7
+#Tue May 20 03:28:00 GMT 2025
+stageCount=2
 libraryProject=libappbase
-baseVersion=15.7
-publishVersion=15.7.6
-buildCount=15
-baseBetaVersion=15.7.7
+baseVersion=15.8
+publishVersion=15.8.1
+buildCount=1
+baseBetaVersion=15.8.2

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

@@ -81,6 +81,7 @@ public class WinBoLLActivityManager {
             // 新建一个任务窗口
             Intent intent = new Intent(context, clazz);
             //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
             intent.putExtra("tag", tag);
@@ -102,6 +103,7 @@ public class WinBoLLActivityManager {
             // 新建一个任务窗口
             //Intent intent = new Intent(context, clazz);
             //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
             intent.putExtra("tag", tag);

libapputils/build.gradle

@@ -21,7 +21,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libappbase:15.7.6'
+    api 'cc.winboll.studio:libappbase:15.8.0'
     
     // 二维码类库
     api 'com.google.zxing:core:3.4.1'

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 15:03:54 HKT 2025
-stageCount=5
+#Tue May 13 11:17:53 HKT 2025
+stageCount=2
 libraryProject=libapputils
-baseVersion=15.3
-publishVersion=15.3.4
+baseVersion=15.8
+publishVersion=15.8.1
 buildCount=0
-baseBetaVersion=15.3.5
+baseBetaVersion=15.8.2

settings.gradle-demo

@@ -48,8 +48,3 @@
 // AndroidXDemo 项目编译设置
 //include ':androidxdemo'
 //rootProject.name = "androidxdemo"
-
-
-// WinBoLL 项目编译设置
-//include ':winboll'
-//rootProject.name = "winboll"

winboll/.gitignore

@@ -1 +0,0 @@
-/build

winboll/app_update_description.txt

@@ -1 +0,0 @@
-

winboll/build.gradle

@@ -1,73 +0,0 @@
-apply plugin: 'com.android.application'
-apply from: '../.winboll/winboll_app_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-def genVersionName(def versionName){
-    // 检查编译标志位配置
-    assert (winbollBuildProps['stageCount'] != null)
-    assert (winbollBuildProps['baseVersion'] != null)
-    // 保存基础版本号
-    winbollBuildProps.setProperty("baseVersion", "${versionName}");
-    //保存编译标志配置
-    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
-    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
-    fos.close();
-    
-    // 返回编译版本号
-    return "${versionName}." + winbollBuildProps['stageCount']
-}
-
-android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
-
-    defaultConfig {
-        applicationId "cc.winboll.studio.winboll"
-        minSdkVersion 24
-        targetSdkVersion 30
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
-        if(true) {
-            versionName = genVersionName("${versionName}")
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // SSH
-    api 'com.jcraft:jsch:0.1.55'
-    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
-    // 二维码类库
-    api 'com.google.zxing:core:3.4.1'
-    api 'com.journeyapps:zxing-android-embedded:3.6.0'
-    // 应用介绍页类库
-    api 'io.github.medyo:android-about-page:2.0.0'
-    // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
-    // 网络连接类库
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.1.0'
-    api 'com.google.android.material:material:1.4.0'
-    //api 'androidx.viewpager:viewpager:1.0.0'
-    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libaes:15.8.0'
-    api 'cc.winboll.studio:libapputils:15.8.1'
-    api 'cc.winboll.studio:libappbase:15.8.0'
-}

winboll/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Thu May 22 02:06:59 HKT 2025
-stageCount=2
-libraryProject=
-baseVersion=15.0
-publishVersion=15.0.1
-buildCount=0
-baseBetaVersion=15.0.2

winboll/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

winboll/src/beta/AndroidManifest.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application
-        tools:replace="android:icon"
-        android:icon="@drawable/ic_launcher_beta">
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-

winboll/src/beta/res/values/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">WinBoLL+</string>
-
-</resources>

winboll/src/main/AndroidManifest.xml

@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.winboll">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher_stage"
-        android:roundIcon="@drawable/ic_launcher_stage"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-    </application>
-
-</manifest>

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

@@ -1,345 +0,0 @@
-package cc.winboll.studio.winboll;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import com.hjq.toast.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class App extends GlobalApplication {
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-        
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
-    }
-
-    public static void write(InputStream input, OutputStream output) throws IOException {
-        byte[] buf = new byte[1024 * 8];
-        int len;
-        while ((len = input.read(buf)) != -1) {
-            output.write(buf, 0, len);
-        }
-    }
-
-    public static void write(File file, byte[] data) throws IOException {
-        File parent = file.getParentFile();
-        if (parent != null && !parent.exists()) parent.mkdirs();
-
-        ByteArrayInputStream input = new ByteArrayInputStream(data);
-        FileOutputStream output = new FileOutputStream(file);
-        try {
-            write(input, output);
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static String toString(InputStream input) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        write(input, output);
-        try {
-            return output.toString("UTF-8");
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static void closeIO(Closeable... closeables) {
-        for (Closeable closeable : closeables) {
-            try {
-                if (closeable != null) closeable.close();
-            } catch (IOException ignored) {}
-        }
-    }
-
-    public static class CrashHandler {
-
-        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-        private static CrashHandler sInstance;
-
-        private PartCrashHandler mPartCrashHandler;
-
-        public static CrashHandler getInstance() {
-            if (sInstance == null) {
-                sInstance = new CrashHandler();
-            }
-            return sInstance;
-        }
-
-        public void registerGlobal(Context context) {
-            registerGlobal(context, null);
-        }
-
-        public void registerGlobal(Context context, String crashDir) {
-            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
-        }
-
-        public void unregister() {
-            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
-        }
-
-        public void registerPart(Context context) {
-            unregisterPart(context);
-            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
-            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
-        }
-
-        public void unregisterPart(Context context) {
-            if (mPartCrashHandler != null) {
-                mPartCrashHandler.isRunning.set(false);
-                mPartCrashHandler = null;
-            }
-        }
-
-        private static class PartCrashHandler implements Runnable {
-
-            private final Context mContext;
-
-            public AtomicBoolean isRunning = new AtomicBoolean(true);
-
-            public PartCrashHandler(Context context) {
-                this.mContext = context;
-            }
-
-            @Override
-            public void run() {
-                while (isRunning.get()) {
-                    try {
-                        Looper.loop();
-                    } catch (final Throwable e) {
-                        e.printStackTrace();
-                        if (isRunning.get()) {
-                            MAIN_HANDLER.post(new Runnable(){
-
-                                    @Override
-                                    public void run() {
-                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                        } else {
-                            if (e instanceof RuntimeException) {
-                                throw (RuntimeException)e;
-                            } else {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
-
-            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
-
-            private final Context mContext;
-
-            private final File mCrashDir;
-
-            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
-                this.mContext = context;
-                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
-            }
-
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                try {
-
-                    String log = buildLog(throwable);
-                    writeLog(log);
-
-                    try {
-                        Intent intent = new Intent(mContext, CrashActivity.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.putExtra(Intent.EXTRA_TEXT, log);
-                        mContext.startActivity(intent);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        writeLog(e.toString());
-                    }
-
-                    throwable.printStackTrace();
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                    System.exit(0);
-
-                } catch (Throwable e) {
-                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                }
-            }
-
-            private String buildLog(Throwable throwable) {
-                String time = DATE_FORMAT.format(new Date());
-
-                String versionName = "unknown";
-                long versionCode = 0;
-                try {
-                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
-                    versionName = packageInfo.versionName;
-                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
-                } catch (Throwable ignored) {}
-
-                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
-                head.put("Time Of Crash", time);
-                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
-                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
-                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
-                head.put("Kernel", getKernel());
-                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
-                head.put("Fingerprint", Build.FINGERPRINT);
-
-                StringBuilder builder = new StringBuilder();
-
-                for (String key : head.keySet()) {
-                    if (builder.length() != 0) builder.append("\n");
-                    builder.append(key);
-                    builder.append(" :    ");
-                    builder.append(head.get(key));
-                }
-
-                builder.append("\n\n");
-                builder.append(Log.getStackTraceString(throwable));
-
-                return builder.toString(); 
-            }
-
-            private void writeLog(String log) {
-                String time = DATE_FORMAT.format(new Date());
-                File file = new File(mCrashDir, "crash_" + time + ".txt");
-                try {
-                    write(file, log.getBytes("UTF-8"));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } 
-            }
-
-            private static String getKernel() {
-                try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
-                } catch (Throwable e) {
-                    return e.getMessage();
-                }
-            }
-        }
-    }
-
-    public static final class CrashActivity extends Activity {
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            setTheme(android.R.style.Theme_DeviceDefault);
-            setTitle("App Crash");
-
-            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
-
-            TextView textView = new TextView(this);
-            int padding = dp2px(16);
-            textView.setPadding(padding, padding, padding, padding);
-            textView.setText(mLog);
-            textView.setTextIsSelectable(true);
-            textView.setTypeface(Typeface.DEFAULT);
-            textView.setLinksClickable(true);
-
-            horizontalScrollView.addView(textView);
-            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-            setContentView(contentView);
-        }
-
-        private void restart() {
-            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
-            if (intent != null) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        private static int dp2px(float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu menu) {
-            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return super.onCreateOptionsMenu(menu);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            switch (item.getItemId()) {
-                case android.R.id.copy:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public void onBackPressed() {
-            restart();
-        }
-    }
-}

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

@@ -1,31 +0,0 @@
-package cc.winboll.studio.winboll;
-
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogView;
-import com.hjq.toast.ToastUtils;
-
-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);
-        
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-}

winboll/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>

winboll/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>

winboll/src/main/res/drawable/ic_launcher_beta.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true"
-    android:layout_width="24dp"
-    android:layout_height="24dp">
-    <item android:drawable="@drawable/ic_launcher_background"/> 
-    <item 
-        android:left="0dp" 
-        android:top="0dp" 
-        android:right="0dp" 
-        android:bottom="0dp"
-        android:drawable="@drawable/ic_iw"/>
-</layer-list>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:gravity="center_vertical|center_horizontal">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Hello, WinBoLL!"
-			android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-	</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>
-

winboll/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

winboll/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
-</resources>

winboll/src/main/res/values/strings.xml

@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">WinBoLL</string>
-    
-</resources>

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

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

winboll/src/stage/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application>
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-

winboll/src/stage/res/values/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Put flavor specific strings here -->
-
-</resources>