编译调试

2025-05-10 11:17:04 +08:00
parent 35825d5ead
commit fa72983f54
19 changed files with 520 additions and 73 deletions
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 10 01:15:51 GMT 2025
+#Sat May 10 03:16:10 GMT 2025
 stageCount=7
 libraryProject=libappbase
 baseVersion=15.7
 publishVersion=15.7.6
-buildCount=4
+buildCount=7
 baseBetaVersion=15.7.7
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -11,6 +11,7 @@ import android.widget.CheckBox;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.appbase.activities.NewActivity;
+import cc.winboll.studio.appbase.activities.WinBoLLActivity;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
@@ -18,12 +19,13 @@ import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;

-public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
+public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {

    public static final String TAG = "MainActivity";

@@ -38,7 +40,7 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
    }

    Toolbar mToolbar;
-    //LogView mLogView;
+    LogView mLogView;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -51,12 +53,8 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit

        CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
        cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
-        //mLogView = findViewById(R.id.activitymainLogView1);
-
-//        if (GlobalApplication.isDebuging()) {
-//            mLogView.start(); 
-//            ToastUtils.show("LogView start.");
-//        }
+        mLogView = findViewById(R.id.logview);
+        mLogView.start(); 
    }

    @Override
@@ -72,8 +70,6 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
        return super.onOptionsItemSelected(item);
    }

-
-
    @Override
    protected void onDestroy() {
        super.onDestroy();
@@ -87,7 +83,7 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
        GlobalApplication.setIsDebuging(isDebuging);
        GlobalApplication.saveDebugStatus();
    }
-   
+
    public void onPreviewGlobalCrashActivity(View view) {
        Intent intent = new Intent(this, GlobalCrashActivity.class);
        intent.putExtra(CrashHandler.EXTRA_CRASH_INFO, "Demo log...");
@@ -137,8 +133,6 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
        startService(intent);

    }
-    
-    

    public void onStopTestDemoService(View view) {
        Intent intent = new Intent(this, TestDemoService.class);
@@ -179,5 +173,11 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
    }

+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+    
    
 }
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -12,11 +12,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.WinBoLLActivityBase;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;

