Studio/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志分屏比例切换失效时，需要手动切换出任务栏视图再回到分屏任务窗口，这时就可以切换比例。修复了应用调出二级窗口弹出时不在原应用窗口弹出问题。

Browse Source
This commit is contained in:
ZhanGSKen
2025-03-27 01:05:52 +08:00
parent 2074f68ef3
commit e2b6fadd43
7 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appbase/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Wed Mar 26 11:30:27 GMT 2025 #Wed Mar 26 16:59:16 GMT 2025
stageCount=1 stageCount=1
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.1 baseVersion=15.1
publishVersion=15.1.0 publishVersion=15.1.0
buildCount=17 buildCount=42
baseBetaVersion=15.1.1 baseBetaVersion=15.1.1

18
appbase/src/main/AndroidManifest.xml
View File

@@ -13,10 +13,9 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:exported="true"
android:resizeableActivity="true" android:resizeableActivity="true"
android:launchMode="singleInstance" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
android:taskAffinity="cc.winboll.studio.appbase.task.main"
android:exported="true">
<intent-filter> <intent-filter>
@@ -32,7 +31,15 @@
</activity> </activity>
<activity android:name=".GlobalApplication$CrashActivity"/> <activity android:name=".activities.NewActivity"
android:exported="true"
android:resizeableActivity="true"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
<activity android:name=".activities.New2Activity"
android:exported="true"
android:resizeableActivity="true"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
<service <service
android:name=".MyTileService" android:name=".MyTileService"
@@ -111,9 +118,6 @@
android:name="android.max_aspect" android:name="android.max_aspect"
android:value="4.0"/> android:value="4.0"/>
<activity android:name=".activities.NewActivity"/>
<activity android:name=".activities.New2Activity"/>
</application> </application>

4
appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
View File

@@ -7,13 +7,13 @@ package cc.winboll.studio.appbase.activities;
*/ */
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import cc.winboll.studio.appbase.R; import cc.winboll.studio.appbase.R;
import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class New2Activity extends Activity implements IWinBollActivity { public class New2Activity extends AppCompatActivity implements IWinBollActivity {
public static final String TAG = "New2Activity"; public static final String TAG = "New2Activity";

4
appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
View File

@@ -6,13 +6,13 @@ package cc.winboll.studio.appbase.activities;
*/ */
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import cc.winboll.studio.appbase.R; import cc.winboll.studio.appbase.R;
import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class NewActivity extends Activity implements IWinBollActivity { public class NewActivity extends AppCompatActivity implements IWinBollActivity {
public static final String TAG = "NewActivity"; public static final String TAG = "NewActivity";

4
libappbase/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Wed Mar 26 11:30:27 GMT 2025 #Wed Mar 26 16:59:16 GMT 2025
stageCount=1 stageCount=1
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.1 baseVersion=15.1
publishVersion=15.1.0 publishVersion=15.1.0
buildCount=17 buildCount=42
baseBetaVersion=15.1.1 baseBetaVersion=15.1.1

4
libappbase/src/main/AndroidManifest.xml
View File

@@ -22,11 +22,9 @@
android:launchMode="standard"/> android:launchMode="standard"/>
<activity <activity
android:theme="@android:style/Theme.Holo.Light.NoActionBar"
android:name="cc.winboll.studio.libappbase.winboll.LogActivity" android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
android:resizeableActivity="true" android:resizeableActivity="true"
android:launchMode="singleInstance" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
android:taskAffinity="cc.winboll.studio.libappbase.task.log"
android:exported="true"> android:exported="true">
</activity> </activity>

14
libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
View File

@@ -9,12 +9,11 @@ package cc.winboll.studio.libappbase.winboll;
* https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
*/ */
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.TaskStackBuilder; import android.app.TaskStackBuilder;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Rect;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.utils.ToastUtils;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
@@ -100,6 +99,7 @@ public class WinBollActivityManager {
resumeActivity(context, tag); resumeActivity(context, tag);
return; return;
} }
ToastUtils.show("startWinBollActivity(Context context, Class<T> clazz)");
// 新建一个任务窗口 // 新建一个任务窗口
Intent intent = new Intent(context, clazz); Intent intent = new Intent(context, clazz);
@@ -108,7 +108,7 @@ public class WinBollActivityManager {
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(EXTRA_TAG, tag); intent.putExtra(EXTRA_TAG, tag);
mContext.startActivity(intent); context.startActivity(intent);
} catch (InstantiationException | IllegalAccessException e) { } catch (InstantiationException | IllegalAccessException e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
} }
@@ -130,7 +130,7 @@ public class WinBollActivityManager {
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(EXTRA_TAG, tag); intent.putExtra(EXTRA_TAG, tag);
mContext.startActivity(intent); context.startActivity(intent);
} catch (InstantiationException | IllegalAccessException e) { } catch (InstantiationException | IllegalAccessException e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
} }
@@ -153,12 +153,12 @@ public class WinBollActivityManager {
// ActivityOptions options = ActivityOptions.makeBasic(); // ActivityOptions options = ActivityOptions.makeBasic();
// options.setLaunchBounds(bounds); // options.setLaunchBounds(bounds);
intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
//intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
/*intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
intent.putExtra(EXTRA_TAG, tag); intent.putExtra(EXTRA_TAG, tag);
*/
//context.startActivity(intent, options.toBundle()); //context.startActivity(intent, options.toBundle());
context.startActivity(intent); context.startActivity(intent);
} }