diff --git a/contacts/build.gradle b/contacts/build.gradle index 83e881e..86bb581 100644 --- a/contacts/build.gradle +++ b/contacts/build.gradle @@ -64,7 +64,7 @@ dependencies { api 'com.google.android.material:material:1.1.0' api 'cc.winboll.studio:libapputils:9.3.2' - api 'cc.winboll.studio:libappbase:1.5.0' + api 'cc.winboll.studio:libappbase:1.5.1' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/contacts/build.properties b/contacts/build.properties index 5962172..ed0e69d 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Feb 12 23:28:05 GMT 2025 +#Thu Feb 13 19:09:39 GMT 2025 stageCount=0 libraryProject=winboll-shared baseVersion=1.0 publishVersion=1.0.0 -buildCount=6 +buildCount=13 baseBetaVersion=1.0.1 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 6b00e0f..6f482d5 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/App.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/App.java @@ -17,7 +17,7 @@ public class App extends GlobalApplication { public void onCreate() { // 必须在调用基类前设置应用调试标志， // 这样可以预先设置日志与数据的存储根目录。 - //setIsDebug(BuildConfig.DEBUG); + setIsDebuging(this, BuildConfig.DEBUG); super.onCreate(); // 设置 WinBoll 应用 UI 类型 WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication); 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 07ef89c..952e7ba 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java @@ -11,8 +11,10 @@ import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.contacts.BuildConfig; import cc.winboll.studio.contacts.R; import cc.winboll.studio.contacts.beans.MainServiceBean; -import cc.winboll.studio.contacts.services.MainService; +import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.LogView; +import cc.winboll.studio.libappbase.SOS; import cc.winboll.studio.libapputils.app.AboutActivityFactory; import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.app.WinBollActivityManager; @@ -25,7 +27,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct public static final int REQUEST_HOME_ACTIVITY = 0; public static final int REQUEST_ABOUT_ACTIVITY = 1; - + + LogView mLogView; Toolbar mToolbar; CheckBox cbMainService; MainServiceBean mMainServiceBean; @@ -61,7 +64,11 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct // 以下正常创建主窗口 super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + + mLogView = findViewById(R.id.activitymainLogView1); + if (GlobalApplication.isDebuging()) { mLogView.start(); } + // 初始化工具栏 mToolbar = findViewById(R.id.activitymainToolbar1); setSupportActionBar(mToolbar); @@ -83,12 +90,12 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct cbMainService.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view) { - - if (cbMainService.isChecked()) { - MainService.startISOSService(MainActivity.this); - } else { - MainService.stopISOSService(MainActivity.this); - } + SOS.sendToWinBoll(MainActivity.this); +// if (cbMainService.isChecked()) { +// MainService.startISOSService(MainActivity.this); +// } else { +// MainService.stopISOSService(MainActivity.this); +// } } }); } 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 25ad21a..4e9d60a 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 @@ -8,7 +8,10 @@ import cc.winboll.studio.contacts.beans.MainServiceBean; import cc.winboll.studio.libappbase.ISOSAPP; import cc.winboll.studio.libappbase.ISOSService; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.SOSCSBroadcastReceiver; +import cc.winboll.studio.libappbase.SimpleOperateSignalCenterService; import com.hjq.toast.ToastUtils; +import android.content.ComponentName; /** * @Author ZhanGSKen@AliYun.Com @@ -87,9 +90,10 @@ public class MainService extends Service implements ISOSService { LogUtils.d(TAG, "onDestroy"); mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class); if (mMainServiceBean.isEnable()) { - LogUtils.d(TAG, "mSimpleOperateSignalCenterServiceBean.isEnable()"); - ISOSAPP iSOSAPP = (ISOSAPP)getApplication(); - iSOSAPP.helpISOSService(getISOSServiceIntentWhichAskForHelp()); + LogUtils.d(TAG, "mMainServiceBean.isEnable()"); +// ISOSAPP iSOSAPP = (ISOSAPP)getApplication(); +// iSOSAPP.helpISOSService(getISOSServiceIntentWhichAskForHelp()); + sos(); } if (_MainThread != null) { _MainThread.isExist = true; @@ -112,6 +116,22 @@ public class MainService extends Service implements ISOSService { MainServiceBean.saveBean(context, bean); context.startService(new Intent(context, MainService.class)); } + + public void sos() { + // 创建Intent对象，指定广播的action + Intent intentService = new Intent(SOSCSBroadcastReceiver.ACTION_SOS); + String packageName = this.getPackageName(); + String serviceClassName = SOSCSBroadcastReceiver.class.getName(); + intentService.setComponent(new ComponentName(packageName, serviceClassName)); + + // 目标服务的包名和类名 + intentService.putExtra(ISOSAPP.EXTRA_PACKAGE, getPackageName()); + intentService.putExtra(ISOSAPP.EXTRA_SERVICE, MainService.class.getName()); + // 发送广播 + sendBroadcast(intentService); + LogUtils.d(TAG, "sos"); + ToastUtils.show("sos"); + } static class MainThread extends Thread { volatile boolean isExist = false; diff --git a/contacts/src/main/res/layout/activity_main.xml b/contacts/src/main/res/layout/activity_main.xml index 980222d..78d3baa 100644 --- a/contacts/src/main/res/layout/activity_main.xml +++ b/contacts/src/main/res/layout/activity_main.xml @@ -32,6 +32,12 @@ + + diff --git a/winboll-shared/build.properties b/winboll-shared/build.properties index 5962172..ed0e69d 100644 --- a/winboll-shared/build.properties +++ b/winboll-shared/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Feb 12 23:28:05 GMT 2025 +#Thu Feb 13 19:09:39 GMT 2025 stageCount=0 libraryProject=winboll-shared baseVersion=1.0 publishVersion=1.0.0 -buildCount=6 +buildCount=13 baseBetaVersion=1.0.1