Merge branch 'apputils' of https://gitea.winboll.cc/Studio/APP.git into apputils
This commit is contained in:
commit
bf37eb61bb
@ -18,18 +18,18 @@ def genVersionName(def versionName){
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 32
|
compileSdkVersion 30
|
||||||
buildToolsVersion "33.0.3"
|
buildToolsVersion "30.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "cc.winboll.studio.apputils"
|
applicationId "cc.winboll.studio.apputils"
|
||||||
minSdkVersion 21
|
minSdkVersion 26
|
||||||
targetSdkVersion 30
|
targetSdkVersion 29
|
||||||
versionCode 1
|
versionCode 1
|
||||||
// versionName 更新后需要手动设置
|
// versionName 更新后需要手动设置
|
||||||
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
||||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||||
versionName "9.2"
|
versionName "9.4"
|
||||||
if(true) {
|
if(true) {
|
||||||
versionName = genVersionName("${versionName}")
|
versionName = genVersionName("${versionName}")
|
||||||
}
|
}
|
||||||
@ -50,6 +50,29 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':libapputils')
|
api project(':libapputils')
|
||||||
api 'cc.winboll.studio:libappbase:1.0.3'
|
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
|
||||||
|
// SSH
|
||||||
|
implementation 'com.jcraft:jsch:0.1.55'
|
||||||
|
// Html 解析
|
||||||
|
implementation 'org.jsoup:jsoup:1.13.1'
|
||||||
|
// 二维码类库
|
||||||
|
implementation 'com.google.zxing:core:3.4.1'
|
||||||
|
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
|
||||||
|
// 应用介绍页类库
|
||||||
|
implementation 'io.github.medyo:android-about-page:2.0.0'
|
||||||
|
// 吐司类库
|
||||||
|
implementation 'com.github.getActivity:ToastUtils:10.5'
|
||||||
|
// 网络连接类库
|
||||||
|
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
|
||||||
|
|
||||||
|
// Android 类库
|
||||||
|
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||||
|
implementation 'androidx.viewpager:viewpager:1.0.0'
|
||||||
|
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
|
||||||
|
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
|
||||||
|
implementation 'androidx.fragment:fragment:1.1.0'
|
||||||
|
implementation 'com.google.android.material:material:1.4.0'
|
||||||
|
|
||||||
|
implementation 'cc.winboll.studio:libappbase:2.1.3'
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Sat Jan 18 13:03:10 HKT 2025
|
#Sun Mar 09 09:20:53 HKT 2025
|
||||||
stageCount=2
|
stageCount=4
|
||||||
libraryProject=libapputils
|
libraryProject=libapputils
|
||||||
baseVersion=9.2
|
baseVersion=9.4
|
||||||
publishVersion=9.2.1
|
publishVersion=9.4.3
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=9.2.2
|
baseBetaVersion=9.4.4
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:icon="@drawable/ic_winboll"
|
android:icon="@drawable/ic_winboll"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:theme="@style/WinBoll.SupportThemeNoActionBar"
|
android:theme="@style/MyAppTheme"
|
||||||
android:supportsRtl="true">
|
android:supportsRtl="true">
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
@ -27,8 +27,6 @@
|
|||||||
|
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name=".TestWinBollActivity"/>
|
|
||||||
|
|
||||||
<activity android:name=".TestStringToQrCodeViewActivity"/>
|
<activity android:name=".TestStringToQrCodeViewActivity"/>
|
||||||
|
|
||||||
</application>
|
</application>
|
||||||
|
@ -5,27 +5,83 @@ package cc.winboll.studio.apputils;
|
|||||||
* @Date 2024/12/08 15:10:51
|
* @Date 2024/12/08 15:10:51
|
||||||
* @Describe 全局应用类
|
* @Describe 全局应用类
|
||||||
*/
|
*/
|
||||||
import android.view.Gravity;
|
import android.app.Application;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollApplication;
|
import android.content.Context;
|
||||||
import com.hjq.toast.ToastUtils;
|
import android.widget.Toast;
|
||||||
import com.hjq.toast.style.WhiteToastStyle;
|
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
|
import cc.winboll.studio.libapputils.app.MyActivityLifecycleCallbacks;
|
||||||
|
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
||||||
|
import cc.winboll.studio.libapputils.bean.DebugBean;
|
||||||
|
|
||||||
public class App extends WinBollApplication {
|
public class App extends GlobalApplication {
|
||||||
|
|
||||||
public static final String TAG = "App";
|
public static final String TAG = "App";
|
||||||
|
|
||||||
public static final String _ACTION_DEBUGVIEW = WinBollApplication.class.getName() + "_ACTION_DEBUGVIEW";
|
public static final String _ACTION_DEBUGVIEW = App.class.getName() + "_ACTION_DEBUGVIEW";
|
||||||
|
|
||||||
|
//static volatile WinBollApplication _WinBollApplication = null;
|
||||||
|
MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
|
||||||
|
|
||||||
|
// 标记当前应用是否处于调试状态
|
||||||
|
static volatile boolean isDebug = false;
|
||||||
|
|
||||||
|
public synchronized static void setIsDebug(boolean isDebug) {
|
||||||
|
App.isDebug = isDebug;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isDebug() {
|
||||||
|
return isDebug;
|
||||||
|
}
|
||||||
|
|
||||||
|
MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
|
||||||
|
return mMyActivityLifecycleCallbacks;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Context getApplicationContext() {
|
||||||
|
return super.getApplicationContext();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Application getApplication() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
super.onCreate();
|
super.onCreate();
|
||||||
// 初始化 Toast 框架
|
// 应用环境初始化, 基本调试环境
|
||||||
//
|
//
|
||||||
ToastUtils.init(this);
|
// 初始化日志模块
|
||||||
// 设置 Toast 布局样式
|
//LogUtils.init(this);
|
||||||
//ToastUtils.setView(R.layout.view_toast);
|
|
||||||
ToastUtils.setStyle(new WhiteToastStyle());
|
|
||||||
ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 初始化 Toast 框架
|
||||||
|
// ToastUtils.init(this);
|
||||||
|
// // 设置 Toast 布局样式
|
||||||
|
// //ToastUtils.setView(R.layout.view_toast);
|
||||||
|
// ToastUtils.setStyle(new WhiteToastStyle());
|
||||||
|
// ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
|
||||||
|
// 设置应用调试标志
|
||||||
|
DebugBean debugBean = DebugBean.loadBean(this, DebugBean.class);
|
||||||
|
if (debugBean == null) {
|
||||||
|
//ToastUtils.show("debugBean == null");
|
||||||
|
setIsDebug(false);
|
||||||
|
} else {
|
||||||
|
//ToastUtils.show("saveDebugStatus(" + String.valueOf(debugBean.isDebuging()) + ")");
|
||||||
|
setIsDebug(debugBean.isDebuging());
|
||||||
|
}
|
||||||
|
// 应用窗口管理模块参数设置
|
||||||
|
//
|
||||||
|
mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
|
||||||
|
registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
|
||||||
|
// 设置默认 WinBoll 应用 UI 类型
|
||||||
|
WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
|
||||||
|
//ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE());
|
||||||
|
} catch (Exception e) {
|
||||||
|
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||||
|
Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,28 +1,83 @@
|
|||||||
package cc.winboll.studio.apputils;
|
package cc.winboll.studio.apputils;
|
||||||
|
|
||||||
|
import android.content.ComponentName;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.content.pm.ResolveInfo;
|
||||||
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.apputils.R;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
|
import cc.winboll.studio.libappbase.LogView;
|
||||||
import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
|
import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
|
||||||
|
import cc.winboll.studio.libapputils.activities.LogActivity;
|
||||||
import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
|
import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivity;
|
import cc.winboll.studio.libapputils.app.AboutActivityFactory;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
||||||
import cc.winboll.studio.libapputils.log.LogActivity;
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libapputils.view.AboutView;
|
||||||
|
import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
final public class MainActivity extends WinBollActivity {
|
final public class MainActivity extends AppCompatActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "MainActivity";
|
public static final String TAG = "MainActivity";
|
||||||
|
|
||||||
public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
|
public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
|
||||||
|
|
||||||
|
Toolbar mToolbar;
|
||||||
|
LogView mLogView;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isEnableDisplayHomeAsUp() {
|
public AppCompatActivity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public APPInfo getAppInfo() {
|
||||||
|
String szBranchName = "apputils";
|
||||||
|
|
||||||
|
APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
|
||||||
|
appInfo.setAppName("APPUtils");
|
||||||
|
appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
|
||||||
|
appInfo.setAppDescription("APPUtils Description");
|
||||||
|
appInfo.setAppGitName("APP");
|
||||||
|
appInfo.setAppGitOwner("Studio");
|
||||||
|
appInfo.setAppGitAPPBranch(szBranchName);
|
||||||
|
appInfo.setAppGitAPPSubProjectFolder(szBranchName);
|
||||||
|
appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
|
||||||
|
appInfo.setAppAPKName("APPUtils");
|
||||||
|
appInfo.setAppAPKFolderName("APPUtils");
|
||||||
|
return appInfo;
|
||||||
|
//return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAddWinBollToolBar() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Toolbar initToolBar() {
|
||||||
|
return findViewById(R.id.activitymainToolbar1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,8 +86,22 @@ final public class MainActivity extends WinBollActivity {
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
//Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
|
mLogView = findViewById(R.id.logview);
|
||||||
//setActionBar(toolbar);
|
mLogView.start();
|
||||||
|
|
||||||
|
// 初始化工具栏
|
||||||
|
mToolbar = findViewById(R.id.activitymainToolbar1);
|
||||||
|
setSupportActionBar(mToolbar);
|
||||||
|
if (isEnableDisplayHomeAsUp()) {
|
||||||
|
// 显示后退按钮
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
}
|
||||||
|
getSupportActionBar().setSubtitle(getTag());
|
||||||
|
|
||||||
|
checkResolveActivity();
|
||||||
|
archiveInstance();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 接收并处理 Intent 数据,函数 Intent 处理接收就直接返回
|
// 接收并处理 Intent 数据,函数 Intent 处理接收就直接返回
|
||||||
//if (prosessIntents(getIntent())) return;
|
//if (prosessIntents(getIntent())) return;
|
||||||
@ -44,44 +113,94 @@ final public class MainActivity extends WinBollActivity {
|
|||||||
// LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
|
// LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean checkResolveActivity() {
|
||||||
|
PackageManager packageManager = getPackageManager();
|
||||||
|
//Intent intent = new Intent("your_action_here");
|
||||||
|
Intent intent = getIntent();
|
||||||
|
if (intent != null) {
|
||||||
|
List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
|
||||||
|
if (resolveInfoList.size() > 0) {
|
||||||
|
// 传入的Intent action在Activity清单的intent-filter的action节点里有定义
|
||||||
|
if (intent.getAction() != null) {
|
||||||
|
if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
|
||||||
|
App.setIsDebug(true);
|
||||||
|
//ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
// 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
|
||||||
|
//ToastUtils.show("false : " + intent.getAction());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// action在清单文件中没有声明
|
||||||
|
ToastUtils.show("false");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void archiveInstance() {
|
||||||
|
Intent intent = getIntent();
|
||||||
|
StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
|
||||||
|
|
||||||
|
if (intent != null) {
|
||||||
|
ComponentName componentName = intent.getComponent();
|
||||||
|
if (componentName != null) {
|
||||||
|
String packageName = componentName.getPackageName();
|
||||||
|
//Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
|
||||||
|
sb.append("启动本应用的应用包名: \n" + packageName);
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("\nImplicit Intent Tracker :\n接收到的 Intent 动作: \n" + intent.getAction());
|
||||||
|
Set<String> categories = intent.getCategories();
|
||||||
|
if (categories != null) {
|
||||||
|
for (String category : categories) {
|
||||||
|
sb.append("\n接收到的 Intent 类别 :\n" + category);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Uri data = intent.getData();
|
||||||
|
if (data != null) {
|
||||||
|
sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sb.append("Intent is null.");
|
||||||
|
}
|
||||||
|
sb.append("\n\n");
|
||||||
|
LogUtils.d(TAG, sb.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPostCreate(Bundle savedInstanceState) {
|
||||||
|
super.onPostCreate(savedInstanceState);
|
||||||
|
// 缓存当前 activity
|
||||||
|
WinBollActivityManager.getInstance(this).add(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
WinBollActivityManager.getInstance(this).registeRemove(this);
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
public void onTestLogClick(View view) {
|
public void onTestLogClick(View view) {
|
||||||
LogUtils.d(TAG, "onTestLogClick");
|
LogUtils.d(TAG, "onTestLogClick");
|
||||||
Toast.makeText(getApplication(), "onTestLogClick", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getApplication(), "onTestLogClick", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onLogUtilsClick(View view) {
|
public void onLogUtilsClick(View view) {
|
||||||
Intent intent = new Intent(this, LogActivity.class);
|
// Intent intent = new Intent(this, LogActivity.class);
|
||||||
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);
|
||||||
startActivity(intent);
|
// startActivity(intent);
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
//WinBollActivityManager.getInstance().printAvtivityListInfo();
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
// setSubTitle("");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
// exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// void exit() {
|
|
||||||
// YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onYes() {
|
|
||||||
// WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onNo() {
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
|
|
||||||
// }
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// 处理传入的 Intent 数据
|
// 处理传入的 Intent 数据
|
||||||
//
|
//
|
||||||
@ -125,58 +244,108 @@ final public class MainActivity extends WinBollActivity {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getTag() {
|
|
||||||
return TAG;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean isAddWinBollToolBar() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Toolbar initToolBar() {
|
|
||||||
return findViewById(R.id.activitymainToolbar1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
//ToastUtils.show("onCreateOptionsMenu");
|
||||||
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
||||||
|
if (isAddWinBollToolBar()) {
|
||||||
|
//ToastUtils.show("mIWinBoll.isAddWinBollToolBar()");
|
||||||
|
getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
|
||||||
|
}
|
||||||
|
if (App.isDebug()) {
|
||||||
|
getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
|
||||||
|
}
|
||||||
|
|
||||||
return super.onCreateOptionsMenu(menu);
|
return super.onCreateOptionsMenu(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
if (item.getItemId() == R.id.item_testwinboll) {
|
if (item.getItemId() == R.id.item_exit) {
|
||||||
WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestWinBollActivity.class);
|
exit();
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.item_about) {
|
||||||
|
AboutActivityFactory.showAboutActivity(this, getAppInfo());
|
||||||
|
return true;
|
||||||
} else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
|
} else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
|
||||||
WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
|
WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
|
||||||
} else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
|
} else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
|
||||||
Intent intent = new Intent(this, QRCodeDecodeActivity.class);
|
Intent intent = new Intent(this, QRCodeDecodeActivity.class);
|
||||||
startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
|
startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
|
||||||
|
} else if (item.getItemId() == R.id.item_testcrashreport) {
|
||||||
|
for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
|
||||||
|
getString(i);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.item_log) {
|
||||||
|
WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.item_exitdebug) {
|
||||||
|
AboutView.setApp2NormalMode(this);
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == android.R.id.home) {
|
||||||
|
WinBollActivityManager.getInstance(this).finish(this);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void about() {
|
||||||
|
// Intent intent = new Intent(this, AboutActivity.class);
|
||||||
|
// intent.putExtra(AboutActivity.EXTRA_APPINFO, AboutActivityFactory.buildAPPBranchInfo(this));
|
||||||
|
// WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AboutActivity.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
void exit() {
|
||||||
|
YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onYes() {
|
||||||
|
WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onNo() {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) {
|
||||||
|
exit();
|
||||||
|
} else {
|
||||||
|
WinBollActivityManager.getInstance(this).finish(this);
|
||||||
|
super.onBackPressed();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onTestAboutActivity(View view) {
|
||||||
|
about();
|
||||||
|
}
|
||||||
|
|
||||||
public void onTestJavascriptHtmlActivity(View view) {
|
public void onTestJavascriptHtmlActivity(View view) {
|
||||||
Intent intent = new Intent(this, AssetsHtmlActivity.class);
|
Intent intent = new Intent(this, AssetsHtmlActivity.class);
|
||||||
intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
|
intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
|
||||||
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
|
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
/*@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivithyResult(int requestCode, int resultCode, Intent data) {
|
||||||
switch (requestCode) {
|
switch (requestCode) {
|
||||||
case REQUEST_QRCODEDECODE_ACTIVITY : {
|
case REQUEST_QRCODEDECODE_ACTIVITY : {
|
||||||
String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
|
if (data != null) {
|
||||||
ToastUtils.show(text);
|
String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
|
||||||
break;
|
ToastUtils.show(text);
|
||||||
}
|
}
|
||||||
default : {
|
break;
|
||||||
ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
|
}
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
default : {
|
||||||
}
|
//ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
|
||||||
}
|
super.prosessActivityResult(requestCode, resultCode, data);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}*/
|
||||||
}
|
}
|
||||||
|
@ -1,37 +1,49 @@
|
|||||||
package cc.winboll.studio.apputils;
|
package cc.winboll.studio.apputils;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivity;
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
import cc.winboll.studio.libapputils.view.StringToQrCodeView;
|
import cc.winboll.studio.libapputils.view.StringToQrCodeView;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen@QQ.COM
|
* @Author ZhanGSKen@QQ.COM
|
||||||
* @Date 2025/01/17 19:50:46
|
* @Date 2025/01/17 19:50:46
|
||||||
*/
|
*/
|
||||||
public class TestStringToQrCodeViewActivity extends WinBollActivity {
|
public class TestStringToQrCodeViewActivity extends AppCompatActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "TestStringToQrCodeViewActivity";
|
public static final String TAG = "TestStringToQrCodeViewActivity";
|
||||||
|
|
||||||
StringToQrCodeView mStringToQrCodeView;
|
StringToQrCodeView mStringToQrCodeView;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AppCompatActivity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public APPInfo getAppInfo() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Toolbar initToolBar() {
|
public Toolbar initToolBar() {
|
||||||
return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
|
return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isEnableDisplayHomeAsUp() {
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isAddWinBollToolBar() {
|
public boolean isAddWinBollToolBar() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,10 +53,4 @@ public class TestStringToQrCodeViewActivity extends WinBollActivity {
|
|||||||
setContentView(R.layout.activity_teststringtoqrcodeview);
|
setContentView(R.layout.activity_teststringtoqrcodeview);
|
||||||
mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
|
mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
package cc.winboll.studio.apputils;
|
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.View;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
|
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivity;
|
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2025/01/13 15:09:46
|
|
||||||
*/
|
|
||||||
public class TestWinBollActivity extends WinBollActivity {
|
|
||||||
|
|
||||||
public static final String TAG = "TestWinBollActivity";
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getTag() {
|
|
||||||
return TAG;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Toolbar initToolBar() {
|
|
||||||
return findViewById(R.id.activitytestwinbollToolbar1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean isEnableDisplayHomeAsUp() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean isAddWinBollToolBar() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.activity_testwinboll);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
@ -27,7 +27,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="TestLog"
|
android:text="TestLog"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
android:onClick="onTestLogClick"/>
|
android:onClick="onTestLogClick"/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
@ -39,20 +39,27 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="right">
|
android:gravity="right">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
android:text="Test Javascript Html Activity"
|
android:text="Test Javascript Html Activity"
|
||||||
android:onClick="onTestJavascriptHtmlActivity"/>
|
android:onClick="onTestJavascriptHtmlActivity"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.LogView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:text="Button"
|
||||||
|
android:id="@+id/logview"
|
||||||
|
android:layout_weight="1.0"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -4,7 +4,4 @@
|
|||||||
<color name="colorPrimary">#FF196ABC</color>
|
<color name="colorPrimary">#FF196ABC</color>
|
||||||
<color name="colorPrimaryDark">#FF002B57</color>
|
<color name="colorPrimaryDark">#FF002B57</color>
|
||||||
<color name="colorAccent">#FF80BFFF</color>
|
<color name="colorAccent">#FF80BFFF</color>
|
||||||
<color name="colorToastFrame">#FFA9A9A9</color>
|
|
||||||
<color name="colorToastShadow">#FF000000</color>
|
|
||||||
<color name="colorToastBackgroung">#FFFFFFFF</color>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
|
<style name="MyAppTheme" parent="APPBaseTheme">
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
||||||
|
<item name="colorTittle">@color/colorAccent</item>
|
||||||
|
<item name="colorTittleBackgound">@color/colorPrimary</item>
|
||||||
|
<item name="colorText">@color/colorAccent</item>
|
||||||
|
<item name="colorTextBackgound">@color/colorPrimaryDark</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -4,12 +4,12 @@ apply from: '../.winboll/winboll_lib_build.gradle'
|
|||||||
apply from: '../.winboll/winboll_lint_build.gradle'
|
apply from: '../.winboll/winboll_lint_build.gradle'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 32
|
compileSdkVersion 30
|
||||||
buildToolsVersion "33.0.3"
|
buildToolsVersion "30.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 21
|
minSdkVersion 26
|
||||||
targetSdkVersion 30
|
targetSdkVersion 29
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
@ -17,28 +17,32 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility JavaVersion.VERSION_11
|
|
||||||
targetCompatibility JavaVersion.VERSION_11
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// 二维码使用的类库
|
|
||||||
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.jcraft:jsch:0.1.55'
|
|
||||||
api 'org.jsoup:jsoup:1.13.1'
|
|
||||||
api 'com.squareup.okhttp3:okhttp:4.4.1'
|
|
||||||
|
|
||||||
api 'androidx.appcompat:appcompat:1.0.0'
|
|
||||||
api 'androidx.fragment:fragment:1.0.0'
|
|
||||||
api 'com.google.android.material:material:1.0.0'
|
|
||||||
|
|
||||||
api 'cc.winboll.studio:libappbase:1.0.3'
|
|
||||||
|
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
|
||||||
|
// SSH
|
||||||
|
implementation 'com.jcraft:jsch:0.1.55'
|
||||||
|
// Html 解析
|
||||||
|
implementation 'org.jsoup:jsoup:1.13.1'
|
||||||
|
// 二维码类库
|
||||||
|
implementation 'com.google.zxing:core:3.4.1'
|
||||||
|
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
|
||||||
|
// 应用介绍页类库
|
||||||
|
implementation 'io.github.medyo:android-about-page:2.0.0'
|
||||||
|
// 吐司类库
|
||||||
|
implementation 'com.github.getActivity:ToastUtils:10.5'
|
||||||
|
// 网络连接类库
|
||||||
|
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
|
||||||
|
|
||||||
|
// Android 类库
|
||||||
|
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||||
|
implementation 'androidx.viewpager:viewpager:1.0.0'
|
||||||
|
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
|
||||||
|
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
|
||||||
|
implementation 'androidx.fragment:fragment:1.1.0'
|
||||||
|
implementation 'com.google.android.material:material:1.4.0'
|
||||||
|
|
||||||
|
implementation 'cc.winboll.studio:libappbase:2.1.3'
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Sat Jan 18 13:02:39 HKT 2025
|
#Sun Mar 09 09:20:34 HKT 2025
|
||||||
stageCount=2
|
stageCount=4
|
||||||
libraryProject=libapputils
|
libraryProject=libapputils
|
||||||
baseVersion=9.2
|
baseVersion=9.4
|
||||||
publishVersion=9.2.1
|
publishVersion=9.4.3
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=9.2.2
|
baseBetaVersion=9.4.4
|
||||||
|
@ -18,6 +18,9 @@
|
|||||||
<!-- 拍摄照片和视频 -->
|
<!-- 拍摄照片和视频 -->
|
||||||
<uses-permission android:name="android.permission.CAMERA"/>
|
<uses-permission android:name="android.permission.CAMERA"/>
|
||||||
|
|
||||||
|
<!-- 拥有完全的网络访问权限 -->
|
||||||
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
|
|
||||||
<application android:networkSecurityConfig="@xml/network_security_config">
|
<application android:networkSecurityConfig="@xml/network_security_config">
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
@ -26,7 +29,7 @@
|
|||||||
android:launchMode="standard"/>
|
android:launchMode="standard"/>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".log.LogActivity"
|
android:name=".activities.LogActivity"
|
||||||
android:label="LogActivity"
|
android:label="LogActivity"
|
||||||
android:launchMode="standard"/>
|
android:launchMode="standard"/>
|
||||||
|
|
||||||
|
@ -1,24 +1,41 @@
|
|||||||
package cc.winboll.studio.libapputils.activities;
|
package cc.winboll.studio.libapputils.activities;
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import cc.winboll.studio.libapputils.R;
|
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivity;
|
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen@QQ.COM
|
* @Author ZhanGSKen@QQ.COM
|
||||||
* @Date 2024/07/14 13:20:33
|
* @Date 2024/07/14 13:20:33
|
||||||
* @Describe AboutFragment Test
|
* @Describe 应用介绍页
|
||||||
*/
|
*/
|
||||||
final public class AboutActivity extends WinBollActivity {
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.libapputils.R;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
||||||
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
|
import cc.winboll.studio.libapputils.view.AboutView;
|
||||||
|
|
||||||
|
final public class AboutActivity extends AppCompatActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "AboutActivity";
|
public static final String TAG = "AboutActivity";
|
||||||
|
|
||||||
|
public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
|
||||||
|
|
||||||
|
|
||||||
|
APPInfo mAPPInfo;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AppCompatActivity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public APPInfo getAppInfo() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
@ -26,45 +43,37 @@ final public class AboutActivity extends WinBollActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isEnableDisplayHomeAsUp() {
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAddWinBollToolBar() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Toolbar initToolBar() {
|
||||||
|
return findViewById(R.id.activityaboutToolbar1);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_about);
|
setContentView(R.layout.activity_about);
|
||||||
|
Intent intent = getIntent();
|
||||||
|
if (intent != null) {
|
||||||
|
mAPPInfo = (APPInfo)intent.getSerializableExtra(EXTRA_APPINFO);
|
||||||
|
}
|
||||||
|
if (mAPPInfo == null) {
|
||||||
|
mAPPInfo = new APPInfo();
|
||||||
|
}
|
||||||
|
|
||||||
/*AboutView aboutView = findViewById(R.id.activityaboutAboutView1);
|
AboutView aboutView = new AboutView(this, mAPPInfo);
|
||||||
aboutView.setOnRequestDevUserInfoAutofillListener(new AboutView.OnRequestDevUserInfoAutofillListener(){
|
LinearLayout llMain = findViewById(R.id.activityaboutLinearLayout1);
|
||||||
|
llMain.addView(aboutView);
|
||||||
|
|
||||||
@Override
|
//ToastUtils.show(TAG);
|
||||||
public void requestAutofill(EditText etDevUserName, EditText etDevUserPassword) {
|
|
||||||
AutofillManager autofillManager = (AutofillManager) getSystemService(AutofillManager.class);
|
|
||||||
if (autofillManager!= null) {
|
|
||||||
//ToastUtils.show("0");
|
|
||||||
autofillManager.requestAutofill(findViewById(R.id.usernameEditText));
|
|
||||||
autofillManager.requestAutofill(findViewById(R.id.passwordEditText));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});*/
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean isAddWinBollToolBar() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Toolbar initToolBar() {
|
|
||||||
return findViewById(R.id.activityaboutToolbar1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -73,15 +82,11 @@ final public class AboutActivity extends WinBollActivity {
|
|||||||
return super.onCreateOptionsMenu(menu);
|
return super.onCreateOptionsMenu(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
if (item.getItemId() == R.id.item_help) {
|
if (item.getItemId() == R.id.item_help) {
|
||||||
WinBollActivityManager.getInstance(this).startWinBollActivity(this, AssetsHtmlActivity.class);
|
WinBollActivityManager.getInstance(this).startWinBollActivity(this, AssetsHtmlActivity.class);
|
||||||
}
|
}
|
||||||
// else if (item.getItemId() == android.R.id.home) {
|
|
||||||
// WinBollActivityManager.getInstance(this).finish(this);
|
|
||||||
// }
|
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,17 +11,17 @@ import android.net.Uri;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivity;
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
import cc.winboll.studio.libapputils.view.SimpleWebView;
|
import cc.winboll.studio.libapputils.view.SimpleWebView;
|
||||||
import com.hjq.toast.ToastUtils;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import android.os.PersistableBundle;
|
|
||||||
|
|
||||||
public class AssetsHtmlActivity extends WinBollActivity {
|
public class AssetsHtmlActivity extends AppCompatActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "AssetsHtmlActivity";
|
public static final String TAG = "AssetsHtmlActivity";
|
||||||
|
|
||||||
@ -34,24 +34,34 @@ public class AssetsHtmlActivity extends WinBollActivity {
|
|||||||
// Assets 文件夹里的 Html 文件的名称
|
// Assets 文件夹里的 Html 文件的名称
|
||||||
String mszHtmlFileName;
|
String mszHtmlFileName;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AppCompatActivity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public APPInfo getAppInfo() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isEnableDisplayHomeAsUp() {
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isAddWinBollToolBar() {
|
public boolean isAddWinBollToolBar() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Toolbar initToolBar() {
|
public Toolbar initToolBar() {
|
||||||
return findViewById(R.id.activityassetshtmlToolbar1);
|
return findViewById(R.id.activityassetshtmlToolbar1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,7 +91,7 @@ public class AssetsHtmlActivity extends WinBollActivity {
|
|||||||
if (szTemp != null && !szTemp.trim().equals("")) {
|
if (szTemp != null && !szTemp.trim().equals("")) {
|
||||||
mszHtmlFileName = szTemp.trim();
|
mszHtmlFileName = szTemp.trim();
|
||||||
}
|
}
|
||||||
ToastUtils.show(mszHtmlFileName);
|
//ToastUtils.show(mszHtmlFileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 与其他应用分享 html 帮助
|
// 与其他应用分享 html 帮助
|
||||||
@ -107,13 +117,6 @@ public class AssetsHtmlActivity extends WinBollActivity {
|
|||||||
// myWebView.loadUrl(mszHelpIndexFileUri.toString());
|
// myWebView.loadUrl(mszHelpIndexFileUri.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
|
|
||||||
super.onPostCreate(savedInstanceState, persistentState);
|
|
||||||
setSubTitle(mszHtmlFileName);
|
|
||||||
//setSubTitle(TAG);
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
void initWebViewFromAssets(String szHtmlFileName) {
|
void initWebViewFromAssets(String szHtmlFileName) {
|
||||||
try {
|
try {
|
||||||
|
@ -0,0 +1,69 @@
|
|||||||
|
package cc.winboll.studio.libapputils.activities;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author ZhanGSKen@AliYun.Com
|
||||||
|
* @Date 2025/03/08 00:19:39
|
||||||
|
* @Describe LogActivity
|
||||||
|
*/
|
||||||
|
import android.os.Bundle;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
|
import cc.winboll.studio.libappbase.LogView;
|
||||||
|
import cc.winboll.studio.libapputils.R;
|
||||||
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
|
|
||||||
|
public class LogActivity extends AppCompatActivity implements IWinBollActivity {
|
||||||
|
|
||||||
|
public static final String TAG = "LogActivity";
|
||||||
|
|
||||||
|
LogView mLogView;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AppCompatActivity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public APPInfo getAppInfo() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Toolbar initToolBar() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAddWinBollToolBar() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
LogUtils.d(TAG, "onCreate");
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_log);
|
||||||
|
mLogView = findViewById(R.id.logview);
|
||||||
|
mLogView.start();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onResume() {
|
||||||
|
LogUtils.d(TAG, "onResume");
|
||||||
|
super.onResume();
|
||||||
|
}
|
||||||
|
}
|
@ -9,44 +9,57 @@ import android.content.Intent;
|
|||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import androidx.core.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivity;
|
import cc.winboll.studio.libapputils.app.IWinBollActivity;
|
||||||
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
import com.google.zxing.ResultPoint;
|
import com.google.zxing.ResultPoint;
|
||||||
import com.journeyapps.barcodescanner.BarcodeCallback;
|
import com.journeyapps.barcodescanner.BarcodeCallback;
|
||||||
import com.journeyapps.barcodescanner.BarcodeResult;
|
import com.journeyapps.barcodescanner.BarcodeResult;
|
||||||
import com.journeyapps.barcodescanner.DecoratedBarcodeView;
|
import com.journeyapps.barcodescanner.DecoratedBarcodeView;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class QRCodeDecodeActivity extends WinBollActivity {
|
public class QRCodeDecodeActivity extends AppCompatActivity implements IWinBollActivity {
|
||||||
|
|
||||||
public static final String TAG = "QRCodeDecodeActivity";
|
public static final String TAG = "QRCodeDecodeActivity";
|
||||||
public static final String EXTRA_RESULT = "EXTRA_RESULT";
|
|
||||||
|
|
||||||
|
public static final String EXTRA_RESULT = "EXTRA_RESULT";
|
||||||
private static final int REQUEST_CAMERA_PERMISSION = 1;
|
private static final int REQUEST_CAMERA_PERMISSION = 1;
|
||||||
|
|
||||||
TextView resultTextView;
|
TextView resultTextView;
|
||||||
DecoratedBarcodeView barcodeView;
|
DecoratedBarcodeView barcodeView;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AppCompatActivity getActivity() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public APPInfo getAppInfo() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTag() {
|
public String getTag() {
|
||||||
return TAG;
|
return TAG;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isEnableDisplayHomeAsUp() {
|
public boolean isEnableDisplayHomeAsUp() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isAddWinBollToolBar() {
|
public boolean isAddWinBollToolBar() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Toolbar initToolBar() {
|
public Toolbar initToolBar() {
|
||||||
return findViewById(R.id.activityqrcodedecodeToolbar1);
|
return findViewById(R.id.activityqrcodedecodeToolbar1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,240 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.ads;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2024/12/09 15:37:35
|
|
||||||
* @Describe WinBoll 应用推广视图
|
|
||||||
*/
|
|
||||||
import android.content.Context;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.view.View;
|
|
||||||
import android.webkit.WebView;
|
|
||||||
import android.webkit.WebViewClient;
|
|
||||||
import android.widget.RelativeLayout;
|
|
||||||
import com.hjq.toast.ToastUtils;
|
|
||||||
|
|
||||||
public class ADsView extends RelativeLayout {
|
|
||||||
|
|
||||||
public static final String TAG = "ADsView";
|
|
||||||
|
|
||||||
public volatile boolean mIsHandling;
|
|
||||||
public volatile boolean mIsAddNewLog;
|
|
||||||
|
|
||||||
Context mContext;
|
|
||||||
WebView mWebView;
|
|
||||||
//ScrollView mScrollView;
|
|
||||||
//TextView mTextView;
|
|
||||||
//CheckBox mSelectableCheckBox;
|
|
||||||
//LogViewThread mLogViewThread;
|
|
||||||
//LogViewHandler mLogViewHandler;
|
|
||||||
//Spinner mLogLevelSpinner;
|
|
||||||
//ArrayAdapter<CharSequence> mLogLevelSpinnerAdapter;
|
|
||||||
|
|
||||||
public ADsView(Context context) {
|
|
||||||
super(context);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ADsView(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ADsView(Context context, AttributeSet attrs, int defStyleAttr) {
|
|
||||||
super(context, attrs, defStyleAttr);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ADsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
|
|
||||||
super(context, attrs, defStyleAttr, defStyleRes);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
// public void start() {
|
|
||||||
// mLogViewThread = new LogViewThread(LogView.this);
|
|
||||||
// mLogViewThread.start();
|
|
||||||
// // 显示日志
|
|
||||||
// showAndScrollLogView();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void scrollLogUp() {
|
|
||||||
// mScrollView.post(new Runnable() {
|
|
||||||
// @Override
|
|
||||||
// public void run() {
|
|
||||||
// mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
|
|
||||||
// // 日志显示结束
|
|
||||||
// mLogViewHandler.setIsHandling(false);
|
|
||||||
// // 检查是否添加了新日志
|
|
||||||
// if (mLogViewHandler.isAddNewLog()) {
|
|
||||||
// // 有新日志添加,先更改新日志标志
|
|
||||||
// mLogViewHandler.setIsAddNewLog(false);
|
|
||||||
// // 再次发送显示日志的显示
|
|
||||||
// Message message = mLogViewHandler.obtainMessage(LogViewHandler.MSG_LOGVIEW_UPDATE);
|
|
||||||
// mLogViewHandler.sendMessage(message);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
void initView(Context context) {
|
|
||||||
mContext = context;
|
|
||||||
|
|
||||||
// mLogViewHandler = new LogViewHandler();
|
|
||||||
// 加载视图布局
|
|
||||||
View viewMain = inflate(mContext, cc.winboll.studio.libapputils.R.layout.view_ads, null);
|
|
||||||
mWebView = viewMain.findViewById(cc.winboll.studio.libapputils.R.id.viewadsWebView1);
|
|
||||||
mWebView.setWebViewClient(new WebViewClient() {
|
|
||||||
@Override
|
|
||||||
public boolean shouldOverrideUrlLoading(WebView view, String url) {
|
|
||||||
view.loadUrl(url);
|
|
||||||
ToastUtils.show(url);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// // 初始化日志子控件视图
|
|
||||||
// //
|
|
||||||
// mScrollView = findViewById(cc.winboll.studio.libapputils.R.id.viewlogScrollViewLog);
|
|
||||||
// mTextView = findViewById(cc.winboll.studio.libapputils.R.id.viewlogTextViewLog);
|
|
||||||
// // 获取Log Level spinner实例
|
|
||||||
// mLogLevelSpinner = findViewById(cc.winboll.studio.libapputils.R.id.viewlogSpinner1);
|
|
||||||
//
|
|
||||||
// (findViewById(cc.winboll.studio.libapputils.R.id.viewlogButtonClean)).setOnClickListener(new View.OnClickListener(){
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onClick(View v) {
|
|
||||||
// LogUtils.cleanLog();
|
|
||||||
// LogUtils.d(TAG, "Log is cleaned.");
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// (findViewById(cc.winboll.studio.libapputils.R.id.viewlogButtonCopy)).setOnClickListener(new View.OnClickListener(){
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onClick(View v) {
|
|
||||||
//
|
|
||||||
// ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
|
|
||||||
// cm.setPrimaryClip(ClipData.newPlainText(mContext.getPackageName(), LogUtils.loadLog()));
|
|
||||||
// LogUtils.d(TAG, "Log is copied.");
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// mSelectableCheckBox = findViewById(cc.winboll.studio.libapputils.R.id.viewlogCheckBoxSelectable);
|
|
||||||
// mSelectableCheckBox.setOnClickListener(new View.OnClickListener(){
|
|
||||||
// @Override
|
|
||||||
// public void onClick(View v) {
|
|
||||||
// if (mSelectableCheckBox.isChecked()) {
|
|
||||||
// setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
|
|
||||||
// } else {
|
|
||||||
// setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
//
|
|
||||||
// // 设置日志级别列表
|
|
||||||
// ArrayList<String> adapterItems = new ArrayList<>();
|
|
||||||
// for (LogUtils.LOG_LEVEL e : LogUtils.LOG_LEVEL.values()) {
|
|
||||||
// adapterItems.add(e.name());
|
|
||||||
// }
|
|
||||||
// // 假设你有一个字符串数组作为选项列表
|
|
||||||
// //String[] options = {"Option 1", "Option 2", "Option 3"};
|
|
||||||
// // 创建一个ArrayAdapter来绑定数据到spinner
|
|
||||||
// mLogLevelSpinnerAdapter = ArrayAdapter.createFromResource(
|
|
||||||
// context, cc.winboll.studio.libapputils.R.array.enum_loglevel_array, android.R.layout.simple_spinner_item);
|
|
||||||
// mLogLevelSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
//
|
|
||||||
// // 设置适配器并将它应用到spinner上
|
|
||||||
// mLogLevelSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); // 设置下拉视图样式
|
|
||||||
// mLogLevelSpinner.setAdapter(mLogLevelSpinnerAdapter);
|
|
||||||
// // 为Spinner添加监听器
|
|
||||||
// mLogLevelSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
|
||||||
// @Override
|
|
||||||
// public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
|
||||||
// //String selectedOption = mLogLevelSpinnerAdapter.getItem(position);
|
|
||||||
// // 处理选中的选项...
|
|
||||||
// LogUtils.setLogLevel(LogUtils.LOG_LEVEL.values()[position]);
|
|
||||||
// }
|
|
||||||
// @Override
|
|
||||||
// public void onNothingSelected(AdapterView<?> parent) {
|
|
||||||
// // 如果没有选择,则执行此操作...
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// // 获取默认值的索引
|
|
||||||
// int defaultValueIndex = LogUtils.getLogLevel().ordinal();
|
|
||||||
//
|
|
||||||
// if (defaultValueIndex != -1) {
|
|
||||||
// // 如果找到了默认值,设置默认选项
|
|
||||||
// mLogLevelSpinner.setSelection(defaultValueIndex);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // 设置滚动时不聚焦日志
|
|
||||||
// setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void loadUrl(String url) {
|
|
||||||
mWebView.loadUrl(url);
|
|
||||||
//webView.loadUrl("https://www.winboll.cc");
|
|
||||||
//webView.loadUrl("https://ads.winboll.cc");
|
|
||||||
}
|
|
||||||
|
|
||||||
// public void updateLogView() {
|
|
||||||
// if (mLogViewHandler.isHandling() == true) {
|
|
||||||
// // 正在处理日志显示,
|
|
||||||
// // 就先设置一个新日志标志位
|
|
||||||
// // 以便日志显示完后,再次显示新日志内容
|
|
||||||
// mLogViewHandler.setIsAddNewLog(true);
|
|
||||||
// } else {
|
|
||||||
// //LogUtils.d(TAG, "LogListener showLog(String path)");
|
|
||||||
// Message message = mLogViewHandler.obtainMessage(LogViewHandler.MSG_LOGVIEW_UPDATE);
|
|
||||||
// mLogViewHandler.sendMessage(message);
|
|
||||||
// mLogViewHandler.setIsAddNewLog(false);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// void showAndScrollLogView() {
|
|
||||||
// mTextView.setText(LogUtils.loadLog());
|
|
||||||
// scrollLogUp();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// class LogViewHandler extends Handler {
|
|
||||||
//
|
|
||||||
// final static int MSG_LOGVIEW_UPDATE = 0;
|
|
||||||
// volatile boolean isHandling;
|
|
||||||
// volatile boolean isAddNewLog;
|
|
||||||
//
|
|
||||||
// public LogViewHandler() {
|
|
||||||
// setIsHandling(false);
|
|
||||||
// setIsAddNewLog(false);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setIsHandling(boolean isHandling) {
|
|
||||||
// this.isHandling = isHandling;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public boolean isHandling() {
|
|
||||||
// return isHandling;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setIsAddNewLog(boolean isAddNewLog) {
|
|
||||||
// this.isAddNewLog = isAddNewLog;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public boolean isAddNewLog() {
|
|
||||||
// return isAddNewLog;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void handleMessage(Message msg) {
|
|
||||||
// switch (msg.what) {
|
|
||||||
// case MSG_LOGVIEW_UPDATE:{
|
|
||||||
// if (isHandling() == false) {
|
|
||||||
// setIsHandling(true);
|
|
||||||
// showAndScrollLogView();
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// default:
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// super.handleMessage(msg);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
|
@ -0,0 +1,54 @@
|
|||||||
|
package cc.winboll.studio.libapputils.app;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author ZhanGSKen@QQ.COM
|
||||||
|
* @Date 2025/02/06 08:45:23
|
||||||
|
* @Describe 关于活动窗口的介绍窗口工厂
|
||||||
|
*/
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import cc.winboll.studio.libapputils.activities.AboutActivity;
|
||||||
|
import cc.winboll.studio.libapputils.app.AboutActivityFactory;
|
||||||
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
|
|
||||||
|
public class AboutActivityFactory {
|
||||||
|
|
||||||
|
public static final String TAG = "AboutActivityFactory";
|
||||||
|
|
||||||
|
public static APPInfo buildDefaultAPPInfo() {
|
||||||
|
String szBranchName = "";
|
||||||
|
|
||||||
|
APPInfo appInfo = new APPInfo();
|
||||||
|
appInfo.setAppName("APP");
|
||||||
|
appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
|
||||||
|
appInfo.setAppDescription("APP Description");
|
||||||
|
appInfo.setAppGitName("APP");
|
||||||
|
appInfo.setAppGitOwner("Studio");
|
||||||
|
appInfo.setAppGitAPPBranch(szBranchName);
|
||||||
|
appInfo.setAppGitAPPSubProjectFolder(szBranchName);
|
||||||
|
appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
|
||||||
|
appInfo.setAppAPKName("APP");
|
||||||
|
appInfo.setAppAPKFolderName("APP");
|
||||||
|
return appInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void showAboutActivity(Context context, APPInfo appInfo) {
|
||||||
|
/*String szPN = ((IWinBollActivity)context).getActivityPackageName();
|
||||||
|
//String szPN = context.getPackageName();
|
||||||
|
String szBranchName = "";
|
||||||
|
if (szPN != null) {
|
||||||
|
//String szPN = "cc.winboll.studio.apputils.beta";
|
||||||
|
String regex = "cc\\.winboll\\.studio\\.([^.]+)\\.*";
|
||||||
|
Pattern pattern = Pattern.compile(regex);
|
||||||
|
Matcher matcher = pattern.matcher(szPN);
|
||||||
|
if (matcher.find()) {
|
||||||
|
szBranchName = matcher.group(1);
|
||||||
|
}
|
||||||
|
}*/
|
||||||
|
//ToastUtils.show(szPN);
|
||||||
|
|
||||||
|
Intent intent = new Intent(context, AboutActivity.class);
|
||||||
|
intent.putExtra(AboutActivity.EXTRA_APPINFO, (appInfo == null) ? AboutActivityFactory.buildDefaultAPPInfo():appInfo);
|
||||||
|
WinBollActivityManager.getInstance(context).startWinBollActivity(context, intent, AboutActivity.class);
|
||||||
|
}
|
||||||
|
}
|
@ -5,7 +5,7 @@ package cc.winboll.studio.libapputils.app;
|
|||||||
* @Date 2024/08/12 14:45:35
|
* @Date 2024/08/12 14:45:35
|
||||||
* @Describe 应用版本工具集
|
* @Describe 应用版本工具集
|
||||||
*/
|
*/
|
||||||
import com.hjq.toast.ToastUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@ -23,6 +23,7 @@ public class AppVersionUtils {
|
|||||||
// true 新版本 == 当前版本
|
// true 新版本 == 当前版本
|
||||||
//
|
//
|
||||||
public static boolean isHasNewVersion2(String szCurrentName, String szNextName) {
|
public static boolean isHasNewVersion2(String szCurrentName, String szNextName) {
|
||||||
|
LogUtils.d(TAG, String.format("isHasNewVersion2\nszCurrentName : %s\nszNextName : %s", szCurrentName, szNextName));
|
||||||
//szCurrentName = "AES_6.2.0-beta0_3234.apk";
|
//szCurrentName = "AES_6.2.0-beta0_3234.apk";
|
||||||
//szNextName = "AES_6.1.12.apk";
|
//szNextName = "AES_6.1.12.apk";
|
||||||
//szCurrentName = "AES_6.2.0-beta0_3234.apk";
|
//szCurrentName = "AES_6.2.0-beta0_3234.apk";
|
||||||
@ -79,6 +80,7 @@ public class AppVersionUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isHasNewStageReleaseVersion(String szCurrentName, String szNextName) {
|
public static boolean isHasNewStageReleaseVersion(String szCurrentName, String szNextName) {
|
||||||
|
LogUtils.d(TAG, String.format("isHasNewStageReleaseVersion\nszCurrentName : %s\nszNextName : %s", szCurrentName, szNextName));
|
||||||
//szCurrentName = "AES_6.2.12.apk";
|
//szCurrentName = "AES_6.2.12.apk";
|
||||||
//szNextName = "AES_6.3.12.apk";
|
//szNextName = "AES_6.3.12.apk";
|
||||||
if (checkNewVersion(getCodeInPackageName(szCurrentName), getCodeInPackageName(szNextName))) {
|
if (checkNewVersion(getCodeInPackageName(szCurrentName), getCodeInPackageName(szNextName))) {
|
||||||
@ -96,6 +98,10 @@ public class AppVersionUtils {
|
|||||||
// 返回 :true 新版本 > 当前版本
|
// 返回 :true 新版本 > 当前版本
|
||||||
//
|
//
|
||||||
public static Boolean checkNewVersion(String szCurrentCode, String szNextCode) {
|
public static Boolean checkNewVersion(String szCurrentCode, String szNextCode) {
|
||||||
|
if (szCurrentCode == null || szCurrentCode.equals("") || szNextCode == null || szNextCode.equals("")) {
|
||||||
|
LogUtils.d(TAG, String.format("checkNewVersion unexpected parameters:\nszCurrentCode : %s\nszNextCode : %s", szCurrentCode, szNextCode));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
boolean isNew = false;
|
boolean isNew = false;
|
||||||
String[] appVersionCurrent = szCurrentCode.split("\\.");
|
String[] appVersionCurrent = szCurrentCode.split("\\.");
|
||||||
String[] appVersionNext = szNextCode.split("\\.");
|
String[] appVersionNext = szNextCode.split("\\.");
|
||||||
@ -106,7 +112,7 @@ public class AppVersionUtils {
|
|||||||
if (Integer.parseInt(appVersionNext[i]) > Integer.parseInt(appVersionCurrent[i])) {
|
if (Integer.parseInt(appVersionNext[i]) > Integer.parseInt(appVersionCurrent[i])) {
|
||||||
isNew = true;
|
isNew = true;
|
||||||
return isNew;
|
return isNew;
|
||||||
} else if(Integer.parseInt(appVersionNext[i]) == Integer.parseInt(appVersionCurrent[i])) {
|
} else if (Integer.parseInt(appVersionNext[i]) == Integer.parseInt(appVersionCurrent[i])) {
|
||||||
continue ;
|
continue ;
|
||||||
} else {
|
} else {
|
||||||
isNew = false;
|
isNew = false;
|
||||||
@ -122,14 +128,17 @@ public class AppVersionUtils {
|
|||||||
// 如 :AppUtils_7.0.4.apk 版本号为 7.0.4
|
// 如 :AppUtils_7.0.4.apk 版本号为 7.0.4
|
||||||
//
|
//
|
||||||
public static String getCodeInPackageName(String apkName) {
|
public static String getCodeInPackageName(String apkName) {
|
||||||
|
LogUtils.d(TAG, String.format("getCodeInPackageName apkName : %s", apkName));
|
||||||
//String apkName = "AppUtils_7.0.0.apk";
|
//String apkName = "AppUtils_7.0.0.apk";
|
||||||
Pattern pattern = Pattern.compile("\\d+\\.\\d+\\.\\d+");
|
Pattern pattern = Pattern.compile("\\d+\\.\\d+\\.\\d+");
|
||||||
Matcher matcher = pattern.matcher(apkName);
|
Matcher matcher = pattern.matcher(apkName);
|
||||||
if (matcher.find()) {
|
if (matcher.find()) {
|
||||||
String version = matcher.group();
|
String version = matcher.group();
|
||||||
|
LogUtils.d(TAG, String.format("version is %s", version));
|
||||||
return version;
|
return version;
|
||||||
//System.out.println("Version number: " + version); // 输出:7.0.0
|
//System.out.println("Version number: " + version); // 输出:7.0.0
|
||||||
}
|
}
|
||||||
|
LogUtils.d(TAG, String.format("No result."));
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -149,5 +158,4 @@ public class AppVersionUtils {
|
|||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,23 @@
|
|||||||
|
package cc.winboll.studio.libapputils.app;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author ZhanGSKen@AliYun.Com
|
||||||
|
* @Date 2025/03/08 00:15:36
|
||||||
|
* @Describe WinBoll 活动窗口通用接口
|
||||||
|
*/
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
|
|
||||||
|
public interface IWinBollActivity {
|
||||||
|
|
||||||
|
public static final String TAG = "IWinBollActivity";
|
||||||
|
|
||||||
|
// 获取当前具有 IWinBoll 特征的 AppCompatActivity 活动窗口
|
||||||
|
abstract public AppCompatActivity getActivity();
|
||||||
|
abstract public APPInfo getAppInfo();
|
||||||
|
abstract public String getTag();
|
||||||
|
abstract public Toolbar initToolBar();
|
||||||
|
abstract public boolean isEnableDisplayHomeAsUp();
|
||||||
|
abstract public boolean isAddWinBollToolBar();
|
||||||
|
}
|
@ -6,22 +6,19 @@ package cc.winboll.studio.libapputils.app;
|
|||||||
*/
|
*/
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
import android.content.ComponentName;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks {
|
public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks {
|
||||||
|
|
||||||
public static final String TAG = "MyActivityLifecycleCallbacks";
|
public static final String TAG = "MyActivityLifecycleCallbacks";
|
||||||
|
|
||||||
|
|
||||||
public String mInfo = "";
|
public String mInfo = "";
|
||||||
|
|
||||||
public MyActivityLifecycleCallbacks(WinBollApplication application) {
|
public MyActivityLifecycleCallbacks() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void createActivityeInfo(Activity activity) {
|
void createActivityeInfo(Activity activity) {
|
||||||
|
@ -1,479 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.app;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2024/08/12 14:32:08
|
|
||||||
* @Describe WinBoll 活动窗口基础类
|
|
||||||
*/
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.BroadcastReceiver;
|
|
||||||
import android.content.ComponentName;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.IntentFilter;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.content.pm.ResolveInfo;
|
|
||||||
import android.content.res.Resources;
|
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuInflater;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import androidx.appcompat.app.ActionBar;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.fragment.app.FragmentManager;
|
|
||||||
import cc.winboll.studio.libapputils.R;
|
|
||||||
import cc.winboll.studio.libapputils.activities.AboutActivity;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogActivity;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
import cc.winboll.studio.libapputils.view.AboutView;
|
|
||||||
import com.hjq.toast.ToastUtils;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
abstract public class WinBollActivity extends AppCompatActivity {
|
|
||||||
|
|
||||||
public static final String TAG = "WinBollActivity";
|
|
||||||
|
|
||||||
public static final int REQUEST_LOG_ACTIVITY = 0;
|
|
||||||
|
|
||||||
Toolbar mToolBar;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
checkResolveActivity();
|
|
||||||
LogUtils.d(TAG, "onCreate");
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
archiveInstance();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean checkResolveActivity() {
|
|
||||||
PackageManager packageManager = getPackageManager();
|
|
||||||
//Intent intent = new Intent("your_action_here");
|
|
||||||
Intent intent = getIntent();
|
|
||||||
if (intent != null) {
|
|
||||||
List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
|
|
||||||
if (resolveInfoList.size() > 0) {
|
|
||||||
// 传入的Intent action在Activity清单的intent-filter的action节点里有定义
|
|
||||||
if (intent.getAction() != null) {
|
|
||||||
if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
|
|
||||||
WinBollApplication.setIsDebug(true);
|
|
||||||
//ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
// 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
|
|
||||||
//ToastUtils.show("false : " + intent.getAction());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ResolveInfo resolveInfo = pm.resolveActivity(intent, 0);
|
|
||||||
if (resolveInfo != null) {
|
|
||||||
// action在清单文件中有声明
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
// action在清单文件中没有声明
|
|
||||||
ToastUtils.show("false");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void archiveInstance() {
|
|
||||||
Intent intent = getIntent();
|
|
||||||
StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
|
|
||||||
|
|
||||||
if (intent != null) {
|
|
||||||
ComponentName componentName = intent.getComponent();
|
|
||||||
if (componentName != null) {
|
|
||||||
String packageName = componentName.getPackageName();
|
|
||||||
//Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
|
|
||||||
sb.append("启动本应用的应用包名: \n" + packageName);
|
|
||||||
}
|
|
||||||
|
|
||||||
sb.append("\nImplicit Intent Tracker :\n接收到的 Intent 动作: \n" + intent.getAction());
|
|
||||||
Set<String> categories = intent.getCategories();
|
|
||||||
if (categories != null) {
|
|
||||||
for (String category : categories) {
|
|
||||||
sb.append("\n接收到的 Intent 类别 :\n" + category);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Uri data = intent.getData();
|
|
||||||
if (data != null) {
|
|
||||||
sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
sb.append("Intent is null.");
|
|
||||||
}
|
|
||||||
sb.append("\n\n");
|
|
||||||
LogUtils.d(TAG, sb.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
mToolBar = initToolBar();
|
|
||||||
setSupportActionBar(mToolBar);
|
|
||||||
if (isEnableDisplayHomeAsUp() && mToolBar != null) {
|
|
||||||
// 显示后退按钮
|
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 缓存当前 activity
|
|
||||||
LogUtils.d(TAG, "ActManager.getInstance().add(this);");
|
|
||||||
//ToastUtils.show("getTag() " + getTag());
|
|
||||||
WinBollActivityManager.getInstance(this).add(this);
|
|
||||||
//WinBollActivityManager.getInstance().printAvtivityListInfo();
|
|
||||||
//ToastUtils.show("WinBollUI_TYPE " + WinBollApplication.getWinBollUI_TYPE());
|
|
||||||
//boolean isDebuging = WinBollApplication.loadDebugStatusIsDebuging();
|
|
||||||
//ToastUtils.show(String.valueOf(isDebuging));
|
|
||||||
//WinBollApplication.setIsDebug(true);
|
|
||||||
|
|
||||||
setSubTitle(getTag());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void recreate() {
|
|
||||||
super.recreate();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDestroy() {
|
|
||||||
WinBollActivityManager.getInstance(this).registeRemove(this);
|
|
||||||
super.onDestroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setContentView(int layoutResID) {
|
|
||||||
super.setContentView(layoutResID);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <T extends View> T findViewById(int id) {
|
|
||||||
return super.findViewById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MenuInflater getMenuInflater() {
|
|
||||||
return super.getMenuInflater();
|
|
||||||
}
|
|
||||||
|
|
||||||
public WinBollActivity getActivity() {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Context getApplicationContext() {
|
|
||||||
return super.getApplicationContext();
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T extends FragmentManager> T getWinBollActivitySupportFragmentManager() {
|
|
||||||
return (T)super.getSupportFragmentManager();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ActionBar getSupportActionBar() {
|
|
||||||
return super.getSupportActionBar();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setSupportActionBar(Toolbar toolbar) {
|
|
||||||
super.setSupportActionBar(toolbar);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setActionBar(android.widget.Toolbar toolbar) {
|
|
||||||
super.setActionBar(toolbar);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSubTitle(CharSequence title) {
|
|
||||||
LogUtils.d(TAG, "setSubTitle");
|
|
||||||
if (super.getSupportActionBar() != null) {
|
|
||||||
super.getSupportActionBar().setSubtitle(title);
|
|
||||||
LogUtils.d(TAG, String.format("setSubtitle title : %s", title));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public CharSequence getSubTitle() {
|
|
||||||
if (super.getSupportActionBar() != null) {
|
|
||||||
return super.getSupportActionBar().getSubtitle();
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTitle(CharSequence title) {
|
|
||||||
//super.setTitle(title);
|
|
||||||
if (super.getSupportActionBar() != null) {
|
|
||||||
super.getSupportActionBar().setTitle(title);
|
|
||||||
LogUtils.d(TAG, String.format("setSubtitle title : %s", title));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTitle(int titleId) {
|
|
||||||
//super.setTitle(titleId);
|
|
||||||
if (super.getSupportActionBar() != null) {
|
|
||||||
super.getSupportActionBar().setTitle(titleId);
|
|
||||||
//LogUtils.d(TAG, String.format("setSubtitle title : %s", title));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTheme(Resources.Theme theme) {
|
|
||||||
super.setTheme(theme);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTheme(int resid) {
|
|
||||||
super.setTheme(resid);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTitleColor(int textColor) {
|
|
||||||
super.setTitleColor(textColor);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setContentView(View view, ViewGroup.LayoutParams params) {
|
|
||||||
super.setContentView(view, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setContentView(View view) {
|
|
||||||
super.setContentView(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public SharedPreferences getSharedPreferences(String name, int mode) {
|
|
||||||
return super.getSharedPreferences(name, mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean releaseInstance() {
|
|
||||||
return super.releaseInstance();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, int flags) {
|
|
||||||
return super.registerReceiver(receiver, filter, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, String broadcastPermission, Handler scheduler) {
|
|
||||||
return super.registerReceiver(receiver, filter, broadcastPermission, scheduler);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
|
|
||||||
return super.registerReceiver(receiver, filter, broadcastPermission, scheduler, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivities(Intent[] intents) {
|
|
||||||
super.startActivities(intents);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityFromFragment(Fragment fragment, Intent intent, int requestCode) {
|
|
||||||
super.startActivityFromFragment(fragment, intent, requestCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityFromFragment(android.app.Fragment fragment, Intent intent, int requestCode, Bundle options) {
|
|
||||||
super.startActivityFromFragment(fragment, intent, requestCode, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityFromChild(Activity child, Intent intent, int requestCode, Bundle options) {
|
|
||||||
super.startActivityFromChild(child, intent, requestCode, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivities(Intent[] intents, Bundle options) {
|
|
||||||
super.startActivities(intents, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean startActivityIfNeeded(Intent intent, int requestCode) {
|
|
||||||
return super.startActivityIfNeeded(intent, requestCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean startActivityIfNeeded(Intent intent, int requestCode, Bundle options) {
|
|
||||||
return super.startActivityIfNeeded(intent, requestCode, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityFromChild(Activity child, Intent intent, int requestCode) {
|
|
||||||
super.startActivityFromChild(child, intent, requestCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ComponentName startService(Intent service) {
|
|
||||||
return super.startService(service);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityForResult(Intent intent, int requestCode) {
|
|
||||||
super.startActivityForResult(intent, requestCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
|
|
||||||
super.startActivityForResult(intent, requestCode, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityFromFragment(android.app.Fragment fragment, Intent intent, int requestCode) {
|
|
||||||
super.startActivityFromFragment(fragment, intent, requestCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivityFromFragment(Fragment requestIndex, Intent fragment, int intent, Bundle requestCode) {
|
|
||||||
super.startActivityFromFragment(requestIndex, fragment, intent, requestCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivity(Intent intent, Bundle options) {
|
|
||||||
super.startActivity(intent, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
if (isAddWinBollToolBar()) {
|
|
||||||
getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
|
|
||||||
}
|
|
||||||
if (WinBollApplication.isDebug()) {
|
|
||||||
getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
|
|
||||||
}
|
|
||||||
return super.onCreateOptionsMenu(menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
LogUtils.d(TAG, "onOptionsItemSelected");
|
|
||||||
if (item.getItemId() == R.id.item_log) {
|
|
||||||
LogUtils.d(TAG, "item_log not yet.");
|
|
||||||
//WinBollActivityManager.getInstance().printAvtivityListInfo();
|
|
||||||
//WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
|
|
||||||
} else if (item.getItemId() == R.id.item_exit) {
|
|
||||||
WinBollActivityManager.getInstance(this).finishAll();
|
|
||||||
} else if (item.getItemId() == R.id.item_info) {
|
|
||||||
WinBollApplication application = (WinBollApplication) getApplication();
|
|
||||||
application.getMyActivityLifecycleCallbacks().showActivityeInfo();
|
|
||||||
} else if (item.getItemId() == R.id.item_exitdebug) {
|
|
||||||
AboutView.setApp2NormalMode(getApplicationContext());
|
|
||||||
} else if (item.getItemId() == R.id.item_about) {
|
|
||||||
startAboutActivity();
|
|
||||||
} else if (item.getItemId() == android.R.id.home) {
|
|
||||||
WinBollActivityManager.getInstance(this).finish(this);
|
|
||||||
}
|
|
||||||
// else if (item.getItemId() == android.R.id.home) {
|
|
||||||
// 回到主窗口速度缓慢,方法备用。现在用 WinBollActivityManager resumeActivity 和 finish 方法管理。
|
|
||||||
// _mMainWinBollActivity 是 WinBollActivity 的静态属性
|
|
||||||
// onCreate 函数下 _mMainWinBollActivity 为空时就用 _mMainWinBollActivity = this 赋值。
|
|
||||||
//startWinBollActivity(new Intent(_mMainWinBollActivity, _mMainWinBollActivity.getClass()), _mMainWinBollActivity.getTag(), _mMainWinBollActivity);
|
|
||||||
//}
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
//super.onBackPressed();
|
|
||||||
//ToastUtils.show("onBackPressed");
|
|
||||||
WinBollActivityManager.getInstance(this).finish(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*public void getInstanse() {
|
|
||||||
startWinBollActivity(new Intent(), getTag(), null);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
//
|
|
||||||
// activity: 为 null 时,
|
|
||||||
// intent.putExtra 函数 "tag" 参数为 tag
|
|
||||||
// activity: 不为 null 时,
|
|
||||||
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
|
||||||
//
|
|
||||||
// protected <T extends WinBollActivity> void startWinBollActivity(Intent intent, String tag, T activity) {
|
|
||||||
// LogUtils.d(TAG, "startWinBollActivityForResult tag " + tag);
|
|
||||||
// //ToastUtils.show("startWinBollActivityForResult tag " + tag);
|
|
||||||
// //打开多任务窗口 flags
|
|
||||||
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
|
|
||||||
// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
|
|
||||||
// if (activity != null) {
|
|
||||||
// intent.putExtra("tag", activity.getTag());
|
|
||||||
// } else {
|
|
||||||
// intent.putExtra("tag", tag);
|
|
||||||
// }
|
|
||||||
// //ToastUtils.show("super.startActivityForResult(intent, requestCode); tag " + tag);
|
|
||||||
// LogUtils.d(TAG, "startActivityForResult(intent, requestCode);" + tag);
|
|
||||||
// startActivity(intent);
|
|
||||||
// }
|
|
||||||
|
|
||||||
//
|
|
||||||
// activity: 为 null 时,
|
|
||||||
// intent.putExtra 函数 "tag" 参数为 tag
|
|
||||||
// activity: 不为 null 时,
|
|
||||||
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
|
||||||
//
|
|
||||||
protected <T extends AboutActivity> void startAboutActivity() {
|
|
||||||
Intent intent = new Intent(this, AboutActivity.class);
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
|
|
||||||
intent.putExtra("tag", AboutActivity.TAG);
|
|
||||||
startActivity(intent);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startActivity(Intent intent) {
|
|
||||||
//绑定唯一标识 tag,存在 则根据 taskId 移动到前台
|
|
||||||
String tag = intent.getStringExtra("tag");
|
|
||||||
//ToastUtils.show("startActivityForResult tag " + tag);
|
|
||||||
//WinBollActivityManager.getInstance(this).printAvtivityListInfo();
|
|
||||||
if (WinBollActivityManager.getInstance(this).isActive(tag)) {
|
|
||||||
//ToastUtils.show("resumeActivity");
|
|
||||||
LogUtils.d(TAG, "resumeActivity");
|
|
||||||
WinBollActivityManager.getInstance(this).resumeActivity(this, tag);
|
|
||||||
} else {
|
|
||||||
//ToastUtils.show("super.startActivity(intent);");
|
|
||||||
super.startActivity(intent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onActivityResult(int requestCode, int targetFragment, Intent data) {
|
|
||||||
LogUtils.d(TAG, "onActivityResult");
|
|
||||||
switch (requestCode) {
|
|
||||||
case REQUEST_LOG_ACTIVITY : {
|
|
||||||
LogUtils.d(TAG, "REQUEST_LOG_ACTIVITY");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default : {
|
|
||||||
super.onActivityResult(requestCode, targetFragment, data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAddWinBollInfoMenu() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract public String getTag();
|
|
||||||
abstract protected Toolbar initToolBar();
|
|
||||||
abstract protected boolean isEnableDisplayHomeAsUp();
|
|
||||||
abstract protected boolean isAddWinBollToolBar();
|
|
||||||
}
|
|
@ -12,7 +12,7 @@ import android.app.ActivityManager;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import androidx.core.app.TaskStackBuilder;
|
import androidx.core.app.TaskStackBuilder;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -20,17 +20,26 @@ import java.util.Map;
|
|||||||
public class WinBollActivityManager {
|
public class WinBollActivityManager {
|
||||||
|
|
||||||
public static final String TAG = "WinBollActivityManager";
|
public static final String TAG = "WinBollActivityManager";
|
||||||
|
public static final String EXTRA_TAG = "EXTRA_TAG";
|
||||||
|
|
||||||
|
public static enum WinBollUI_TYPE {
|
||||||
|
Aplication, // 退出应用后,保持最近任务栏任务记录主窗口
|
||||||
|
Service // 退出应用后,清理所有最近任务栏任务记录窗口
|
||||||
|
};
|
||||||
|
|
||||||
|
// 应用类型标志
|
||||||
|
volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
|
||||||
|
|
||||||
Context mContext;
|
Context mContext;
|
||||||
|
MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
|
||||||
static WinBollActivityManager _mWinBollActivityManager;
|
static WinBollActivityManager _mWinBollActivityManager;
|
||||||
static Map<String, WinBollActivity> _mapActivityList;
|
static Map<String, IWinBollActivity> _mapIWinBollList;
|
||||||
//static ArrayList<WinBollActivity> _mWinBollActivityList;
|
IWinBollActivity firstIWinBollActivity;
|
||||||
|
|
||||||
public WinBollActivityManager(Context context) {
|
public WinBollActivityManager(Context context) {
|
||||||
mContext = context;
|
mContext = context;
|
||||||
LogUtils.d(TAG, "WinBollActivityManager()");
|
LogUtils.d(TAG, "WinBollActivityManager()");
|
||||||
_mapActivityList = new HashMap<String, WinBollActivity>();
|
_mapIWinBollList = new HashMap<String, IWinBollActivity>();
|
||||||
//_mWinBollActivityList = new ArrayList<WinBollActivity>();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static synchronized WinBollActivityManager getInstance(Context context) {
|
public static synchronized WinBollActivityManager getInstance(Context context) {
|
||||||
@ -42,35 +51,46 @@ public class WinBollActivityManager {
|
|||||||
return _mWinBollActivityManager;
|
return _mWinBollActivityManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
//
|
||||||
* 把Activity添加到管理中
|
// 设置 WinBoll 应用 UI 类型
|
||||||
*/
|
//
|
||||||
public <T extends WinBollActivity> void add(T activity) {
|
public synchronized static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
|
||||||
/*for (int i = 0; i < _mWinBollActivityList.size(); i++) {
|
_mWinBollUI_TYPE = mWinBollUI_TYPE;
|
||||||
LogUtils.d(TAG, String.format("add for i %d\nget(i).getTag() %s", i, _mWinBollActivityList.get(i).getTag()));
|
}
|
||||||
if (_mWinBollActivityList.get(i).getTag().equals(activity.getTag())) {
|
|
||||||
_mWinBollActivityList.add(i, activity);
|
//
|
||||||
_mWinBollActivityList.remove(i);
|
// 获取 WinBoll 应用 UI 类型
|
||||||
LogUtils.d(TAG, String.format("Replace activity : %s\nSize %d", activity.getTag(), _mWinBollActivityList.size()));
|
//
|
||||||
return;
|
public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() {
|
||||||
}
|
return _mWinBollUI_TYPE;
|
||||||
}*/
|
}
|
||||||
if (isActive(activity.getTag())) {
|
|
||||||
LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag()));
|
//
|
||||||
|
// 把Activity添加到管理中
|
||||||
|
//
|
||||||
|
public <T extends IWinBollActivity> void add(T iWinBoll) {
|
||||||
|
if (isActive(iWinBoll.getTag())) {
|
||||||
|
LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
|
||||||
} else {
|
} else {
|
||||||
_mapActivityList.put(activity.getTag(), activity);
|
// 设置起始活动窗口,以便最后退出时提问
|
||||||
LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", activity.getTag(), _mapActivityList.size()));
|
if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
|
||||||
|
firstIWinBollActivity = iWinBoll;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 添加到活动窗口列表
|
||||||
|
_mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
|
||||||
|
LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// activity: 为 null 时,
|
// activity: 为 null 时,
|
||||||
// intent.putExtra 函数 "tag" 参数为 tag
|
// intent.putExtra 函数 EXTRA_TAG 参数为 tag
|
||||||
// activity: 不为 null 时,
|
// activity: 不为 null 时,
|
||||||
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
// intent.putExtra 函数 "tag" 参数为 activity.getTag()
|
||||||
//
|
//
|
||||||
public <T extends WinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
|
public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
|
||||||
try {
|
try {
|
||||||
// 如果窗口已存在就重启窗口
|
// 如果窗口已存在就重启窗口
|
||||||
String tag = clazz.newInstance().getTag();
|
String tag = clazz.newInstance().getTag();
|
||||||
@ -84,14 +104,15 @@ public class WinBollActivityManager {
|
|||||||
//打开多任务窗口 flags
|
//打开多任务窗口 flags
|
||||||
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("tag", tag);
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
intent.putExtra(EXTRA_TAG, tag);
|
||||||
mContext.startActivity(intent);
|
mContext.startActivity(intent);
|
||||||
} catch (InstantiationException | IllegalAccessException e) {
|
} catch (InstantiationException | IllegalAccessException e) {
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends WinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
|
public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
|
||||||
try {
|
try {
|
||||||
// 如果窗口已存在就重启窗口
|
// 如果窗口已存在就重启窗口
|
||||||
String tag = clazz.newInstance().getTag();
|
String tag = clazz.newInstance().getTag();
|
||||||
@ -105,25 +126,30 @@ public class WinBollActivityManager {
|
|||||||
//打开多任务窗口 flags
|
//打开多任务窗口 flags
|
||||||
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("tag", tag);
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
intent.putExtra(EXTRA_TAG, tag);
|
||||||
mContext.startActivity(intent);
|
mContext.startActivity(intent);
|
||||||
} catch (InstantiationException | IllegalAccessException e) {
|
} catch (InstantiationException | IllegalAccessException e) {
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
|
||||||
* 判断 tag绑定的 MyActivity是否存在
|
return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
|
||||||
*/
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// 判断 tag绑定的 MyActivity是否存在
|
||||||
|
//
|
||||||
public boolean isActive(String tag) {
|
public boolean isActive(String tag) {
|
||||||
printAvtivityListInfo();
|
//printAvtivityListInfo();
|
||||||
WinBollActivity activity = getWinBollActivity(tag);
|
IWinBollActivity iWinBoll = getIWinBoll(tag);
|
||||||
if (activity != null) {
|
if (iWinBoll != null) {
|
||||||
LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
|
LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
|
||||||
//ToastUtils.show("activity != null tag " + tag);
|
//ToastUtils.show("activity != null tag " + tag);
|
||||||
//判断是否为 BaseActivity,如果已经销毁,则移除
|
//判断是否为 BaseActivity,如果已经销毁,则移除
|
||||||
if (activity.isFinishing() || activity.isDestroyed()) {
|
if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
|
||||||
_mapActivityList.remove(activity.getTag());
|
_mapIWinBollList.remove(iWinBoll.getTag());
|
||||||
//_mWinBollActivityList.remove(activity);
|
//_mWinBollActivityList.remove(activity);
|
||||||
LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
|
LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
|
||||||
return false;
|
return false;
|
||||||
@ -137,75 +163,75 @@ public class WinBollActivityManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static WinBollActivity getWinBollActivity(String tag) {
|
static IWinBollActivity getIWinBoll(String tag) {
|
||||||
return _mapActivityList.get(tag);
|
return _mapIWinBollList.get(tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
//
|
||||||
* 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
// 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
||||||
*/
|
//
|
||||||
public <T extends WinBollActivity> void resumeActivity(Context context, String tag) {
|
public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
|
||||||
LogUtils.d(TAG, "resumeActivty");
|
LogUtils.d(TAG, "resumeActivty");
|
||||||
T activity = (T)getWinBollActivity(tag);
|
T iWinBoll = (T)getIWinBoll(tag);
|
||||||
LogUtils.d(TAG, "activity " + activity.getTag());
|
//LogUtils.d(TAG, "activity " + activity.getTag());
|
||||||
if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
|
if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
|
||||||
resumeActivity(context, activity);
|
resumeActivity(context, iWinBoll);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
//
|
||||||
* 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
// 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台
|
||||||
*/
|
//
|
||||||
public <T extends WinBollActivity> void resumeActivity(Context context, T activity) {
|
public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
|
||||||
ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
|
ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
|
||||||
//返回启动它的根任务(home 或者 MainActivity)
|
//返回启动它的根任务(home 或者 MainActivity)
|
||||||
Intent intent = new Intent(context, activity.getClass());
|
Intent intent = new Intent(context, iWinBoll.getClass());
|
||||||
TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
|
TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
|
||||||
stackBuilder.addNextIntentWithParentStack(intent);
|
stackBuilder.addNextIntentWithParentStack(intent);
|
||||||
stackBuilder.startActivities();
|
stackBuilder.startActivities();
|
||||||
//moveTaskToFront(YourTaskId, 0);
|
//moveTaskToFront(YourTaskId, 0);
|
||||||
LogUtils.d(TAG, "am.moveTaskToFront");
|
LogUtils.d(TAG, "am.moveTaskToFront");
|
||||||
//ToastUtils.show("resumeActivity am.moveTaskToFront");
|
//ToastUtils.show("resumeActivity am.moveTaskToFront");
|
||||||
am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
|
am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
//
|
||||||
* 结束所有 Activity
|
// 结束所有 Activity
|
||||||
*/
|
//
|
||||||
public void finishAll() {
|
public void finishAll() {
|
||||||
try {
|
try {
|
||||||
LogUtils.d(TAG, "finishAll no yet.");
|
for (String key : _mapIWinBollList.keySet()) {
|
||||||
//ToastUtils.show(String.format("finishAll() size : %d", _mWinBollActivityList.size()));
|
//System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
|
||||||
// for (int i = _mWinBollActivityList.size() - 1; i > -1; i--) {
|
IWinBollActivity iWinBoll = _mapIWinBollList.get(key);
|
||||||
// WinBollActivity activity = _mWinBollActivityList.get(i);
|
//ToastUtils.show("finishAll() activity");
|
||||||
// ToastUtils.show("finishAll() activity");
|
if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
|
||||||
// if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
|
//ToastUtils.show("activity != null ...");
|
||||||
// //ToastUtils.show("activity != null ...");
|
if (getWinBollUI_TYPE() == WinBollUI_TYPE.Service) {
|
||||||
// if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Service) {
|
// 结束窗口和最近任务栏, 建议前台服务类应用使用,可以方便用户再次调用 UI 操作。
|
||||||
// // 结束窗口和最近任务栏, 建议前台服务类应用使用,可以方便用户再次调用 UI 操作。
|
iWinBoll.getActivity().finishAndRemoveTask();
|
||||||
// activity.finishAndRemoveTask();
|
//ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
|
||||||
// //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
|
} else if (getWinBollUI_TYPE() == WinBollUI_TYPE.Aplication) {
|
||||||
// } else if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Aplication) {
|
// 结束窗口保留最近任务栏,建议前台服务类应用使用,可以保持应用的系统自觉性。
|
||||||
// // 结束窗口保留最近任务栏,建议前台服务类应用使用,可以保持应用的系统自觉性。
|
iWinBoll.getActivity().finish();
|
||||||
// activity.finish();
|
//ToastUtils.show("finishAll() activity.finish();");
|
||||||
// //ToastUtils.show("finishAll() activity.finish();");
|
} else {
|
||||||
// } else {
|
LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
|
||||||
// ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
|
//ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
//
|
||||||
* 结束指定Activity
|
// 结束指定Activity
|
||||||
*/
|
//
|
||||||
public <T extends WinBollActivity> void finish(T activity) {
|
public <T extends IWinBollActivity> void finish(T iWinBoll) {
|
||||||
try {
|
try {
|
||||||
if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
|
if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
|
||||||
//根据tag 移除 MyActivity
|
//根据tag 移除 MyActivity
|
||||||
//String tag= activity.getTag();
|
//String tag= activity.getTag();
|
||||||
//_mWinBollActivityList.remove(tag);
|
//_mWinBollActivityList.remove(tag);
|
||||||
@ -220,27 +246,11 @@ public class WinBollActivityManager {
|
|||||||
// ★:0 1 2 3 [4] >> 3
|
// ★:0 1 2 3 [4] >> 3
|
||||||
// ★:[0] >> 直接关闭当前窗口
|
// ★:[0] >> 直接关闭当前窗口
|
||||||
LogUtils.d(TAG, "finish no yet.");
|
LogUtils.d(TAG, "finish no yet.");
|
||||||
WinBollActivity preActivity = getPreActivity(activity);
|
IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
|
||||||
activity.finish();
|
iWinBoll.getActivity().finish();
|
||||||
if (preActivity != null) {
|
if (preIWinBoll != null) {
|
||||||
resumeActivity(mContext, preActivity);
|
resumeActivity(mContext, preIWinBoll);
|
||||||
}
|
}
|
||||||
|
|
||||||
// for (int i = 0; i < _mWinBollActivityList.size(); i++) {
|
|
||||||
// if (_mWinBollActivityList.get(i).getTag().equals(activity.getTag())) {
|
|
||||||
// //ToastUtils.show(String.format("equals i : %d\nTag : %s\nSize : %d", i, activity.getTag(), _mWinBollActivityList.size()));
|
|
||||||
// if (i == 0) {
|
|
||||||
// finishAll();
|
|
||||||
// //ToastUtils.show("finish finishAll");
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// if (i > 0) {
|
|
||||||
// activity.finish();
|
|
||||||
// resumeActivity(mContext, _mWinBollActivityList.get(i - 1));
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -248,21 +258,24 @@ public class WinBollActivityManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WinBollActivity getPreActivity(WinBollActivity activity) {
|
//
|
||||||
|
// 获取窗口队列中的前一个窗口
|
||||||
|
//
|
||||||
|
IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) {
|
||||||
try {
|
try {
|
||||||
boolean bingo = false;
|
boolean bingo = false;
|
||||||
WinBollActivity preActivity = null;
|
IWinBollActivity preIWinBoll = null;
|
||||||
for (Map.Entry<String, WinBollActivity> entity : _mapActivityList.entrySet()) {
|
for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
|
||||||
if (entity.getKey().equals(activity.getTag())) {
|
if (entity.getKey().equals(iWinBoll.getTag())) {
|
||||||
bingo = true;
|
bingo = true;
|
||||||
LogUtils.d(TAG, "bingo");
|
LogUtils.d(TAG, "bingo");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
preActivity = entity.getValue();
|
preIWinBoll = entity.getValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bingo) {
|
if (bingo) {
|
||||||
return preActivity;
|
return preIWinBoll;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||||
@ -271,36 +284,28 @@ public class WinBollActivityManager {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends WinBollActivity> boolean registeRemove(T activity) {
|
//
|
||||||
// for (int i = 0; i < _mWinBollActivityList.size(); i++) {
|
// 从管理列表中移除管理项
|
||||||
// if (registeRemove(activity, i)) {
|
//
|
||||||
// return true;
|
public <T extends IWinBollActivity> boolean registeRemove(T activity) {
|
||||||
// }
|
IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag());
|
||||||
// }
|
if (iWinBollTest != null) {
|
||||||
WinBollActivity activityTest = _mapActivityList.get(activity.getTag());
|
_mapIWinBollList.remove(activity.getTag());
|
||||||
if (activityTest != null) {
|
|
||||||
_mapActivityList.remove(activity.getTag());
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public <T extends WinBollActivity> boolean registeRemove(T activity, int position) {
|
//
|
||||||
// if (_mWinBollActivityList.get(position) == activity) {
|
// 打印管理列表项列表里的信息
|
||||||
// _mWinBollActivityList.remove(position);
|
//
|
||||||
// //ToastUtils.show(String.format("registeRemove remove.\nTag %s\nposition %d", activity.getTag(), position));
|
public static void printIWinBollListInfo() {
|
||||||
// return true;
|
|
||||||
// }
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
|
|
||||||
public static void printAvtivityListInfo() {
|
|
||||||
//LogUtils.d(TAG, "printAvtivityListInfo");
|
//LogUtils.d(TAG, "printAvtivityListInfo");
|
||||||
if (!_mapActivityList.isEmpty()) {
|
if (!_mapIWinBollList.isEmpty()) {
|
||||||
StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapActivityList.size()));
|
StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
|
||||||
Iterator<Map.Entry<String, WinBollActivity>> iterator = _mapActivityList.entrySet().iterator();
|
Iterator<Map.Entry<String, IWinBollActivity>> iterator = _mapIWinBollList.entrySet().iterator();
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
Map.Entry<String, WinBollActivity> entry = iterator.next();
|
Map.Entry<String, IWinBollActivity> entry = iterator.next();
|
||||||
sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
|
sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
|
||||||
//ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
|
//ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
|
||||||
}
|
}
|
||||||
@ -310,6 +315,4 @@ public class WinBollActivityManager {
|
|||||||
LogUtils.d(TAG, "The map is empty.");
|
LogUtils.d(TAG, "The map is empty.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,76 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.app;
|
|
||||||
|
|
||||||
import cc.winboll.studio.libapputils.bean.DebugBean;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
|
|
||||||
public class WinBollApplication extends cc.winboll.studio.libappbase.GlobalApplication {
|
|
||||||
|
|
||||||
public static final String TAG = "WinBollApplication";
|
|
||||||
|
|
||||||
public static enum WinBollUI_TYPE {
|
|
||||||
Aplication, // 退出应用后,保持最近任务栏任务记录主窗口
|
|
||||||
Service // 退出应用后,清理所有最近任务栏任务记录窗口
|
|
||||||
};
|
|
||||||
|
|
||||||
// 应用类型标志
|
|
||||||
volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
|
|
||||||
|
|
||||||
static volatile WinBollApplication _WinBollApplication = null;
|
|
||||||
MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
|
|
||||||
|
|
||||||
// 标记当前应用是否处于调试状态
|
|
||||||
static volatile boolean isDebug = false;
|
|
||||||
|
|
||||||
public static void setIsDebug(boolean isDebug) {
|
|
||||||
WinBollApplication.isDebug = isDebug;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isDebug() {
|
|
||||||
return isDebug;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 设置 WinBoll 应用 UI 类型
|
|
||||||
//
|
|
||||||
public static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
|
|
||||||
_mWinBollUI_TYPE = mWinBollUI_TYPE;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 获取 WinBoll 应用 UI 类型
|
|
||||||
//
|
|
||||||
public static WinBollUI_TYPE getWinBollUI_TYPE() {
|
|
||||||
return _mWinBollUI_TYPE;
|
|
||||||
}
|
|
||||||
|
|
||||||
MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
|
|
||||||
return mMyActivityLifecycleCallbacks;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate() {
|
|
||||||
super.onCreate();
|
|
||||||
_WinBollApplication = this;
|
|
||||||
// 应用环境初始化, 基本调试环境
|
|
||||||
//
|
|
||||||
CrashHandler.init(this);
|
|
||||||
LogUtils.init(this);
|
|
||||||
|
|
||||||
DebugBean debugBean = DebugBean.loadBean(this, DebugBean.class);
|
|
||||||
if (debugBean == null) {
|
|
||||||
//ToastUtils.show("debugBean == null");
|
|
||||||
setIsDebug(false);
|
|
||||||
} else {
|
|
||||||
//ToastUtils.show("saveDebugStatus(" + String.valueOf(debugBean.isDebuging()) + ")");
|
|
||||||
setIsDebug(debugBean.isDebuging());
|
|
||||||
}
|
|
||||||
|
|
||||||
// 应用运行状态环境设置
|
|
||||||
//
|
|
||||||
mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(this);
|
|
||||||
registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
|
|
||||||
// 设置默认 WinBoll 应用 UI 类型
|
|
||||||
setWinBollUI_TYPE(WinBollUI_TYPE.Service);
|
|
||||||
//ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE());
|
|
||||||
}
|
|
||||||
}
|
|
@ -0,0 +1,141 @@
|
|||||||
|
package cc.winboll.studio.libapputils.bean;
|
||||||
|
/**
|
||||||
|
* @Author ZhanGSKen@QQ.COM
|
||||||
|
* @Date 2025/01/20 14:19:02
|
||||||
|
* @Describe 应用信息类
|
||||||
|
*/
|
||||||
|
import cc.winboll.studio.libapputils.R;
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
public class APPInfo implements Serializable {
|
||||||
|
|
||||||
|
public static final String TAG = "APPInfo";
|
||||||
|
|
||||||
|
// 应用名称
|
||||||
|
String appName;
|
||||||
|
// 应用图标
|
||||||
|
int appIcon;
|
||||||
|
// 应用描述
|
||||||
|
String appDescription;
|
||||||
|
// 应用Git仓库地址
|
||||||
|
String appGitName;
|
||||||
|
// 应用Git仓库拥有者
|
||||||
|
String appGitOwner;
|
||||||
|
// 应用Git仓库分支
|
||||||
|
String appGitAPPBranch;
|
||||||
|
// 应用Git仓库子项目文件夹
|
||||||
|
String appGitAPPSubProjectFolder;
|
||||||
|
// 应用主页
|
||||||
|
String appHomePage;
|
||||||
|
// 应用包名称
|
||||||
|
String appAPKName;
|
||||||
|
// 应用包存储文件夹名称
|
||||||
|
String appAPKFolderName;
|
||||||
|
|
||||||
|
public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appGitOwner, String appGitAPPBranch, String appGitAPPSubProjectFolder, String appHomePage, String appAPKName, String appAPKFolderName) {
|
||||||
|
this.appName = appName;
|
||||||
|
this.appIcon = appIcon;
|
||||||
|
this.appDescription = appDescription;
|
||||||
|
this.appGitName = appGitName;
|
||||||
|
this.appGitOwner = appGitOwner;
|
||||||
|
this.appGitAPPBranch = appGitAPPBranch;
|
||||||
|
this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
|
||||||
|
this.appHomePage = appHomePage;
|
||||||
|
this.appAPKName = appAPKName;
|
||||||
|
this.appAPKFolderName = appAPKFolderName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public APPInfo() {
|
||||||
|
this.appName = "WinBoll-APP";
|
||||||
|
this.appIcon = R.drawable.ic_launcher;
|
||||||
|
this.appDescription = "WinBoll APP";
|
||||||
|
this.appGitName = "APP";
|
||||||
|
this.appGitOwner = "Studio";
|
||||||
|
this.appGitAPPBranch = "app";
|
||||||
|
this.appGitAPPSubProjectFolder = "app";
|
||||||
|
this.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP";
|
||||||
|
this.appAPKName = "APP";
|
||||||
|
this.appAPKFolderName = "APP";
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppGitOwner(String appGitOwner) {
|
||||||
|
this.appGitOwner = appGitOwner;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppGitOwner() {
|
||||||
|
return appGitOwner;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppGitAPPBranch(String appGitAPPBranch) {
|
||||||
|
this.appGitAPPBranch = appGitAPPBranch;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppGitAPPBranch() {
|
||||||
|
return appGitAPPBranch;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppGitAPPSubProjectFolder(String appGitAPPSubProjectFolder) {
|
||||||
|
this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppGitAPPSubProjectFolder() {
|
||||||
|
return appGitAPPSubProjectFolder;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppIcon(int appIcon) {
|
||||||
|
this.appIcon = appIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getAppIcon() {
|
||||||
|
return appIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppDescription(String appDescription) {
|
||||||
|
this.appDescription = appDescription;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppDescription() {
|
||||||
|
return appDescription;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppAPKFolderName(String appAPKFolderName) {
|
||||||
|
this.appAPKFolderName = appAPKFolderName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppAPKFolderName() {
|
||||||
|
return appAPKFolderName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppName(String appName) {
|
||||||
|
this.appName = appName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppName() {
|
||||||
|
return appName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppGitName(String appGitName) {
|
||||||
|
this.appGitName = appGitName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppGitName() {
|
||||||
|
return appGitName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppHomePage(String appHomePage) {
|
||||||
|
this.appHomePage = appHomePage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppHomePage() {
|
||||||
|
return appHomePage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAppAPKName(String appAPKName) {
|
||||||
|
this.appAPKName = appAPKName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAppAPKName() {
|
||||||
|
return appAPKName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -10,7 +10,7 @@ package cc.winboll.studio.libapputils.bean;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import cc.winboll.studio.libapputils.util.FileUtils;
|
import cc.winboll.studio.libapputils.util.FileUtils;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package cc.winboll.studio.libapputils.git;
|
package cc.winboll.studio.libapputils.git;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -1,66 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.log;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import cc.winboll.studio.libapputils.R;
|
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivity;
|
|
||||||
import cc.winboll.studio.libapputils.ads.ADsView;
|
|
||||||
import cc.winboll.studio.libapputils.app.WinBollApplication;
|
|
||||||
import android.view.View;
|
|
||||||
import android.app.Activity;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2024/08/12 15:07:58
|
|
||||||
* @Describe WinBoll 应用日志窗口
|
|
||||||
*/
|
|
||||||
public class LogActivity extends Activity {
|
|
||||||
|
|
||||||
public static final String TAG = "LogActivity";
|
|
||||||
|
|
||||||
LogView mLogView;
|
|
||||||
//ADsView mADsView;
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
// protected boolean isEnableDisplayHomeAsUp() {
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
LogUtils.d(TAG, "onCreate");
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.activity_log);
|
|
||||||
mLogView = findViewById(R.id.logview);
|
|
||||||
//mADsView = findViewById(R.id.adsview);
|
|
||||||
//mADsView.loadUrl("https://www.winboll.cc");
|
|
||||||
//mLogView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE);
|
|
||||||
//mADsView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE);
|
|
||||||
|
|
||||||
if(WinBollApplication.isDebug()) { mLogView.start(); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onResume() {
|
|
||||||
LogUtils.d(TAG, "onResume");
|
|
||||||
super.onResume();
|
|
||||||
mLogView.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
// protected boolean isAddWinBollToolBar() {
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// protected Toolbar initToolBar() {
|
|
||||||
// LogUtils.d(TAG, "initToolBar");
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public String getTag() {
|
|
||||||
// LogUtils.d(TAG, "getTag");
|
|
||||||
// return TAG;
|
|
||||||
// }
|
|
||||||
}
|
|
@ -1,370 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2024/08/12 13:44:06
|
|
||||||
* @Describe LogUtils
|
|
||||||
* @Describe 应用日志类
|
|
||||||
*/
|
|
||||||
import android.content.Context;
|
|
||||||
import cc.winboll.studio.libapputils.app.WinBollApplication;
|
|
||||||
import cc.winboll.studio.libapputils.util.FileUtils;
|
|
||||||
import dalvik.system.DexFile;
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.BufferedWriter;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.OutputStreamWriter;
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Enumeration;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
|
|
||||||
public class LogUtils {
|
|
||||||
|
|
||||||
public static final String TAG = "LogUtils";
|
|
||||||
|
|
||||||
public static enum LOG_LEVEL { Off, Error, Warn, Info, Debug, Verbose }
|
|
||||||
|
|
||||||
static volatile boolean _IsInited = false;
|
|
||||||
static Context _mContext;
|
|
||||||
// 日志显示时间格式
|
|
||||||
static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmSS]", Locale.getDefault());
|
|
||||||
// 应用日志文件夹
|
|
||||||
static File _mfLogCacheDir;
|
|
||||||
static File _mfLogDataDir;
|
|
||||||
// 应用日志文件
|
|
||||||
static File _mfLogCatchFile;
|
|
||||||
static File _mfLogUtilsBeanFile;
|
|
||||||
static LogUtilsBean _mLogUtilsBean;
|
|
||||||
public static Map<String, Boolean> mapTAGList = new HashMap<String, Boolean>();
|
|
||||||
|
|
||||||
//
|
|
||||||
// 初始化函数
|
|
||||||
//
|
|
||||||
public static void init(Context context) {
|
|
||||||
_mContext = context;
|
|
||||||
init(context, LOG_LEVEL.Off);
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 初始化函数
|
|
||||||
//
|
|
||||||
public static void init(Context context, LOG_LEVEL logLevel) {
|
|
||||||
if (WinBollApplication.isDebug()) {
|
|
||||||
// 初始化日志缓存文件路径
|
|
||||||
_mfLogCacheDir = new File(context.getApplicationContext().getExternalCacheDir(), TAG);
|
|
||||||
if (!_mfLogCacheDir.exists()) {
|
|
||||||
_mfLogCacheDir.mkdirs();
|
|
||||||
}
|
|
||||||
_mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
|
|
||||||
|
|
||||||
// 初始化日志配置文件路径
|
|
||||||
_mfLogDataDir = context.getApplicationContext().getExternalFilesDir(TAG);
|
|
||||||
if (!_mfLogDataDir.exists()) {
|
|
||||||
_mfLogDataDir.mkdirs();
|
|
||||||
}
|
|
||||||
_mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
|
|
||||||
} else {
|
|
||||||
// 初始化日志缓存文件路径
|
|
||||||
_mfLogCacheDir = new File(context.getApplicationContext().getCacheDir(), TAG);
|
|
||||||
if (!_mfLogCacheDir.exists()) {
|
|
||||||
_mfLogCacheDir.mkdirs();
|
|
||||||
}
|
|
||||||
_mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
|
|
||||||
|
|
||||||
// 初始化日志配置文件路径
|
|
||||||
_mfLogDataDir = new File(context.getApplicationContext().getFilesDir(), TAG);
|
|
||||||
if (!_mfLogDataDir.exists()) {
|
|
||||||
_mfLogDataDir.mkdirs();
|
|
||||||
}
|
|
||||||
_mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Toast.makeText(context,
|
|
||||||
// "_mfLogUtilsBeanFile : " + _mfLogUtilsBeanFile
|
|
||||||
// + "\n_mfLogCatchFile : " + _mfLogCatchFile,
|
|
||||||
// Toast.LENGTH_SHORT).show();
|
|
||||||
//
|
|
||||||
_mLogUtilsBean = LogUtilsBean.loadBeanFromFile(_mfLogUtilsBeanFile.getPath(), LogUtilsBean.class);
|
|
||||||
if (_mLogUtilsBean == null) {
|
|
||||||
_mLogUtilsBean = new LogUtilsBean();
|
|
||||||
_mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 加载当前应用下的所有类的 TAG
|
|
||||||
addClassTAGList();
|
|
||||||
loadTAGBeanSettings();
|
|
||||||
_IsInited = true;
|
|
||||||
LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Map<String, Boolean> getMapTAGList() {
|
|
||||||
return mapTAGList;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void loadTAGBeanSettings() {
|
|
||||||
ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
|
|
||||||
LogUtilsClassTAGBean.loadBeanList(_mContext, list, LogUtilsClassTAGBean.class);
|
|
||||||
for (int i = 0; i < list.size(); i++) {
|
|
||||||
LogUtilsClassTAGBean beanSetting = list.get(i);
|
|
||||||
for (Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
|
|
||||||
if (entry.getKey().equals(beanSetting.getTag())) {
|
|
||||||
entry.setValue(beanSetting.getEnable());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void saveTAGBeanSettings() {
|
|
||||||
ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
|
|
||||||
for (Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
|
|
||||||
list.add(new LogUtilsClassTAGBean(entry.getKey(), entry.getValue()));
|
|
||||||
}
|
|
||||||
LogUtilsClassTAGBean.saveBeanList(_mContext, list, LogUtilsClassTAGBean.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void addClassTAGList() {
|
|
||||||
//ClassLoader classLoader = getClass().getClassLoader();
|
|
||||||
try {
|
|
||||||
//String packageName = context.getPackageName();
|
|
||||||
String packageNamePrefix = "cc.winboll.studio";
|
|
||||||
List<String> classNames = new ArrayList<>();
|
|
||||||
String apkPath = _mContext.getPackageCodePath();
|
|
||||||
//Log.d("APK_PATH", "The APK path is: " + apkPath);
|
|
||||||
LogUtils.d(TAG, String.format("apkPath : %s", apkPath));
|
|
||||||
//String apkPath = "/data/app/" + packageName + "-";
|
|
||||||
|
|
||||||
//DexFile dexfile = new DexFile(apkPath + "1/base.apk");
|
|
||||||
DexFile dexfile = new DexFile(apkPath);
|
|
||||||
|
|
||||||
int countTemp = 0;
|
|
||||||
Enumeration<String> entries = dexfile.entries();
|
|
||||||
while (entries.hasMoreElements()) {
|
|
||||||
countTemp++;
|
|
||||||
String className = entries.nextElement();
|
|
||||||
if (className.startsWith(packageNamePrefix)) {
|
|
||||||
classNames.add(className);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LogUtils.d(TAG, String.format("countTemp : %d\nClassNames size : %d", countTemp, classNames.size()));
|
|
||||||
|
|
||||||
for (String className : classNames) {
|
|
||||||
try {
|
|
||||||
Class<?> clazz = Class.forName(className);
|
|
||||||
Field[] fields = clazz.getDeclaredFields();
|
|
||||||
for (Field field : fields) {
|
|
||||||
if (Modifier.isStatic(field.getModifiers()) && Modifier.isPublic(field.getModifiers()) && field.getType() == String.class && "TAG".equals(field.getName())) {
|
|
||||||
String tagValue = (String) field.get(null);
|
|
||||||
//Log.d("TAG_INFO", "Class: " + className + ", TAG value: " + tagValue);
|
|
||||||
//LogUtils.d(TAG, String.format("Tag Value : %s", tagValue));
|
|
||||||
//mapTAGList.put(tagValue, true);
|
|
||||||
mapTAGList.put(tagValue, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (ClassNotFoundException | IllegalAccessException e) {
|
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
|
||||||
//Toast.makeText(context, TAG + " : " + e.getMessage(), Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
|
||||||
//Toast.makeText(context, TAG + " : " + e.getMessage(), Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setTAGListEnable(String tag, boolean isEnable) {
|
|
||||||
Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
|
|
||||||
while (iterator.hasNext()) {
|
|
||||||
Map.Entry<String, Boolean> entry = iterator.next();
|
|
||||||
if (tag.equals(entry.getKey())) {
|
|
||||||
entry.setValue(isEnable);
|
|
||||||
//System.out.println("Key: " + entry.getKey() + ", Value: " + entry.getValue());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
saveTAGBeanSettings();
|
|
||||||
LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setALlTAGListEnable(boolean isEnable) {
|
|
||||||
Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
|
|
||||||
while (iterator.hasNext()) {
|
|
||||||
Map.Entry<String, Boolean> entry = iterator.next();
|
|
||||||
entry.setValue(isEnable);
|
|
||||||
//System.out.println("Key: " + entry.getKey() + ", Value: " + entry.getValue());
|
|
||||||
}
|
|
||||||
saveTAGBeanSettings();
|
|
||||||
LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setLogLevel(LOG_LEVEL logLevel) {
|
|
||||||
LogUtils._mLogUtilsBean.setLogLevel(logLevel);
|
|
||||||
_mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static LOG_LEVEL getLogLevel() {
|
|
||||||
return LogUtils._mLogUtilsBean.getLogLevel();
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean isLoggable(String tag, LOG_LEVEL logLevel) {
|
|
||||||
return _IsInited && mapTAGList.get(tag) && isInTheLevel(logLevel);
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean isInTheLevel(LOG_LEVEL logLevel) {
|
|
||||||
return (LogUtils._mLogUtilsBean.getLogLevel().ordinal() == logLevel.ordinal()
|
|
||||||
|| LogUtils._mLogUtilsBean.getLogLevel().ordinal() > logLevel.ordinal());
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 获取应用日志文件夹
|
|
||||||
//
|
|
||||||
public static File getLogCacheDir() {
|
|
||||||
return _mfLogCacheDir;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 调试日志写入函数
|
|
||||||
//
|
|
||||||
public static void e(String szTAG, String szMessage) {
|
|
||||||
if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Error)) {
|
|
||||||
saveLog(szTAG, LogUtils.LOG_LEVEL.Error, szMessage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 调试日志写入函数
|
|
||||||
//
|
|
||||||
public static void w(String szTAG, String szMessage) {
|
|
||||||
if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Warn)) {
|
|
||||||
saveLog(szTAG, LogUtils.LOG_LEVEL.Warn, szMessage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 调试日志写入函数
|
|
||||||
//
|
|
||||||
public static void i(String szTAG, String szMessage) {
|
|
||||||
if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Info)) {
|
|
||||||
saveLog(szTAG, LogUtils.LOG_LEVEL.Info, szMessage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 调试日志写入函数
|
|
||||||
//
|
|
||||||
public static void d(String szTAG, String szMessage) {
|
|
||||||
if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
|
|
||||||
saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, szMessage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 调试日志写入函数
|
|
||||||
// 包含线程调试堆栈信息
|
|
||||||
//
|
|
||||||
public static void d(String szTAG, String szMessage, StackTraceElement[] listStackTrace) {
|
|
||||||
if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
|
|
||||||
StringBuilder sbMessage = new StringBuilder(szMessage);
|
|
||||||
sbMessage.append(" \nAt ");
|
|
||||||
sbMessage.append(listStackTrace[2].getMethodName());
|
|
||||||
sbMessage.append(" (");
|
|
||||||
sbMessage.append(listStackTrace[2].getFileName());
|
|
||||||
sbMessage.append(":");
|
|
||||||
sbMessage.append(listStackTrace[2].getLineNumber());
|
|
||||||
sbMessage.append(")");
|
|
||||||
saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sbMessage.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 调试日志写入函数
|
|
||||||
// 包含异常信息和线程调试堆栈信息
|
|
||||||
//
|
|
||||||
public static void d(String szTAG, Exception e, StackTraceElement[] listStackTrace) {
|
|
||||||
if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
|
|
||||||
StringBuilder sbMessage = new StringBuilder(e.getClass().toGenericString());
|
|
||||||
sbMessage.append(" : ");
|
|
||||||
sbMessage.append(e.getMessage());
|
|
||||||
sbMessage.append(" \nAt ");
|
|
||||||
sbMessage.append(listStackTrace[2].getMethodName());
|
|
||||||
sbMessage.append(" (");
|
|
||||||
sbMessage.append(listStackTrace[2].getFileName());
|
|
||||||
sbMessage.append(":");
|
|
||||||
sbMessage.append(listStackTrace[2].getLineNumber());
|
|
||||||
sbMessage.append(")");
|
|
||||||
saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sbMessage.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 调试日志写入函数
|
|
||||||
//
|
|
||||||
public static void v(String szTAG, String szMessage) {
|
|
||||||
if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Verbose)) {
|
|
||||||
saveLog(szTAG, LogUtils.LOG_LEVEL.Verbose, szMessage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 日志文件保存函数
|
|
||||||
//
|
|
||||||
static void saveLog(String szTAG, LogUtils.LOG_LEVEL logLevel, String szMessage) {
|
|
||||||
try {
|
|
||||||
BufferedWriter out = null;
|
|
||||||
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(_mfLogCatchFile, true), "UTF-8"));
|
|
||||||
out.write("[" + logLevel + "] " + mSimpleDateFormat.format(System.currentTimeMillis()) + " [" + szTAG + "]\n" + szMessage + "\n");
|
|
||||||
out.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
LogUtils.d(TAG, "IOException : " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 历史日志加载函数
|
|
||||||
//
|
|
||||||
public static String loadLog() {
|
|
||||||
if (_mfLogCatchFile.exists()) {
|
|
||||||
StringBuffer sb = new StringBuffer();
|
|
||||||
try {
|
|
||||||
BufferedReader in = null;
|
|
||||||
in = new BufferedReader(new InputStreamReader(new FileInputStream(_mfLogCatchFile), "UTF-8"));
|
|
||||||
String line = "";
|
|
||||||
while ((line = in.readLine()) != null) {
|
|
||||||
sb.append(line);
|
|
||||||
sb.append("\n");
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
LogUtils.d(TAG, "IOException : " + e.getMessage());
|
|
||||||
}
|
|
||||||
return sb.toString();
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// 清理日志函数
|
|
||||||
//
|
|
||||||
public static void cleanLog() {
|
|
||||||
if (_mfLogCatchFile.exists()) {
|
|
||||||
try {
|
|
||||||
FileUtils.writeStringToFile(_mfLogCatchFile.getPath(), "");
|
|
||||||
//LogUtils.d(TAG, "cleanLog");
|
|
||||||
} catch (IOException e) {
|
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,71 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2024/08/23 15:39:07
|
|
||||||
* @Describe LogUtils 数据配置类。
|
|
||||||
*/
|
|
||||||
import android.util.JsonReader;
|
|
||||||
import android.util.JsonWriter;
|
|
||||||
import cc.winboll.studio.libapputils.bean.BaseBean;
|
|
||||||
import java.io.IOException;
|
|
||||||
public class LogUtilsBean extends BaseBean {
|
|
||||||
|
|
||||||
public static final String TAG = "LogUtilsBean";
|
|
||||||
|
|
||||||
LogUtils.LOG_LEVEL logLevel;
|
|
||||||
|
|
||||||
public LogUtilsBean() {
|
|
||||||
this.logLevel = LogUtils.LOG_LEVEL.Off;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LogUtilsBean(LogUtils.LOG_LEVEL logLevel) {
|
|
||||||
this.logLevel = logLevel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLogLevel(LogUtils.LOG_LEVEL logLevel) {
|
|
||||||
this.logLevel = logLevel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LogUtils.LOG_LEVEL getLogLevel() {
|
|
||||||
return logLevel;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return LogUtilsBean.class.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
|
|
||||||
super.writeThisToJsonWriter(jsonWriter);
|
|
||||||
LogUtilsBean bean = this;
|
|
||||||
jsonWriter.name("logLevel").value(bean.getLogLevel().ordinal());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
|
|
||||||
if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
|
|
||||||
if (name.equals("logLevel")) {
|
|
||||||
setLogLevel(LogUtils.LOG_LEVEL.values()[jsonReader.nextInt()]);
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
|
|
||||||
jsonReader.beginObject();
|
|
||||||
while (jsonReader.hasNext()) {
|
|
||||||
String name = jsonReader.nextName();
|
|
||||||
if (!initObjectsFromJsonReader(jsonReader, name)) {
|
|
||||||
jsonReader.skipValue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 结束 JSON 对象
|
|
||||||
jsonReader.endObject();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,88 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2025/01/04 14:17:02
|
|
||||||
* @Describe 日志类class TAG 标签数据类
|
|
||||||
*/
|
|
||||||
import android.util.JsonReader;
|
|
||||||
import android.util.JsonWriter;
|
|
||||||
import cc.winboll.studio.libapputils.bean.BaseBean;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public class LogUtilsClassTAGBean extends BaseBean {
|
|
||||||
|
|
||||||
public static final String TAG = "LogUtilsClassTAGBean";
|
|
||||||
|
|
||||||
// 标签名
|
|
||||||
String tag;
|
|
||||||
// 是否启用
|
|
||||||
Boolean enable;
|
|
||||||
|
|
||||||
public LogUtilsClassTAGBean() {
|
|
||||||
this.tag = TAG;
|
|
||||||
this.enable = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LogUtilsClassTAGBean(String tag, Boolean enable) {
|
|
||||||
this.tag = tag;
|
|
||||||
this.enable = enable;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTag(String tag) {
|
|
||||||
this.tag = tag;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTag() {
|
|
||||||
return tag;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEnable(Boolean enable) {
|
|
||||||
this.enable = enable;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Boolean getEnable() {
|
|
||||||
return enable;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return LogUtilsClassTAGBean.class.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
|
|
||||||
super.writeThisToJsonWriter(jsonWriter);
|
|
||||||
LogUtilsClassTAGBean bean = this;
|
|
||||||
jsonWriter.name("tag").value(bean.getTag());
|
|
||||||
jsonWriter.name("enable").value(bean.getEnable());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
|
|
||||||
if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
|
|
||||||
if (name.equals("tag")) {
|
|
||||||
setTag(jsonReader.nextString());
|
|
||||||
} else if (name.equals("enable")) {
|
|
||||||
setEnable(jsonReader.nextBoolean());
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
|
|
||||||
jsonReader.beginObject();
|
|
||||||
while (jsonReader.hasNext()) {
|
|
||||||
String name = jsonReader.nextName();
|
|
||||||
if (!initObjectsFromJsonReader(jsonReader, name)) {
|
|
||||||
jsonReader.skipValue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 结束 JSON 对象
|
|
||||||
jsonReader.endObject();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,386 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2024/08/12 14:36:18
|
|
||||||
* @Describe 日志视图类,继承 RelativeLayout 类。
|
|
||||||
*/
|
|
||||||
import android.content.ClipData;
|
|
||||||
import android.content.ClipboardManager;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.Message;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.CheckBox;
|
|
||||||
import android.widget.RelativeLayout;
|
|
||||||
import android.widget.ScrollView;
|
|
||||||
import android.widget.Spinner;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
import cc.winboll.studio.libapputils.R;
|
|
||||||
import java.text.Collator;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class LogView extends RelativeLayout {
|
|
||||||
|
|
||||||
public static final String TAG = "LogView";
|
|
||||||
|
|
||||||
public volatile boolean mIsHandling;
|
|
||||||
public volatile boolean mIsAddNewLog;
|
|
||||||
|
|
||||||
Context mContext;
|
|
||||||
ScrollView mScrollView;
|
|
||||||
TextView mTextView;
|
|
||||||
CheckBox mSelectableCheckBox;
|
|
||||||
CheckBox mSelectAllTAGCheckBox;
|
|
||||||
TAGListAdapter mTAGListAdapter;
|
|
||||||
LogViewThread mLogViewThread;
|
|
||||||
LogViewHandler mLogViewHandler;
|
|
||||||
Spinner mLogLevelSpinner;
|
|
||||||
ArrayAdapter<CharSequence> mLogLevelSpinnerAdapter;
|
|
||||||
// 标签列表
|
|
||||||
RecyclerView recyclerView;
|
|
||||||
|
|
||||||
public LogView(Context context) {
|
|
||||||
super(context);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public LogView(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public LogView(Context context, AttributeSet attrs, int defStyleAttr) {
|
|
||||||
super(context, attrs, defStyleAttr);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public LogView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
|
|
||||||
super(context, attrs, defStyleAttr, defStyleRes);
|
|
||||||
initView(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void start() {
|
|
||||||
mLogViewThread = new LogViewThread(LogView.this);
|
|
||||||
mLogViewThread.start();
|
|
||||||
// 显示日志
|
|
||||||
showAndScrollLogView();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void scrollLogUp() {
|
|
||||||
mScrollView.post(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
|
|
||||||
// 日志显示结束
|
|
||||||
mLogViewHandler.setIsHandling(false);
|
|
||||||
// 检查是否添加了新日志
|
|
||||||
if (mLogViewHandler.isAddNewLog()) {
|
|
||||||
// 有新日志添加,先更改新日志标志
|
|
||||||
mLogViewHandler.setIsAddNewLog(false);
|
|
||||||
// 再次发送显示日志的显示
|
|
||||||
Message message = mLogViewHandler.obtainMessage(LogViewHandler.MSG_LOGVIEW_UPDATE);
|
|
||||||
mLogViewHandler.sendMessage(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void initView(Context context) {
|
|
||||||
mContext = context;
|
|
||||||
mLogViewHandler = new LogViewHandler();
|
|
||||||
// 加载视图布局
|
|
||||||
addView(inflate(mContext, cc.winboll.studio.libapputils.R.layout.view_log, null));
|
|
||||||
// 初始化日志子控件视图
|
|
||||||
//
|
|
||||||
mScrollView = findViewById(cc.winboll.studio.libapputils.R.id.viewlogScrollViewLog);
|
|
||||||
mTextView = findViewById(cc.winboll.studio.libapputils.R.id.viewlogTextViewLog);
|
|
||||||
// 获取Log Level spinner实例
|
|
||||||
mLogLevelSpinner = findViewById(cc.winboll.studio.libapputils.R.id.viewlogSpinner1);
|
|
||||||
|
|
||||||
(findViewById(cc.winboll.studio.libapputils.R.id.viewlogButtonClean)).setOnClickListener(new View.OnClickListener(){
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
LogUtils.cleanLog();
|
|
||||||
LogUtils.d(TAG, "Log is cleaned.");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
(findViewById(cc.winboll.studio.libapputils.R.id.viewlogButtonCopy)).setOnClickListener(new View.OnClickListener(){
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
|
|
||||||
ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
|
|
||||||
cm.setPrimaryClip(ClipData.newPlainText(mContext.getPackageName(), LogUtils.loadLog()));
|
|
||||||
LogUtils.d(TAG, "Log is copied.");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
mSelectableCheckBox = findViewById(cc.winboll.studio.libapputils.R.id.viewlogCheckBoxSelectable);
|
|
||||||
mSelectableCheckBox.setOnClickListener(new View.OnClickListener(){
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
if (mSelectableCheckBox.isChecked()) {
|
|
||||||
setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
|
|
||||||
} else {
|
|
||||||
setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// 设置日志级别列表
|
|
||||||
ArrayList<String> adapterItems = new ArrayList<>();
|
|
||||||
for (LogUtils.LOG_LEVEL e : LogUtils.LOG_LEVEL.values()) {
|
|
||||||
adapterItems.add(e.name());
|
|
||||||
}
|
|
||||||
// 假设你有一个字符串数组作为选项列表
|
|
||||||
//String[] options = {"Option 1", "Option 2", "Option 3"};
|
|
||||||
// 创建一个ArrayAdapter来绑定数据到spinner
|
|
||||||
mLogLevelSpinnerAdapter = ArrayAdapter.createFromResource(
|
|
||||||
context, cc.winboll.studio.libapputils.R.array.enum_loglevel_array, android.R.layout.simple_spinner_item);
|
|
||||||
mLogLevelSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
|
|
||||||
// 设置适配器并将它应用到spinner上
|
|
||||||
mLogLevelSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); // 设置下拉视图样式
|
|
||||||
mLogLevelSpinner.setAdapter(mLogLevelSpinnerAdapter);
|
|
||||||
// 为Spinner添加监听器
|
|
||||||
mLogLevelSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
|
||||||
//String selectedOption = mLogLevelSpinnerAdapter.getItem(position);
|
|
||||||
// 处理选中的选项...
|
|
||||||
LogUtils.setLogLevel(LogUtils.LOG_LEVEL.values()[position]);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void onNothingSelected(AdapterView<?> parent) {
|
|
||||||
// 如果没有选择,则执行此操作...
|
|
||||||
}
|
|
||||||
});
|
|
||||||
// 获取默认值的索引
|
|
||||||
int defaultValueIndex = LogUtils.getLogLevel().ordinal();
|
|
||||||
|
|
||||||
if (defaultValueIndex != -1) {
|
|
||||||
// 如果找到了默认值,设置默认选项
|
|
||||||
mLogLevelSpinner.setSelection(defaultValueIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 加载标签列表
|
|
||||||
Map<String, Boolean> mapTAGList = LogUtils.getMapTAGList();
|
|
||||||
boolean isAllSelect = true;
|
|
||||||
for (Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
|
|
||||||
if (entry.getValue() == false) {
|
|
||||||
isAllSelect = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
CheckBox cbALLTAG = findViewById(cc.winboll.studio.libapputils.R.id.viewlogCheckBox1);
|
|
||||||
cbALLTAG.setChecked(isAllSelect);
|
|
||||||
|
|
||||||
// 加载标签表
|
|
||||||
recyclerView = findViewById(cc.winboll.studio.libapputils.R.id.viewlogRecyclerView1);
|
|
||||||
LinearLayoutManager layoutManager = new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false);
|
|
||||||
recyclerView.setLayoutManager(layoutManager);
|
|
||||||
mTAGListAdapter = new TAGListAdapter(mapTAGList);
|
|
||||||
recyclerView.setAdapter(mTAGListAdapter);
|
|
||||||
|
|
||||||
// 可以添加点击监听器来处理勾选框状态变化后的逻辑,比如获取当前勾选情况等
|
|
||||||
mTAGListAdapter.notifyDataSetChanged();
|
|
||||||
|
|
||||||
mSelectAllTAGCheckBox = findViewById(cc.winboll.studio.libapputils.R.id.viewlogCheckBox1);
|
|
||||||
mSelectAllTAGCheckBox.setOnClickListener(new View.OnClickListener(){
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
LogUtils.setALlTAGListEnable(mSelectAllTAGCheckBox.isChecked());
|
|
||||||
//LogUtils.setALlTAGListEnable(false);
|
|
||||||
//mTAGListAdapter.notifyDataSetChanged();
|
|
||||||
mTAGListAdapter.reload();
|
|
||||||
//ToastUtils.show(String.format("onClick\nmSelectAllTAGCheckBox.isChecked() : %s", mSelectAllTAGCheckBox.isChecked()));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// 设置滚动时不聚焦日志
|
|
||||||
setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void updateLogView() {
|
|
||||||
if (mLogViewHandler.isHandling() == true) {
|
|
||||||
// 正在处理日志显示,
|
|
||||||
// 就先设置一个新日志标志位
|
|
||||||
// 以便日志显示完后,再次显示新日志内容
|
|
||||||
mLogViewHandler.setIsAddNewLog(true);
|
|
||||||
} else {
|
|
||||||
//LogUtils.d(TAG, "LogListener showLog(String path)");
|
|
||||||
Message message = mLogViewHandler.obtainMessage(LogViewHandler.MSG_LOGVIEW_UPDATE);
|
|
||||||
mLogViewHandler.sendMessage(message);
|
|
||||||
mLogViewHandler.setIsAddNewLog(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void showAndScrollLogView() {
|
|
||||||
mTextView.setText(LogUtils.loadLog());
|
|
||||||
scrollLogUp();
|
|
||||||
}
|
|
||||||
|
|
||||||
class LogViewHandler extends Handler {
|
|
||||||
|
|
||||||
final static int MSG_LOGVIEW_UPDATE = 0;
|
|
||||||
volatile boolean isHandling;
|
|
||||||
volatile boolean isAddNewLog;
|
|
||||||
|
|
||||||
public LogViewHandler() {
|
|
||||||
setIsHandling(false);
|
|
||||||
setIsAddNewLog(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIsHandling(boolean isHandling) {
|
|
||||||
this.isHandling = isHandling;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isHandling() {
|
|
||||||
return isHandling;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIsAddNewLog(boolean isAddNewLog) {
|
|
||||||
this.isAddNewLog = isAddNewLog;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAddNewLog() {
|
|
||||||
return isAddNewLog;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void handleMessage(Message msg) {
|
|
||||||
switch (msg.what) {
|
|
||||||
case MSG_LOGVIEW_UPDATE:{
|
|
||||||
if (isHandling() == false) {
|
|
||||||
setIsHandling(true);
|
|
||||||
showAndScrollLogView();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
super.handleMessage(msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class TAGItemModel {
|
|
||||||
private String tag;
|
|
||||||
private boolean isChecked;
|
|
||||||
|
|
||||||
public TAGItemModel(String tag, boolean isChecked) {
|
|
||||||
this.tag = tag;
|
|
||||||
this.isChecked = isChecked;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTag() {
|
|
||||||
return tag;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTag(String tag) {
|
|
||||||
this.tag = tag;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isChecked() {
|
|
||||||
return isChecked;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChecked(boolean checked) {
|
|
||||||
isChecked = checked;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public class TAGListAdapter extends RecyclerView.Adapter<TAGListAdapter.ViewHolder> {
|
|
||||||
|
|
||||||
private Map<String, Boolean> mapOrigin;
|
|
||||||
private List<TAGItemModel> itemList;
|
|
||||||
|
|
||||||
public TAGListAdapter(Map<String, Boolean> map) {
|
|
||||||
mapOrigin = map;
|
|
||||||
loadMap(mapOrigin);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loadMap(Map<String, Boolean> map) {
|
|
||||||
itemList = new ArrayList<TAGItemModel>();
|
|
||||||
for (Map.Entry<String, Boolean> entry : map.entrySet()) {
|
|
||||||
itemList.add(new TAGItemModel(entry.getKey(), entry.getValue()));
|
|
||||||
}
|
|
||||||
// 添加排序功能,按照tag进行升序排序
|
|
||||||
Collections.sort(itemList, new SortMapEntryByKeyString(true));
|
|
||||||
//Collections.sort(itemList, new SortMapEntryByKeyString(false));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void reload() {
|
|
||||||
loadMap(mapOrigin);
|
|
||||||
super.notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_logtag, parent, false);
|
|
||||||
return new ViewHolder(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
|
|
||||||
final TAGItemModel item = itemList.get(position);
|
|
||||||
holder.tvText.setText(item.getTag());
|
|
||||||
holder.cbChecked.setChecked(item.isChecked());
|
|
||||||
holder.cbChecked.setOnClickListener(new View.OnClickListener(){
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
LogUtils.setTAGListEnable(item.getTag(), ((CheckBox)v).isChecked());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return itemList.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public class ViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
TextView tvText;
|
|
||||||
CheckBox cbChecked;
|
|
||||||
|
|
||||||
public ViewHolder(@NonNull View itemView) {
|
|
||||||
super(itemView);
|
|
||||||
tvText = itemView.findViewById(R.id.viewlogtagTextView1);
|
|
||||||
cbChecked = itemView.findViewById(R.id.viewlogtagCheckBox1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class SortMapEntryByKeyString implements Comparator<TAGItemModel> {
|
|
||||||
private boolean mIsDesc = true;
|
|
||||||
// isDesc 是否降序排列
|
|
||||||
public SortMapEntryByKeyString(boolean isDesc) {
|
|
||||||
mIsDesc = isDesc;
|
|
||||||
}
|
|
||||||
Collator cmp = Collator.getInstance(java.util.Locale.CHINA);
|
|
||||||
@Override
|
|
||||||
public int compare(TAGItemModel o1, TAGItemModel o2) {
|
|
||||||
if (mIsDesc) {
|
|
||||||
return o1.getTag().compareTo(o2.getTag());
|
|
||||||
} else {
|
|
||||||
return o2.getTag().compareTo(o1.getTag());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,79 +0,0 @@
|
|||||||
package cc.winboll.studio.libapputils.log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Author ZhanGSKen@QQ.COM
|
|
||||||
* @Date 2024/08/12 14:43:50
|
|
||||||
* @Describe 日志视图线程类
|
|
||||||
*/
|
|
||||||
import android.os.FileObserver;
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
|
|
||||||
public class LogViewThread extends Thread {
|
|
||||||
|
|
||||||
public static final String TAG = "LogViewThread";
|
|
||||||
|
|
||||||
// 线程退出标志
|
|
||||||
volatile boolean isExist = false;
|
|
||||||
// 应用日志文件监听实例
|
|
||||||
LogListener mLogListener;
|
|
||||||
// 日志视图弱引用
|
|
||||||
WeakReference<LogView> mwrLogView;
|
|
||||||
|
|
||||||
//
|
|
||||||
// 构造函数
|
|
||||||
// @logView : 日志显示输出视图类
|
|
||||||
public LogViewThread(LogView logView) {
|
|
||||||
mwrLogView = new WeakReference<LogView>(logView);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIsExist(boolean isExist) {
|
|
||||||
this.isExist = isExist;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isExist() {
|
|
||||||
return isExist;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
String szLogDir = LogUtils.getLogCacheDir().getPath();
|
|
||||||
mLogListener = new LogListener(szLogDir);
|
|
||||||
mLogListener.startWatching();
|
|
||||||
while (isExist() == false) {
|
|
||||||
try {
|
|
||||||
Thread.sleep(1000);
|
|
||||||
} catch (InterruptedException e) {}
|
|
||||||
}
|
|
||||||
mLogListener.stopWatching();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// 日志文件监听类
|
|
||||||
//
|
|
||||||
class LogListener extends FileObserver {
|
|
||||||
public LogListener(String path) {
|
|
||||||
super(path);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onEvent(int event, String path) {
|
|
||||||
int e = event & FileObserver.ALL_EVENTS;
|
|
||||||
switch (e) {
|
|
||||||
case FileObserver.CLOSE_WRITE:{
|
|
||||||
if (mwrLogView.get() != null) {
|
|
||||||
mwrLogView.get().updateLogView();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case FileObserver.DELETE:{
|
|
||||||
if (mwrLogView.get() != null) {
|
|
||||||
mwrLogView.get().updateLogView();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -5,15 +5,11 @@ import android.content.ComponentName;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.ServiceConnection;
|
import android.content.ServiceConnection;
|
||||||
|
import android.graphics.drawable.Drawable;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.os.IInterface;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import android.os.Parcel;
|
|
||||||
import android.os.RemoteException;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
import cc.winboll.studio.libapputils.util.ServiceUtils;
|
import cc.winboll.studio.libapputils.util.ServiceUtils;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
import java.io.FileDescriptor;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen@QQ.COM
|
* @Author ZhanGSKen@QQ.COM
|
||||||
|
@ -10,7 +10,7 @@ import android.content.Intent;
|
|||||||
import android.content.res.AssetManager;
|
import android.content.res.AssetManager;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import androidx.core.content.FileProvider;
|
import androidx.core.content.FileProvider;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
|
@ -6,18 +6,12 @@ package cc.winboll.studio.libapputils.util;
|
|||||||
* @Describe 二维码工具
|
* @Describe 二维码工具
|
||||||
*/
|
*/
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.widget.TextView;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import cc.winboll.studio.libapputils.R;
|
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
import com.google.zxing.BarcodeFormat;
|
import com.google.zxing.BarcodeFormat;
|
||||||
import com.google.zxing.Result;
|
|
||||||
import com.google.zxing.WriterException;
|
import com.google.zxing.WriterException;
|
||||||
import com.google.zxing.common.BitMatrix;
|
import com.google.zxing.common.BitMatrix;
|
||||||
import com.google.zxing.qrcode.QRCodeWriter;
|
import com.google.zxing.qrcode.QRCodeWriter;
|
||||||
import com.journeyapps.barcodescanner.BarcodeEncoder;
|
import com.journeyapps.barcodescanner.BarcodeEncoder;
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
public class QRCodeGenerator {
|
public class QRCodeGenerator {
|
||||||
|
|
||||||
|
@ -16,12 +16,13 @@ import android.view.LayoutInflater;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
|
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
import cc.winboll.studio.libapputils.app.AppVersionUtils;
|
import cc.winboll.studio.libapputils.app.AppVersionUtils;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
import cc.winboll.studio.libapputils.app.WinBollActivityManager;
|
||||||
import cc.winboll.studio.libapputils.app.WinBollApplication;
|
import cc.winboll.studio.libapputils.bean.APPInfo;
|
||||||
import cc.winboll.studio.libapputils.bean.DebugBean;
|
import cc.winboll.studio.libapputils.bean.DebugBean;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
import cc.winboll.studio.libapputils.util.PrefUtils;
|
import cc.winboll.studio.libapputils.util.PrefUtils;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -41,6 +42,8 @@ public class AboutView extends LinearLayout {
|
|||||||
public static final int MSG_APPUPDATE_CHECKED = 0;
|
public static final int MSG_APPUPDATE_CHECKED = 0;
|
||||||
|
|
||||||
Context mContext;
|
Context mContext;
|
||||||
|
APPInfo mAPPInfo;
|
||||||
|
|
||||||
WinBollServiceStatusView mWinBollServiceStatusView;
|
WinBollServiceStatusView mWinBollServiceStatusView;
|
||||||
OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
|
OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
|
||||||
String mszAppName = "";
|
String mszAppName = "";
|
||||||
@ -55,38 +58,70 @@ public class AboutView extends LinearLayout {
|
|||||||
String mszGitea = "";
|
String mszGitea = "";
|
||||||
int mnAppIcon = 0;
|
int mnAppIcon = 0;
|
||||||
String mszWinBollServerHost;
|
String mszWinBollServerHost;
|
||||||
String mszReleaseAPKName;
|
//String mszReleaseAPKName;
|
||||||
EditText metDevUserName;
|
EditText metDevUserName;
|
||||||
EditText metDevUserPassword;
|
EditText metDevUserPassword;
|
||||||
|
|
||||||
|
public AboutView(Context context, APPInfo appInfo) {
|
||||||
|
super(context);
|
||||||
|
mContext = context;
|
||||||
|
|
||||||
|
setAPPInfo(appInfo);
|
||||||
|
initView(context);
|
||||||
|
}
|
||||||
|
|
||||||
public AboutView(Context context, AttributeSet attrs) {
|
public AboutView(Context context, AttributeSet attrs) {
|
||||||
super(context, attrs);
|
super(context, attrs);
|
||||||
|
mContext = context;
|
||||||
|
|
||||||
initView(context, attrs);
|
initView(context, attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
void initView(Context context, AttributeSet attrs) {
|
public void setAPPInfo(APPInfo appInfo) {
|
||||||
mContext = context;
|
mAPPInfo = appInfo;
|
||||||
mszWinBollServerHost = WinBollApplication.isDebug() ? "http://10.8.0.13": "https://www.winboll.cc";
|
}
|
||||||
|
|
||||||
|
APPInfo createAppInfo(Context context, AttributeSet attrs) {
|
||||||
|
APPInfo appInfo = new APPInfo();
|
||||||
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.AboutView);
|
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.AboutView);
|
||||||
mszAppName = typedArray.getString(R.styleable.AboutView_app_name);
|
appInfo.setAppName(typedArray.getString(R.styleable.AboutView_app_name));
|
||||||
mszAppAPKFolderName = typedArray.getString(R.styleable.AboutView_app_apkfoldername);
|
appInfo.setAppAPKFolderName(typedArray.getString(R.styleable.AboutView_app_apkfoldername));
|
||||||
mszAppAPKName = typedArray.getString(R.styleable.AboutView_app_apkname);
|
appInfo.setAppAPKName(typedArray.getString(R.styleable.AboutView_app_apkname));
|
||||||
mszAppGitName = typedArray.getString(R.styleable.AboutView_app_gitname);
|
appInfo.setAppGitName(typedArray.getString(R.styleable.AboutView_app_gitname));
|
||||||
mszAppDescription = typedArray.getString(R.styleable.AboutView_appdescription);
|
appInfo.setAppGitOwner(typedArray.getString(R.styleable.AboutView_app_gitowner));
|
||||||
mnAppIcon = typedArray.getResourceId(R.styleable.AboutView_appicon, R.drawable.ic_winboll);
|
appInfo.setAppGitAPPBranch(typedArray.getString(R.styleable.AboutView_app_gitappbranch));
|
||||||
|
appInfo.setAppGitAPPSubProjectFolder(typedArray.getString(R.styleable.AboutView_app_gitappsubprojectfolder));
|
||||||
|
appInfo.setAppDescription(typedArray.getString(R.styleable.AboutView_appdescription));
|
||||||
|
appInfo.setAppIcon(typedArray.getResourceId(R.styleable.AboutView_appicon, R.drawable.ic_winboll));
|
||||||
// 返回一个绑定资源结束的信号给资源
|
// 返回一个绑定资源结束的信号给资源
|
||||||
typedArray.recycle();
|
typedArray.recycle();
|
||||||
|
return appInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
void initView(Context context) {
|
||||||
|
mszAppName = mAPPInfo.getAppName();
|
||||||
|
mszAppAPKFolderName = mAPPInfo.getAppAPKFolderName();
|
||||||
|
mszAppAPKName = mAPPInfo.getAppAPKName();
|
||||||
|
mszAppGitName = mAPPInfo.getAppGitName();
|
||||||
|
mszAppDescription = mAPPInfo.getAppDescription();
|
||||||
|
mnAppIcon = mAPPInfo.getAppIcon();
|
||||||
|
|
||||||
|
mszWinBollServerHost = GlobalApplication.isDebuging() ? "https://dev.winboll.cc": "https://www.winboll.cc";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
|
mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||||
}
|
}
|
||||||
mszCurrentAppPackageName = mszAppName + "_" + mszAppVersionName + ".apk";
|
mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
|
||||||
mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
|
mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
|
||||||
mszGitea = "https://gitea.winboll.cc/Studio/" + mszAppGitName + ".git";
|
if(mAPPInfo.getAppGitAPPBranch().equals("")) {
|
||||||
|
mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName;
|
||||||
|
} else {
|
||||||
|
mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
|
||||||
|
}
|
||||||
|
|
||||||
if (WinBollApplication.isDebug()) {
|
if (GlobalApplication.isDebuging()) {
|
||||||
LayoutInflater inflater = LayoutInflater.from(mContext);
|
LayoutInflater inflater = LayoutInflater.from(mContext);
|
||||||
View addedView = inflater.inflate(R.layout.view_about_dev, this, false);
|
View addedView = inflater.inflate(R.layout.view_about_dev, this, false);
|
||||||
LinearLayout llMain = addedView.findViewById(R.id.viewaboutdevLinearLayout1);
|
LinearLayout llMain = addedView.findViewById(R.id.viewaboutdevLinearLayout1);
|
||||||
@ -120,15 +155,21 @@ public class AboutView extends LinearLayout {
|
|||||||
//llMain.addView(createAboutPage());
|
//llMain.addView(createAboutPage());
|
||||||
|
|
||||||
// 就读取正式版应用包版本号,设置 Release 应用包文件名
|
// 就读取正式版应用包版本号,设置 Release 应用包文件名
|
||||||
String szReleaseAppVersionName = "";
|
// String szReleaseAppVersionName = "";
|
||||||
try {
|
// try {
|
||||||
szReleaseAppVersionName = mContext.getPackageManager().getPackageInfo(subBetaSuffix(mContext.getPackageName()), 0).versionName;
|
// //LogUtils.d(TAG, String.format("mContext.getPackageName() %s", mContext.getPackageName()));
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
// String szSubBetaSuffix = subBetaSuffix(mContext.getPackageName());
|
||||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
// //LogUtils.d(TAG, String.format("szSubBetaSuffix : %s", szSubBetaSuffix));
|
||||||
}
|
// szReleaseAppVersionName = mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
|
||||||
mszReleaseAPKName = mszAppAPKName + "_" + szReleaseAppVersionName + ".apk";
|
// } catch (PackageManager.NameNotFoundException e) {
|
||||||
|
// LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||||
|
// }
|
||||||
|
// mszReleaseAPKName = mszAppAPKName + "_" + szReleaseAppVersionName + ".apk";
|
||||||
|
}
|
||||||
|
|
||||||
|
void initView(Context context, AttributeSet attrs) {
|
||||||
|
mAPPInfo = createAppInfo(context, attrs);
|
||||||
|
initView(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String subBetaSuffix(String input) {
|
public static String subBetaSuffix(String input) {
|
||||||
@ -150,10 +191,13 @@ public class AboutView extends LinearLayout {
|
|||||||
return;
|
return;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
if (!AppVersionUtils.isHasNewStageReleaseVersion(mszReleaseAPKName, mszNewestAppPackageName)) {
|
// if (!AppVersionUtils.isHasNewStageReleaseVersion(mszReleaseAPKName, mszNewestAppPackageName)) {
|
||||||
|
// ToastUtils.delayedShow("Current app is the newest.", 5000);
|
||||||
|
// }
|
||||||
|
if (!AppVersionUtils.isHasNewVersion2(mszCurrentAppPackageName, mszNewestAppPackageName)) {
|
||||||
ToastUtils.delayedShow("Current app is the newest.", 5000);
|
ToastUtils.delayedShow("Current app is the newest.", 5000);
|
||||||
} else {
|
} else {
|
||||||
String szMsg = "Current app is :\n[ " + mszReleaseAPKName
|
String szMsg = "Current app is :\n[ " + mszCurrentAppPackageName
|
||||||
+ " ]\nThe last app is :\n[ " + mszNewestAppPackageName
|
+ " ]\nThe last app is :\n[ " + mszNewestAppPackageName
|
||||||
+ " ]\nIs download the last app?";
|
+ " ]\nIs download the last app?";
|
||||||
YesNoAlertDialog.show(mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
|
YesNoAlertDialog.show(mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
|
||||||
@ -168,7 +212,7 @@ public class AboutView extends LinearLayout {
|
|||||||
// 定义应用调试按钮
|
// 定义应用调试按钮
|
||||||
//
|
//
|
||||||
Element elementAppMode;
|
Element elementAppMode;
|
||||||
if (WinBollApplication.isDebug()) {
|
if (GlobalApplication.isDebuging()) {
|
||||||
elementAppMode = new Element(mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
|
elementAppMode = new Element(mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
|
||||||
elementAppMode.setOnClickListener(mAppNormalOnClickListener);
|
elementAppMode.setOnClickListener(mAppNormalOnClickListener);
|
||||||
} else {
|
} else {
|
||||||
@ -200,7 +244,7 @@ public class AboutView extends LinearLayout {
|
|||||||
//.addItem(versionElement)
|
//.addItem(versionElement)
|
||||||
//.addItem(adsElement)
|
//.addItem(adsElement)
|
||||||
//.addGroup("Connect with us")
|
//.addGroup("Connect with us")
|
||||||
.addEmail("ZhanGSKen@QQ.COM")
|
.addEmail("ZhanGSKen@AliYun.Com")
|
||||||
.addWebsite(mszHomePage)
|
.addWebsite(mszHomePage)
|
||||||
.addItem(elementAppMode)
|
.addItem(elementAppMode)
|
||||||
.addItem(elementGitWeb)
|
.addItem(elementGitWeb)
|
||||||
@ -234,7 +278,7 @@ public class AboutView extends LinearLayout {
|
|||||||
if (intent != null) {
|
if (intent != null) {
|
||||||
intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
|
intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
WinBollApplication.setIsDebug(true);
|
GlobalApplication.setIsDebuging(context, true);
|
||||||
DebugBean.saveBean(context, new DebugBean(true));
|
DebugBean.saveBean(context, new DebugBean(true));
|
||||||
|
|
||||||
WinBollActivityManager.getInstance(context).finishAll();
|
WinBollActivityManager.getInstance(context).finishAll();
|
||||||
@ -246,7 +290,7 @@ public class AboutView extends LinearLayout {
|
|||||||
Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
|
Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
|
||||||
if (intent != null) {
|
if (intent != null) {
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
WinBollApplication.setIsDebug(false);
|
GlobalApplication.setIsDebuging(context, false);
|
||||||
DebugBean.saveBean(context, new DebugBean(false));
|
DebugBean.saveBean(context, new DebugBean(false));
|
||||||
|
|
||||||
WinBollActivityManager.getInstance(context).finishAll();
|
WinBollActivityManager.getInstance(context).finishAll();
|
||||||
@ -272,7 +316,7 @@ public class AboutView extends LinearLayout {
|
|||||||
String szUrl = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
|
String szUrl = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
|
||||||
// 构建包含认证信息的请求
|
// 构建包含认证信息的请求
|
||||||
String credential = "";
|
String credential = "";
|
||||||
if (WinBollApplication.isDebug()) {
|
if (GlobalApplication.isDebuging()) {
|
||||||
credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
|
credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
|
||||||
PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
|
PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
|
||||||
PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
|
PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
|
||||||
|
@ -19,8 +19,8 @@ import android.widget.ImageView;
|
|||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import cc.winboll.studio.libapputils.R;
|
import cc.winboll.studio.libapputils.R;
|
||||||
import cc.winboll.studio.libapputils.log.LogUtils;
|
|
||||||
import cc.winboll.studio.libapputils.service.IWinBollClientServiceBinder;
|
import cc.winboll.studio.libapputils.service.IWinBollClientServiceBinder;
|
||||||
import cc.winboll.studio.libapputils.service.WinBollClientService;
|
import cc.winboll.studio.libapputils.service.WinBollClientService;
|
||||||
import cc.winboll.studio.libapputils.service.WinBollClientServiceBean;
|
import cc.winboll.studio.libapputils.service.WinBollClientServiceBean;
|
||||||
|
@ -1,25 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<androidx.appcompat.widget.Toolbar
|
<androidx.appcompat.widget.Toolbar
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/activityaboutToolbar1"/>
|
android:id="@+id/activityaboutToolbar1"/>
|
||||||
|
|
||||||
<cc.winboll.studio.libapputils.view.AboutView
|
<LinearLayout
|
||||||
app:app_name= "APP"
|
android:orientation="vertical"
|
||||||
app:app_apkfoldername="APP"
|
android:layout_width="match_parent"
|
||||||
app:app_apkname="APP"
|
android:layout_height="0dp"
|
||||||
app:app_gitname="APP"
|
android:layout_weight="1.0"
|
||||||
app:appdescription="WinBoll.CC 网站客户端。"
|
android:id="@+id/activityaboutLinearLayout1"/>
|
||||||
app:appicon="@drawable/ic_winboll"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:id="@+id/activityaboutAboutView1"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<cc.winboll.studio.libapputils.log.LogView
|
<cc.winboll.studio.libappbase.LogView
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
app:cardElevation="4dp"
|
app:cardElevation="4dp"
|
||||||
app:cardCornerRadius="4dp"
|
app:cardCornerRadius="4dp"
|
||||||
android:id="@+id/listviewauthinfoCardView1"
|
android:id="@+id/listviewauthinfoCardView1"
|
||||||
android:layout_marginLeft="10dp"
|
android:layout_marginLeft="0dp"
|
||||||
android:layout_marginRight="10dp">
|
android:layout_marginRight="5dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
@ -19,6 +19,7 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
android:id="@+id/viewlogtagTextView1"/>
|
android:id="@+id/viewlogtagTextView1"/>
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
|
@ -15,6 +15,9 @@
|
|||||||
|
|
||||||
<item android:title="DebugTools">
|
<item android:title="DebugTools">
|
||||||
<menu>
|
<menu>
|
||||||
|
<item
|
||||||
|
android:id="@+id/item_testcrashreport"
|
||||||
|
android:title="Test Application Crash Report"/>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/item_unittest"
|
android:id="@+id/item_unittest"
|
||||||
android:title="UnitTest"/>
|
android:title="UnitTest"/>
|
||||||
|
@ -5,6 +5,9 @@
|
|||||||
<attr name="app_apkfoldername" format="string" />
|
<attr name="app_apkfoldername" format="string" />
|
||||||
<attr name="app_apkname" format="string" />
|
<attr name="app_apkname" format="string" />
|
||||||
<attr name="app_gitname" format="string" />
|
<attr name="app_gitname" format="string" />
|
||||||
|
<attr name="app_gitowner" format="string" />
|
||||||
|
<attr name="app_gitappbranch" format="string" />
|
||||||
|
<attr name="app_gitappsubprojectfolder" format="string" />
|
||||||
<attr name="appdescription" format="string" />
|
<attr name="appdescription" format="string" />
|
||||||
<attr name="appicon" format="reference" />
|
<attr name="appicon" format="reference" />
|
||||||
</declare-styleable>
|
</declare-styleable>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<string name="lib_name">library</string>
|
<string name="lib_name">libapputils</string>
|
||||||
<string name="app_normal">Click here is switch to Normal APP</string>
|
<string name="app_normal">Click here is switch to Normal APP</string>
|
||||||
<string name="app_debug">Click here is switch to APP DEBUG</string>
|
<string name="app_debug">Click here is switch to APP DEBUG</string>
|
||||||
<string name="gitea_home">GITEA HOME</string>
|
<string name="gitea_home">GITEA HOME</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user