From 0800a0e935789a4a1e70742d8dde808b9d9c87f1 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 8 Dec 2025 19:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9F=BA=E7=A1=80=E7=B1=BB?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=EF=BC=8C=E8=AE=BE=E5=AE=9A=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=9F=BA=E7=A1=80=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=94=E7=94=A8=E4=BB=8B=E7=BB=8D=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E3=80=82=E8=B0=83=E6=95=B4=E7=B1=BB=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts/build.gradle | 27 ++-- contacts/build.properties | 12 +- contacts/proguard-rules.pro | 138 +++++++++++++++++- contacts/src/main/AndroidManifest.xml | 2 +- .../java/cc/winboll/studio/contacts/App.java | 23 +-- .../winboll/studio/contacts/MainActivity.java | 3 +- .../contacts/activities/AboutActivity.java | 92 ------------ .../contacts/activities/SettingsActivity.java | 10 +- .../contacts/activities/WinBollActivity.java | 4 +- .../contacts/adapters/CallLogAdapter.java | 2 +- .../contacts/adapters/ContactAdapter.java | 2 +- .../adapters/PhoneConnectRuleAdapter.java | 4 +- .../studio/contacts/bobulltoon/TomCat.java | 2 +- .../contacts/fragments/ContactsFragment.java | 2 +- .../contacts/receivers/MainReceiver.java | 2 +- .../studio/contacts/services/MainService.java | 23 ++- .../studio/contacts/utils/ContactUtils.java | 1 - .../contacts/widgets/APPStatusWidget.java | 2 +- ...{studio_provider.xml => file_provider.xml} | 0 19 files changed, 185 insertions(+), 166 deletions(-) delete mode 100644 contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java rename contacts/src/main/res/xml/{studio_provider.xml => file_provider.xml} (100%) diff --git a/contacts/build.gradle b/contacts/build.gradle index 9278e0e..c2cf54c 100644 --- a/contacts/build.gradle +++ b/contacts/build.gradle @@ -29,26 +29,14 @@ android { // versionName 更新后需要手动设置 // 项目模块目录的 build.gradle 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.3" + versionName "15.12" if(true) { versionName = genVersionName("${versionName}") } } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } } dependencies { - api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:libaes:15.9.3' - api 'cc.winboll.studio:libapputils:15.8.5' - api 'cc.winboll.studio:libappbase:15.9.5' - // 权限请求框架：https://github.com/getActivity/XXPermissions api 'com.github.getActivity:XXPermissions:18.63' // 下拉控件 @@ -65,8 +53,6 @@ dependencies { 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' @@ -84,4 +70,15 @@ dependencies { //api 'androidx.vectordrawable:vectordrawable:1.1.0' //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.fragment:fragment:1.1.0' + + + // WinBoLL库 nexus.winboll.cc 地址 + //api 'cc.winboll.studio:libaes:15.12.0' + //api 'cc.winboll.studio:libappbase:15.12.2' + + // WinBoLL备用库 jitpack.io 地址 + api 'com.github.ZhanGSKen:AES:aes-v15.12.3' + api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.2' + + api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/contacts/build.properties b/contacts/build.properties index 3a77541..0f05454 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Nov 03 12:01:02 HKT 2025 -stageCount=22 +#Mon Dec 08 10:49:43 GMT 2025 +stageCount=0 libraryProject= -baseVersion=15.3 -publishVersion=15.3.21 -buildCount=0 -baseBetaVersion=15.3.22 +baseVersion=15.12 +publishVersion=15.12.0 +buildCount=2 +baseBetaVersion=15.12.1 diff --git a/contacts/proguard-rules.pro b/contacts/proguard-rules.pro index 233bad2..855b18a 100644 --- a/contacts/proguard-rules.pro +++ b/contacts/proguard-rules.pro @@ -9,9 +9,135 @@ # Add any project specific keep options here: -# 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 *; -#} +# ============================== 基础通用规则 ============================== +# 保留系统组件 +-keep public class * extends android.app.Activity +-keep public class * extends android.app.Service +-keep public class * extends android.content.BroadcastReceiver +-keep public class * extends android.content.ContentProvider +-keep public class * extends android.app.backup.BackupAgentHelper +-keep public class * extends android.preference.Preference + +# 保留 WinBoLL 核心包及子类（合并简化规则） +-keep class cc.winboll.studio.** { *; } +-keepclassmembers class cc.winboll.studio.** { *; } + +# 保留所有类中的 public static final String TAG 字段（便于日志定位） +-keepclassmembers class * { + public static final java.lang.String TAG; +} + +# 保留序列化类（避免Parcelable/Gson解析异常） +-keep class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; +} +-keepclassmembers class * implements java.io.Serializable { + static final long serialVersionUID; + private static final java.io.ObjectStreamField[] serialPersistentFields; + private void writeObject(java.io.ObjectOutputStream); + private void readObject(java.io.ObjectInputStream); + java.lang.Object writeReplace(); + java.lang.Object readResolve(); +} + +# 保留 R 文件（避免资源ID混淆） +-keepclassmembers class **.R$* { + public static ; +} + +# 保留 native 方法（避免JNI调用失败） +-keepclasseswithmembernames class * { + native ; +} + +# 保留注解和泛型（避免反射/序列化异常） +-keepattributes *Annotation* +-keepattributes Signature + +# 屏蔽 Java 8+ 警告（适配 Java 7 语法） +-dontwarn java.lang.invoke.* +-dontwarn android.support.v8.renderscript.* +-dontwarn java.util.function.** + +# ============================== 第三方框架专项规则 ============================== +# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容） +-keep class okhttp3.** { *; } +-keep interface okhttp3.** { *; } +-keep class okhttp3.internal.** { *; } +-keep class okio.** { *; } +-dontwarn okhttp3.internal.platform.** +-dontwarn okio.** +# ============================== 必要补充规则 ============================== +# OkHttp 4.4.1 补充规则（Java 7 兼容） +-keep class okhttp3.internal.concurrent.** { *; } +-keep class okhttp3.internal.connection.** { *; } +-dontwarn okhttp3.internal.concurrent.TaskRunner +-dontwarn okhttp3.internal.connection.RealCall + +# Glide 4.9.0（米盟广告图片加载依赖） +-keep public class * implements com.bumptech.glide.module.GlideModule +-keep public class * extends com.bumptech.glide.module.AppGlideModule +-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType { + **[] $VALUES; + public *; +} +-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule { + (); +} +-dontwarn com.bumptech.glide.** + +# Gson 2.8.5（米盟广告数据序列化依赖） +-keep class com.google.gson.** { *; } +-keep interface com.google.gson.** { *; } +-keepclassmembers class * { + @com.google.gson.annotations.SerializedName ; +} + +# 米盟 SDK（核心广告组件，完整保留避免加载失败） +-keep class com.miui.zeus.** { *; } +-keep interface com.miui.zeus.** { *; } +# 保留米盟日志字段（便于广告加载失败排查） +-keepclassmembers class com.miui.zeus.mimo.sdk.** { + public static final java.lang.String TAG; +} + +# RecyclerView 1.0.0（米盟广告布局渲染依赖） +-keep class androidx.recyclerview.** { *; } +-keep interface androidx.recyclerview.** { *; } +-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter { + public *; +} + +# 其他第三方框架（按引入依赖保留，无则可删除） +# XXPermissions 18.63 +-keep class com.hjq.permissions.** { *; } +-keep interface com.hjq.permissions.** { *; } + +# ZXing 二维码（核心解析组件） +-keep class com.google.zxing.** { *; } +-keep class com.journeyapps.zxing.** { *; } + +# Jsoup HTML解析 +-keep class org.jsoup.** { *; } + +# Pinyin4j 拼音搜索 +-keep class net.sourceforge.pinyin4j.** { *; } + +# JSch SSH组件 +-keep class com.jcraft.jsch.** { *; } + +# AndroidX 基础组件 +-keep class androidx.appcompat.** { *; } +-keep interface androidx.appcompat.** { *; } + +# ============================== 优化与调试配置 ============================== +# 优化级别（平衡混淆效果与性能） +-optimizationpasses 5 +-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* + +# 调试辅助（保留行号便于崩溃定位） +-verbose +-dontpreverify +-dontusemixedcaseclassnames +-keepattributes SourceFile,LineNumberTable + diff --git a/contacts/src/main/AndroidManifest.xml b/contacts/src/main/AndroidManifest.xml index 4d2a288..238961a 100644 --- a/contacts/src/main/AndroidManifest.xml +++ b/contacts/src/main/AndroidManifest.xml @@ -183,7 +183,7 @@ + android:resource="@xml/file_provider"/> diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/App.java b/contacts/src/main/java/cc/winboll/studio/contacts/App.java index 2bd4287..6c81ac2 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/App.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/App.java @@ -5,10 +5,9 @@ package cc.winboll.studio.contacts; * @Date 2024/12/08 15:10:51 * @Describe 全局应用类 */ -import android.view.Gravity; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libappbase.utils.ToastUtils; -import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager; +import cc.winboll.studio.libappbase.ToastUtils; public class App extends GlobalApplication { @@ -16,22 +15,14 @@ public class App extends GlobalApplication { @Override public void onCreate() { - // 必须在调用基类前设置应用调试标志， - // 这样可以预先设置日志与数据的存储根目录。 - //setIsDebuging(BuildConfig.DEBUG); + // 设置应用调试标志 + setIsDebugging(BuildConfig.DEBUG); super.onCreate(); - // 设置 WinBoLL 应用 UI 类型 - getWinBoLLActivityManager().setWinBoLLUI_TYPE(WinBoLLActivityManager.WinBoLLUI_TYPE.Aplication); - - //LogUtils.d(TAG, "onCreate"); - + + // 初始化窗口管理类 + WinBoLLActivityManager.init(this); // 初始化 Toast 框架 ToastUtils.init(this); - // 设置 Toast 布局样式 - //ToastUtils.setView(R.layout.toast_custom_view); - //ToastUtils.setStyle(new WhiteToastStyle()); - //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200); - } } diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java index 433eaed..84f6fee 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java @@ -40,10 +40,9 @@ 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.contacts.utils.AppGoToSettingsUtil; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogView; -import cc.winboll.studio.libappbase.utils.ToastUtils; -import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import com.google.android.material.tabs.TabLayout; import java.util.ArrayList; import java.util.List; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java deleted file mode 100644 index 5110ce3..0000000 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java +++ /dev/null @@ -1,92 +0,0 @@ -package cc.winboll.studio.contacts.activities; - -/** - * @Author ZhanGSKen - * @Date 2025/03/31 15:15:54 - * @Describe 应用介绍窗口 - */ -import android.app.Activity; -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; - -public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity { - - public static final String TAG = "AboutActivity"; - - Context mContext; - Toolbar mToolbar; - - @Override - public Activity getActivity() { - return this; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mContext = this; - setContentView(R.layout.activity_about); - - mToolbar = findViewById(R.id.toolbar); - setSupportActionBar(mToolbar); - mToolbar.setSubtitle(TAG); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - AboutView aboutView = CreateAboutView(); - // 在 Activity 的 onCreate 或其他生命周期方法中调用 -// LinearLayout layout = new LinearLayout(this); -// layout.setOrientation(LinearLayout.VERTICAL); -// // 创建布局参数（宽度和高度） -// ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( -// ViewGroup.LayoutParams.MATCH_PARENT, -// ViewGroup.LayoutParams.MATCH_PARENT -// ); -// addContentView(aboutView, params); - - LinearLayout layout = findViewById(R.id.aboutviewroot_ll); - // 创建布局参数（宽度和高度） - ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT - ); - layout.addView(aboutView, params); - - GlobalApplication.getWinBoLLActivityManager().add(this); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - GlobalApplication.getWinBoLLActivityManager().registeRemove(this); - } - - public AboutView CreateAboutView() { - String szBranchName = "contacts"; - APPInfo appInfo = new APPInfo(); - appInfo.setAppName("Contacts"); - appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll); - appInfo.setAppDescription("这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。"); - appInfo.setAppGitName("APPBase"); - appInfo.setAppGitOwner("Studio"); - appInfo.setAppGitAPPBranch(szBranchName); - appInfo.setAppGitAPPSubProjectFolder(szBranchName); - appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=4&extra=page%3D1"); - appInfo.setAppAPKName("Contacts"); - appInfo.setAppAPKFolderName("Contacts"); - return new AboutView(mContext, appInfo); - } -} diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java index 56f813a..a38befc 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java @@ -35,9 +35,11 @@ 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.activitys.AboutActivity; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.utils.ToastUtils; -import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; +import cc.winboll.studio.libappbase.ToastUtils; import java.lang.reflect.Field; import java.util.List; @@ -335,10 +337,10 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv } public void onAbout(View view) { - App.getWinBoLLActivityManager().startWinBoLLActivity(this, AboutActivity.class); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, AboutActivity.class); } public void onLogView(View view) { - App.getWinBoLLActivityManager().startLogActivity(this); + WinBoLLActivityManager.getInstance().startLogActivity(this); } } diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java index 33f9661..6e1530d 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java @@ -9,9 +9,9 @@ import android.app.Activity; import android.os.Bundle; import android.view.MenuItem; import androidx.appcompat.app.AppCompatActivity; -import cc.winboll.studio.libaes.beans.AESThemeBean; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; +import cc.winboll.studio.libaes.models.AESThemeBean; import cc.winboll.studio.libaes.utils.AESThemeUtil; -import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivity { diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java index 1f28263..05be154 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java @@ -23,7 +23,7 @@ import cc.winboll.studio.contacts.R; import cc.winboll.studio.contacts.beans.CallLogModel; import cc.winboll.studio.contacts.utils.ContactUtils; import cc.winboll.studio.libaes.views.AOHPCTCSeekBar; -import cc.winboll.studio.libappbase.utils.ToastUtils; +import cc.winboll.studio.libappbase.ToastUtils; import java.text.SimpleDateFormat; import java.util.List; import java.util.Locale; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java index cbc0f87..b58f75e 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java @@ -23,7 +23,7 @@ import cc.winboll.studio.contacts.R; import cc.winboll.studio.contacts.beans.ContactModel; import cc.winboll.studio.contacts.utils.ContactUtils; import cc.winboll.studio.libaes.views.AOHPCTCSeekBar; -import cc.winboll.studio.libappbase.utils.ToastUtils; +import cc.winboll.studio.libappbase.ToastUtils; import java.util.List; public class ContactAdapter extends RecyclerView.Adapter { diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java index d44cf1c..864ef7e 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java @@ -20,8 +20,8 @@ import cc.winboll.studio.contacts.R; import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel; import cc.winboll.studio.contacts.dun.Rules; import cc.winboll.studio.contacts.views.LeftScrollView; -import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog; -import cc.winboll.studio.libappbase.utils.ToastUtils; +import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog; +import cc.winboll.studio.libappbase.ToastUtils; import java.util.ArrayList; import java.util.List; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java index 18e5830..da6cdf0 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java @@ -9,7 +9,7 @@ import android.content.Context; import cc.winboll.studio.contacts.R; import cc.winboll.studio.contacts.dun.Rules; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.utils.ToastUtils; +import cc.winboll.studio.libappbase.ToastUtils; import java.io.File; import java.io.FileFilter; import java.io.FileOutputStream; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java index fcafabf..8614201 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java @@ -31,7 +31,7 @@ import cc.winboll.studio.contacts.R; import cc.winboll.studio.contacts.adapters.ContactAdapter; import cc.winboll.studio.contacts.beans.ContactModel; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.utils.ToastUtils; +import cc.winboll.studio.libappbase.ToastUtils; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java index b666084..c3afae7 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java @@ -10,7 +10,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import cc.winboll.studio.contacts.services.MainService; -import cc.winboll.studio.libappbase.utils.ToastUtils; +import cc.winboll.studio.libappbase.ToastUtils; import java.lang.ref.WeakReference; public class MainReceiver extends BroadcastReceiver { diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java index d171dfc..75c94a9 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java @@ -18,7 +18,6 @@ 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,8 +28,6 @@ import cc.winboll.studio.contacts.receivers.MainReceiver; 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; @@ -129,11 +126,11 @@ public class MainService extends Service { // 唤醒守护进程 wakeupAndBindAssistant(); // 召唤 WinBoLL APP 绑定本服务 - if (App.isDebuging()) { - WinBoLL.bindToAPPBaseBeta(this, MainService.class.getName()); - } else { - WinBoLL.bindToAPPBase(this, MainService.class.getName()); - } +// if (App.isDebugging()) { +// WinBoLL.bindToAPPBaseBeta(this, MainService.class.getName()); +// } else { +// WinBoLL.bindToAPPBase(this, MainService.class.getName()); +// } // 初始化服务运行参数 _TomCat = TomCat.getInstance(this); @@ -239,11 +236,11 @@ public class MainService extends Service { if (mMainServiceBean.isEnable()) { // 唤醒守护进程 wakeupAndBindAssistant(); - if (App.isDebuging()) { - SOS.sosToAppBase(getApplicationContext(), MainService.class.getName()); - } else { - SOS.sosToAppBaseBeta(getApplicationContext(), MainService.class.getName()); - } +// if (App.isDebuging()) { +// SOS.sosToAppBase(getApplicationContext(), MainService.class.getName()); +// } else { +// SOS.sosToAppBaseBeta(getApplicationContext(), MainService.class.getName()); +// } } isBound = false; mAssistantService = null; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java index 7b04c43..99483c1 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java @@ -13,7 +13,6 @@ import android.database.Cursor; import android.net.Uri; import android.provider.ContactsContract; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.utils.ToastUtils; import java.util.HashMap; import java.util.Map; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java index 58968fd..edd6b26 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java @@ -14,7 +14,7 @@ import android.content.Intent; import android.widget.RemoteViews; import cc.winboll.studio.contacts.R; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.utils.ToastUtils; +import cc.winboll.studio.libappbase.ToastUtils; public class APPStatusWidget extends AppWidgetProvider { diff --git a/contacts/src/main/res/xml/studio_provider.xml b/contacts/src/main/res/xml/file_provider.xml similarity index 100% rename from contacts/src/main/res/xml/studio_provider.xml rename to contacts/src/main/res/xml/file_provider.xml