-public class New2Activity extends WinBoLLActivityBase implements IWinBoLLActivity {
+public class New2Activity extends WinBoLLActivity implements IWinBoLLActivity {

    public static final String TAG = "New2Activity";

@@ -74,7 +73,7 @@ public class New2Activity extends WinBoLLActivityBase implements IWinBoLLActivit
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
+            //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
            return true;
        }
        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -11,11 +11,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.WinBoLLActivityBase;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;

-public class NewActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
+public class NewActivity extends WinBoLLActivity implements IWinBoLLActivity {

    public static final String TAG = "NewActivity";

@@ -72,7 +71,7 @@ public class NewActivity extends WinBoLLActivityBase implements IWinBoLLActivity
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
+            //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
            return true;
        }
        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java
@@ -0,0 +1,24 @@
+package cc.winboll.studio.appbase.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/05/10 09:48
+ * @Describe WinBoLL 窗口基础类
+ */
+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;
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
@@ -14,10 +14,14 @@ import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.widgets.APPNewsWidget;
 import cc.winboll.studio.libappbase.AppUtils;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.APPModel;
+import cc.winboll.studio.libappbase.models.APPModel;
+import cc.winboll.studio.libappbase.models.WinBoLLModel;
+import cc.winboll.studio.libappbase.models.WinBoLLNewsBean;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.sos.SOSObject;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.WinBoLL;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
@@ -40,21 +44,21 @@ public class MainReceiver extends BroadcastReceiver {
        String szAction = intent.getAction();
        if (szAction.equals(ACTION_BOOT_COMPLETED)) {
            ToastUtils.show("ACTION_BOOT_COMPLETED");
-        } else if (szAction.equals(WinBoLL.ACTION_BIND)) {
+        } else if (szAction.equals(IWinBoLLActivity.ACTION_BIND)) {
            LogUtils.d(TAG, "ACTION_BIND");
            LogUtils.d(TAG, String.format("context.getPackageName() %s", context.getPackageName()));
            LogUtils.d(TAG, String.format("intent.getAction() %s", intent.getAction()));
-            String szAPPModel = intent.getStringExtra(WinBoLL.EXTRA_APPMODEL);
-            LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
-            if (szAPPModel != null && !szAPPModel.equals("")) {
+            String szWinBoLLModel = intent.getStringExtra(WinBoLL.EXTRA_WINBOLLMODEL);
+            LogUtils.d(TAG, String.format("szAPPModel %s", szWinBoLLModel));
+            if (szWinBoLLModel != null && !szWinBoLLModel.equals("")) {
                try {
-                    APPModel bean = APPModel.parseStringToBean(szAPPModel, APPModel.class);
+                    WinBoLLModel bean = WinBoLLModel.parseStringToBean(szWinBoLLModel, WinBoLLModel.class);
                    if (bean != null) {
                        String szAppPackageName = bean.getAppPackageName();
                        LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName));
                        String szAppMainServiveName = bean.getAppMainServiveName();
                        LogUtils.d(TAG, String.format("szAppMainServiveName %s", szAppMainServiveName));
-                        mwrService.get().bindAPPModelConnection(bean);
+                        mwrService.get().bindWinBoLLModelConnection(bean);
                    }
                } catch (IOException e) {
                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java
@@ -18,15 +18,16 @@ import android.content.ServiceConnection;
 import android.os.Binder;
 import android.os.IBinder;
 import cc.winboll.studio.appbase.MyTileService;
-import cc.winboll.studio.appbase.models.MainServiceBean;
 import cc.winboll.studio.appbase.handlers.MainServiceHandler;
+import cc.winboll.studio.appbase.models.MainServiceBean;
 import cc.winboll.studio.appbase.receivers.MainReceiver;
 import cc.winboll.studio.appbase.services.AssistantService;
 import cc.winboll.studio.appbase.threads.MainServiceThread;
 import cc.winboll.studio.appbase.widgets.APPNewsWidget;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPModel;
+import cc.winboll.studio.libappbase.models.WinBoLLModel;
 import java.util.ArrayList;
-import cc.winboll.studio.libappbase.sos.APPModel;

 public class MainService extends Service {

@@ -182,7 +183,7 @@ public class MainService extends Service {
        }
    }

-    public void bindAPPModelConnection(APPModel bean) {
+    public void bindWinBoLLModelConnection(WinBoLLModel bean) {
        LogUtils.d(TAG, "bindAPPModelConnection(...)");
        // 清理旧的绑定链接
        for (int i = mAPPModelConnectionList.size() - 1; i > -1; i--) {
@@ -203,7 +204,7 @@ public class MainService extends Service {
        
        Intent intentWidget = new Intent(this, APPNewsWidget.class);
        intentWidget.setAction(APPNewsWidget.ACTION_WAKEUP_SERVICE);
-        APPModel appSOSBean = new APPModel(bean.getAppPackageName(), bean.getAppMainServiveName());
+        WinBoLLModel appSOSBean = new WinBoLLModel(bean.getAppPackageName(), bean.getAppMainServiveName());
        intentWidget.putExtra("APPSOSBean", appSOSBean.toString());
        sendBroadcast(intentWidget);
    }
@@ -212,7 +213,7 @@ public class MainService extends Service {

        ComponentName mComponentName;

-        boolean isBindToAPP(APPModel bean) {
+        boolean isBindToAPP(WinBoLLModel bean) {
            return mComponentName != null
                && mComponentName.getClassName().equals(bean.getAppMainServiveName())
                && mComponentName.getPackageName().equals(bean.getAppPackageName());
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
@@ -10,11 +10,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
-import cc.winboll.studio.appbase.models.TestDemoBindServiceBean;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.WinBoLL;
 import cc.winboll.studio.appbase.App;
+import cc.winboll.studio.appbase.models.TestDemoBindServiceBean;
+import cc.winboll.studio.appbase.services.TestDemoBindService;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
+import cc.winboll.studio.libappbase.winboll.WinBoLL;

 public class TestDemoBindService extends Service {

--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
@@ -12,7 +12,6 @@ import android.os.Binder;
 import android.os.IBinder;
 import cc.winboll.studio.appbase.models.TestDemoServiceBean;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.WinBoLL;

 public class TestDemoService extends Service {

--- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
@@ -12,16 +12,17 @@ import android.content.Context;
 import android.content.Intent;
 import android.widget.RemoteViews;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.models.WinBoLLNewsBean;
 import cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener;
 import cc.winboll.studio.libappbase.AppUtils;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.APPModel;
-import cc.winboll.studio.libappbase.sos.WinBoLL;
+import cc.winboll.studio.libappbase.models.APPModel;
+import cc.winboll.studio.libappbase.models.WinBoLLNewsBean;
+import cc.winboll.studio.libappbase.winboll.WinBoLL;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import cc.winboll.studio.libappbase.models.WinBoLLModel;

 public class APPNewsWidget extends AppWidgetProvider {

@@ -57,11 +58,11 @@ public class APPNewsWidget extends AppWidgetProvider {
            }
        }else if (intent.getAction().equals(ACTION_WAKEUP_SERVICE)) {
            LogUtils.d(TAG, "ACTION_WAKEUP_SERVICE");
-            String szAPPModel = intent.getStringExtra(WinBoLL.EXTRA_APPMODEL);
-            LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
-            if (szAPPModel != null && !szAPPModel.equals("")) {
+            String szWinBoLLModel = intent.getStringExtra(WinBoLL.EXTRA_WINBOLLMODEL);
+            LogUtils.d(TAG, String.format("szWinBoLLModel %s", szWinBoLLModel));
+            if (szWinBoLLModel != null && !szWinBoLLModel.equals("")) {
                try {
-                    APPModel bean = APPModel.parseStringToBean(szAPPModel, APPModel.class);
+                    WinBoLLModel bean = WinBoLLModel.parseStringToBean(szWinBoLLModel, WinBoLLModel.class);
                    if (bean != null) {
                        String szAppPackageName = bean.getAppPackageName();
                        LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName));
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -212,5 +212,10 @@

 	</ScrollView>

+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="300dp"
+		android:id="@+id/logview"/>
+
 </LinearLayout>