Compare commits
11 Commits
appbase-v1
...
contacts-v
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04df902b6b | ||
|
|
33c71ea868 | ||
|
|
ba861d910e | ||
|
|
f5d9aafe43 | ||
|
|
9e9402f84e | ||
|
|
ec18330022 | ||
|
|
23920a7ff1 | ||
|
|
17c373c490 | ||
|
|
753032efed | ||
|
|
2b4c43c9af | ||
|
|
711c98d556 |
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Thu Jun 19 20:42:40 HKT 2025
|
#Sat Jun 28 12:59:51 HKT 2025
|
||||||
stageCount=2
|
stageCount=3
|
||||||
libraryProject=libaes
|
libraryProject=libaes
|
||||||
baseVersion=15.9
|
baseVersion=15.9
|
||||||
publishVersion=15.9.1
|
publishVersion=15.9.2
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.9.2
|
baseBetaVersion=15.9.3
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity
|
|||||||
appInfo.setAppGitOwner("Studio");
|
appInfo.setAppGitOwner("Studio");
|
||||||
appInfo.setAppGitAPPBranch(szBranchName);
|
appInfo.setAppGitAPPBranch(szBranchName);
|
||||||
appInfo.setAppGitAPPSubProjectFolder(szBranchName);
|
appInfo.setAppGitAPPSubProjectFolder(szBranchName);
|
||||||
appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=2&fromuid=1");
|
appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=3&extra=page%3D1");
|
||||||
appInfo.setAppAPKName("AES");
|
appInfo.setAppAPKName("AES");
|
||||||
appInfo.setAppAPKFolderName("AES");
|
appInfo.setAppAPKFolderName("AES");
|
||||||
//appInfo.setIsAddDebugTools(false);
|
//appInfo.setIsAddDebugTools(false);
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Thu Jul 17 11:24:17 HKT 2025
|
#Thu Jul 17 11:39:14 HKT 2025
|
||||||
stageCount=1
|
stageCount=2
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.9
|
baseVersion=15.9
|
||||||
publishVersion=15.9.0
|
publishVersion=15.9.1
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.9.1
|
baseBetaVersion=15.9.2
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Thu Jul 17 09:57:24 HKT 2025
|
#Tue Aug 26 01:37:58 HKT 2025
|
||||||
stageCount=12
|
stageCount=15
|
||||||
libraryProject=
|
libraryProject=
|
||||||
baseVersion=15.3
|
baseVersion=15.3
|
||||||
publishVersion=15.3.11
|
publishVersion=15.3.14
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.3.12
|
baseBetaVersion=15.3.15
|
||||||
|
|||||||
@@ -40,6 +40,10 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
|
|||||||
this.mContactUtils = ContactUtils.getInstance(mContext);
|
this.mContactUtils = ContactUtils.getInstance(mContext);
|
||||||
this.callLogList = callLogList;
|
this.callLogList = callLogList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void relaodContacts() {
|
||||||
|
this.mContactUtils.relaodContacts();
|
||||||
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import cc.winboll.studio.contacts.dun.Rules;
|
|||||||
import cc.winboll.studio.libappbase.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.FileFilter;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
@@ -154,6 +155,62 @@ public class TomCat {
|
|||||||
File getWorkingFolder() {
|
File getWorkingFolder() {
|
||||||
return mContext.getExternalFilesDir(TAG);
|
return mContext.getExternalFilesDir(TAG);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public File getBoBullToonDataFolder() {
|
||||||
|
File fCheckRoot = getWorkingFolder();
|
||||||
|
if (fCheckRoot == null || !fCheckRoot.exists()) {
|
||||||
|
return fCheckRoot;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 递归查找符合条件的文件夹
|
||||||
|
File targetFolder = findTargetFolder(fCheckRoot);
|
||||||
|
return targetFolder != null ? targetFolder : fCheckRoot;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 递归查找同时包含LICENSE和README.md文件的文件夹
|
||||||
|
*/
|
||||||
|
private File findTargetFolder(File currentFolder) {
|
||||||
|
// 检查当前文件夹是否符合条件
|
||||||
|
if (hasRequiredFiles(currentFolder)) {
|
||||||
|
return currentFolder;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查找子文件夹(Java 7不支持方法引用,用匿名内部类过滤)
|
||||||
|
File[] subFolders = currentFolder.listFiles(new FileFilter() {
|
||||||
|
@Override
|
||||||
|
public boolean accept(File file) {
|
||||||
|
return file.isDirectory(); // 仅保留子文件夹
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (subFolders != null) {
|
||||||
|
for (File subFolder : subFolders) {
|
||||||
|
File result = findTargetFolder(subFolder);
|
||||||
|
if (result != null) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查文件夹中是否同时存在LICENSE和README.md文件
|
||||||
|
*/
|
||||||
|
private boolean hasRequiredFiles(File folder) {
|
||||||
|
if (folder == null || !folder.isDirectory()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查两个文件是否同时存在且均为文件(非文件夹)
|
||||||
|
File licenseFile = new File(folder, "LICENSE");
|
||||||
|
File readmeFile = new File(folder, "README.md");
|
||||||
|
|
||||||
|
return licenseFile.exists() && licenseFile.isFile()
|
||||||
|
&& readmeFile.exists() && readmeFile.isFile();
|
||||||
|
}
|
||||||
|
|
||||||
public void cleanBoBullToon() {
|
public void cleanBoBullToon() {
|
||||||
String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
|
String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
|
||||||
@@ -170,9 +227,9 @@ public class TomCat {
|
|||||||
|
|
||||||
public boolean loadPhoneBoBullToon() {
|
public boolean loadPhoneBoBullToon() {
|
||||||
listPhoneBoBullToon.clear();
|
listPhoneBoBullToon.clear();
|
||||||
File fBoBullToon = new File(getWorkingFolder(), "bobulltoon");
|
File fBoBullToon = getBoBullToonDataFolder();
|
||||||
if (fBoBullToon.exists()) {
|
if (fBoBullToon.exists()) {
|
||||||
LogUtils.d(TAG, String.format("getWorkingFolder() %s", getWorkingFolder()));
|
LogUtils.d(TAG, String.format("getBoBullToonDataFolder() %s", getWorkingFolder()));
|
||||||
for (File userFolder : fBoBullToon.listFiles()) {
|
for (File userFolder : fBoBullToon.listFiles()) {
|
||||||
if (userFolder.isDirectory()) {
|
if (userFolder.isDirectory()) {
|
||||||
for (File recordFile : userFolder.listFiles()) {
|
for (File recordFile : userFolder.listFiles()) {
|
||||||
|
|||||||
@@ -161,4 +161,12 @@ public class CallLogFragment extends Fragment {
|
|||||||
_CallLogFragment.triggerUpdate();
|
_CallLogFragment.triggerUpdate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
//ToastUtils.show("onResume");
|
||||||
|
callLogAdapter.relaodContacts();
|
||||||
|
readCallLog(); // 窗口回显时更新通话记录
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -163,5 +163,12 @@ public class ContactsFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
contactAdapter.notifyDataSetChanged();
|
contactAdapter.notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
//ToastUtils.show("onResume");
|
||||||
|
readContacts(); // 窗口回显时更新联系人列表
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<string name="app_name">Contacts</string>
|
<string name="app_name">Contacts</string>
|
||||||
<string name="default_bobulltoon_url">https://gitea.winboll.cc/Studio/BoBullToon/archive/main.zip</string>
|
<string name="default_bobulltoon_url">https://gitee.com/zhangsken/bobulltoon/repository/archive/main.zip</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
api 'cc.winboll.studio:libapputils:15.8.2'
|
api 'cc.winboll.studio:libapputils:15.8.4'
|
||||||
api 'cc.winboll.studio:libappbase:15.8.2'
|
api 'cc.winboll.studio:libappbase:15.8.4'
|
||||||
|
|
||||||
// 吐司类库
|
// 吐司类库
|
||||||
api 'com.github.getActivity:ToastUtils:10.5'
|
api 'com.github.getActivity:ToastUtils:10.5'
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Thu Jun 19 20:42:26 HKT 2025
|
#Sat Jun 28 12:59:30 HKT 2025
|
||||||
stageCount=2
|
stageCount=3
|
||||||
libraryProject=libaes
|
libraryProject=libaes
|
||||||
baseVersion=15.9
|
baseVersion=15.9
|
||||||
publishVersion=15.9.1
|
publishVersion=15.9.2
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.9.2
|
baseBetaVersion=15.9.3
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ public class AboutView extends LinearLayout {
|
|||||||
mszAppDescription = mAPPInfo.getAppDescription();
|
mszAppDescription = mAPPInfo.getAppDescription();
|
||||||
mnAppIcon = mAPPInfo.getAppIcon();
|
mnAppIcon = mAPPInfo.getAppIcon();
|
||||||
|
|
||||||
mszWinBoLLServerHost = GlobalApplication.isDebuging() ? "https://dev.winboll.cc": "https://www.winboll.cc";
|
mszWinBoLLServerHost = GlobalApplication.isDebuging() ? "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
|
mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Thu Jul 17 11:24:17 HKT 2025
|
#Thu Jul 17 11:39:14 HKT 2025
|
||||||
stageCount=1
|
stageCount=2
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.9
|
baseVersion=15.9
|
||||||
publishVersion=15.9.0
|
publishVersion=15.9.1
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.9.1
|
baseBetaVersion=15.9.2
|
||||||
|
|||||||
Reference in New Issue
Block a user