Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ android {
versionCode 10000
versionName "1.0.0"
flavorDimensions "versionCode"
def noPlatformModeValue = (System.getenv("AO_NO_PLATFORM_MODE") ?: "true").toBoolean()
buildConfigField "boolean", "NO_PLATFORM_MODE", noPlatformModeValue.toString()

// ndk {
// abiFilters 'armeabi-v7a'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,7 @@ private void activeDevice(String boxUuid, String boxBind, long currentTimestamp,
mHandler.post(() -> {
//切换盒子
EventBusUtil.post(new BoxOnlineRequestEvent(true));
Logger.d("zfy", "change box");
Logger.d("change box");
AlreadyUploadedManager.getInstance().init(getApplicationContext());
TransferTaskManager.getInstance().resetManagerData();
LanManager.getInstance().setLanEnable(false);
Expand Down
11 changes: 5 additions & 6 deletions app/src/main/java/xyz/eulix/space/EulixSpaceApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import android.os.Handler;
import android.os.Looper;
import android.provider.MediaStore;
import android.util.Log;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -116,8 +115,8 @@ private String generatePkgName() {
private void init() {
//updateLocale();
//开启debug日志
Log.d("eulix", "buildConfig switch:" + BuildConfig.LOG_SWITCH);
Log.d("eulix", "logSwitch:" + PreferenceUtil.getLoggerSwitch(getContext()));
Logger.d(TAG, "[APP] buildConfig log switch: " + BuildConfig.LOG_SWITCH);
Logger.d(TAG, "[APP] local log switch: " + PreferenceUtil.getLoggerSwitch(getContext()));
Logger.setDebuggable(BuildConfig.LOG_SWITCH || PreferenceUtil.getLoggerSwitch(getContext()));
// 初始化客户端参数
BaseParamsUtil.initBaseParams(this);
Expand Down Expand Up @@ -375,7 +374,7 @@ private void registerContentObserver() {

photoAlbumContentObserver.setOnChangeListener(uri -> {
if (!SystemUtil.checkPermission(getContext(), ConstantField.Permission.WRITE_EXTERNAL_STORAGE)) {
Logger.d("zfy", "permission not allowed");
Logger.d(TAG, "[APP] permission not allowed");
return;
}
String mediaId = uri.toString().substring(uri.toString().lastIndexOf("/") + 1);
Expand All @@ -389,7 +388,7 @@ private void registerContentObserver() {
}
}
if (mediaFile == null || !mediaFile.exists()) {
Logger.d("zfy", "delete a media");
Logger.d(TAG, "[APP] delete a media");
try {
//检查是否为数字id
int mediaIdInt = Integer.parseInt(mediaId);
Expand Down Expand Up @@ -497,7 +496,7 @@ public void onConnect(boolean isConnected) {
public void uncaughtException(@NonNull @NotNull Thread t, @NonNull @NotNull Throwable e) {
Logger.e(TAG, "uncaught exception: " + e.getMessage());
if (e instanceof ANRException) {
Logger.d("zfy", "uncaughtException");
Logger.d(TAG, "[APP] uncaughtException");
e.printStackTrace();
}
//系统默认异常处理器
Expand Down
36 changes: 27 additions & 9 deletions app/src/main/java/xyz/eulix/space/EulixSpaceService.java
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
import xyz.eulix.space.util.AlarmUtil;
import xyz.eulix.space.util.ConstantField;
import xyz.eulix.space.util.DataUtil;
import xyz.eulix.space.util.DeploymentModeUtil;
import xyz.eulix.space.util.DebugUtil;
import xyz.eulix.space.util.EventBusUtil;
import xyz.eulix.space.util.FormatUtil;
Expand Down Expand Up @@ -2191,6 +2192,10 @@ public void onError(String errMsg) {
}

private void getPlatformAbility(String platformServerUrl, boolean isFore) {
if (DeploymentModeUtil.isNoPlatformMode()) {
Logger.d(TAG, "[PLATFORM] skip platform ability request in no-platform mode");
return;
}
if (platformServerUrl != null && !DataUtil.isPlatformAbilityRequest(platformServerUrl, false)) {
DataUtil.setPlatformAbilityRequest(platformServerUrl, true);
EulixPlatformUtil.getPlatformAbility(platformServerUrl, isFore, new PlatformAbilityCallback() {
Expand All @@ -2199,23 +2204,24 @@ public void onSuccess(List<PlatformApi> platformApis) {
DataUtil.setCurrentPlatformServerHost(StringUtil.urlToHost(platformServerUrl));
DataUtil.setPlatformAbility(getApplicationContext(), platformServerUrl, platformApis, false);
DataUtil.setPlatformAbilityRequest(platformServerUrl, false);
Logger.d(TAG, "request platform ability success: " + platformServerUrl);
Logger.d(TAG, "[PLATFORM] request success: " + Logger.safeUrl(platformServerUrl));
}

@Override
public void onFailed() {
DataUtil.setPlatformAbilityRequest(platformServerUrl, false);
Logger.d(TAG, "request platform ability failed: " + platformServerUrl);
Logger.w(TAG, "[PLATFORM] request failed: " + Logger.safeUrl(platformServerUrl));
}

@Override
public void onError(String errMsg) {
DataUtil.setPlatformAbilityRequest(platformServerUrl, false);
Logger.d(TAG, "request platform ability error: " + platformServerUrl);
Logger.e(TAG, "[PLATFORM] request error: " + Logger.safeUrl(platformServerUrl)
+ ", errMsg=" + errMsg);
}
});
} else {
Logger.d(TAG, "request platform ability in progress: " + platformServerUrl);
Logger.d(TAG, "[PLATFORM] request in progress: " + Logger.safeUrl(platformServerUrl));
}
}

Expand Down Expand Up @@ -2597,10 +2603,14 @@ public void onCreate() {
}
}
EventBusUtil.register(this);
String platformServerUrl = DebugUtil.getEnvironmentServices();
if (platformServerUrl != null) {
Logger.d(TAG, "init request platform ability: " + platformServerUrl);
getPlatformAbility(platformServerUrl, false);
if (!DeploymentModeUtil.isNoPlatformMode()) {
String platformServerUrl = DebugUtil.getEnvironmentServices();
if (platformServerUrl != null) {
Logger.d(TAG, "[PLATFORM] init request platform ability: " + Logger.safeUrl(platformServerUrl));
getPlatformAbility(platformServerUrl, false);
}
} else {
Logger.d(TAG, "[PLATFORM] skip init platform ability in no-platform mode");
}
}

Expand Down Expand Up @@ -2945,6 +2955,10 @@ public void onEvent(DeviceAbilityRequestEvent event) {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(PlatformAbilityRequestEvent event) {
if (event != null) {
if (DeploymentModeUtil.isNoPlatformMode()) {
Logger.d(TAG, "[PLATFORM] skip platform ability event in no-platform mode");
return;
}
String platformServerUrl = event.getPlatformServerUrl();
Boolean isSupport = DataUtil.isPlatformAbilitySupport(getApplicationContext(), platformServerUrl
, ConstantField.URL.SERVERS_STUN_DETAIL_V2_API, ConstantField.HttpRequestMethod.GET);
Expand Down Expand Up @@ -2982,9 +2996,13 @@ public void onEvent(SpaceChangeEvent event) {
if (!isForeground && event != null) {
resetSpacePoll(event.isHeart());
}
if (DeploymentModeUtil.isNoPlatformMode()) {
Logger.d(TAG, "[PLATFORM] skip space-change platform ability request in no-platform mode");
return;
}
String platformServerUrl = DebugUtil.getEnvironmentServices();
if (platformServerUrl != null && !StringUtil.compare(StringUtil.urlToHost(platformServerUrl), DataUtil.getCurrentPlatformServerHost())) {
Logger.d(TAG, "space change request platform ability: " + platformServerUrl);
Logger.d(TAG, "[PLATFORM] space-change request platform ability: " + Logger.safeUrl(platformServerUrl));
getPlatformAbility(platformServerUrl, false);
}
}
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/xyz/eulix/space/abs/AbsActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -825,26 +825,26 @@ private void pollStrongPush() {
break;
case ConstantField.PushType.BOX_UPGRADE_PACKAGE_PULLED:
//系统下载完成,弹框
Logger.d("zfy", "receive BOX_UPGRADE_PACKAGE_PULLED");
Logger.d("receive BOX_UPGRADE_PACKAGE_PULLED");
if (SystemUtil.requestNotification(getApplicationContext(), false) && DataUtil.getBusinessMessageEnable(getApplicationContext())) {
if (activityIndex == ConstantField.ActivityIndex.SYSTEM_UPDATE_ACTIVITY_INDEX || this instanceof SystemUpdateActivity || ConstantField.boxVersionCheckBody == null) {
//当前页面为升级页面,不提示
Logger.d("zfy", "current activity is " + ConstantField.ActivityIndex.SYSTEM_UPDATE_ACTIVITY_INDEX);
Logger.d("current activity is " + ConstantField.ActivityIndex.SYSTEM_UPDATE_ACTIVITY_INDEX);
handleStrongPush(true);
pollStrongPush();
} else {
handleStrongPush(false);
handleStrongPushLock(true);
String versionStr = getResources().getString(R.string.app_name);
Logger.d("zfy", "data:" + data);
Logger.d("data:" + data);
if (!TextUtils.isEmpty(data)) {
try {
JSONObject jsonObject = new JSONObject(data);
versionStr = versionStr + " " + jsonObject.optString("version");
//删除换行符
versionStr.replaceAll("\n", "");
} catch (Exception e) {
Logger.d("zfy", "data is not json");
Logger.d("data is not json");
}
} else if (ConstantField.boxVersionCheckBody != null && ConstantField.boxVersionCheckBody.latestAppPkg != null
&& !TextUtils.isEmpty(ConstantField.boxVersionCheckBody.latestAppPkg.pkgVersion)) {
Expand Down Expand Up @@ -1047,7 +1047,7 @@ private void pollWeakPush() {
}
break;
case ConstantField.PushType.BOX_START_UPGRADE:
Logger.d("zfy", "receive BOX_START_UPGRADE");
Logger.d("receive BOX_START_UPGRADE");
if (topNotificationTwoTitle != null) {
topNotificationTwoTitle.setText(getString(R.string.box_start_upgarde_title));
}
Expand Down Expand Up @@ -1305,7 +1305,7 @@ public void onReceive(Context context, Intent intent) {

@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(LanStatusEvent event) {
Logger.d("zfy", "receive LanStatusEvent " + event.isLanEnable);
Logger.d("receive LanStatusEvent " + event.isLanEnable);
if (event.isLanEnable) {
if (isVisible && !lastLanState) {
showLANDialog();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public int getItemViewType(int position) {
@Override
public void setSelected(int index, boolean selected) {
// do something to mark this index as selected/unselected
Logger.d("zfy", "AlbumHomeAdapter setSelected:index=" + index + ",selected=" + selected);
Logger.d("AlbumHomeAdapter setSelected:index=" + index + ",selected=" + selected);
if (dataList.isEmpty() || index >= dataList.size()) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public void onBindViewHolder(@NonNull @NotNull ViewHolder holder, int position)

holder.itemView.setOnClickListener(v -> {
if (isSelectMode) {
Logger.d("zfy", "isSelectMode");
Logger.d("isSelectMode");
boolean selectedState = (boolean) holder.itemView.getTag();
boolean isSelected = !selectedState;
holder.itemView.setTag(isSelected);
Expand Down Expand Up @@ -386,10 +386,10 @@ public void onBindViewHolder(@NonNull @NotNull ViewHolder holder, int position,
int lastProgress = holder.progressBar.getProgress();
if (progress <= lastProgress) {
//防止进度条回退
Logger.d("zfy", "currentProgress less than last");
Logger.d("currentProgress less than last");
return;
}
Logger.d("zfy", "set progress:" + progress);
Logger.d("set progress:" + progress);
if (progress < 3) {
//圆角进度进度太少时会变形,需要切割
holder.progressBar.setProgressDrawable(context.getDrawable(R.drawable.transfer_progress_dialog_bg_less));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ public int getItemViewType(int position) {

@Override
public void onClick(View v) {
Logger.d("zfy","files/adapter onClick");
Logger.d("files/adapter onClick");
if (v != null) {
Object positionTag = v.getTag();
if (positionTag instanceof Integer) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,15 @@ private void generateViewHolderData(ViewHolder holder, int position) {
case ConstantField.PushType.BOX_UPGRADE_PACKAGE_PULLED:
messageTitle = mContext.getString(R.string.box_upgrade_reminder);
String versionStr = mContext.getResources().getString(R.string.app_name);
Logger.d("zfy", "data:" + messageData);
Logger.d("data:" + messageData);
if (!TextUtils.isEmpty(messageData)) {
try {
JSONObject jsonObject = new JSONObject(messageData);
versionStr = versionStr + " " + jsonObject.optString("version");
//删除换行符
versionStr.replaceAll("\n", "");
} catch (Exception e) {
Logger.d("zfy", "data is not json");
Logger.d("data is not json");
}
}
messageContent = mContext.getString(R.string.box_package_pulled_desc_msg_center).replace("%$", versionStr);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public long upgradeAccountValue(String oldAccount, String newAccount) {
cv.put(CacheHelper.KEY_ACCOUNT, newAccount);

int accountCache = mDBHelper.updateCacheInfo(cv, where, null);
Logger.d("zfy", "updateCacheInfo count = " + accountCache);
Logger.d("updateCacheInfo count = " + accountCache);
if (accountCache > -1) {
result = accountCache;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public void onEvent(TransferSizeEvent event) {

//刷新进度
int progress = (int) (event.currentSize * 100 / mData.getSize());
Logger.d("zfy", "set progress:" + progress);
Logger.d("set progress:" + progress);
if (tvShowOriginalImage.getVisibility() == View.VISIBLE) {
String showOriginalText = getString(R.string.file_downloading) + " " + progress + "%";
tvShowOriginalImage.setText(showOriginalText);
Expand Down Expand Up @@ -336,7 +336,7 @@ public void onEvent(TransferStateEvent event) {
}
} else if (event.state == TransferHelper.STATE_ERROR) {
//缓存失败
Logger.d("zfy", "文件缓存失败");
Logger.d("文件缓存失败");
showImageTextToast(R.drawable.toast_refuse, R.string.file_preview_failed);
Objects.requireNonNull(getActivity()).finish();
}
Expand All @@ -356,7 +356,7 @@ public void onEvent(TransferStateEvent event) {

@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(ThumbEvent event) {
Logger.d("zfy", "onReceive ThumbEvent:" + event.uuid);
Logger.d("onReceive ThumbEvent:" + event.uuid);
if (needResetThumb && event.uuid.equals(mData.getId())) {
refreshThumb(event.thumbPath);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ public void onEvent(TransferSizeEvent event) {

@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(TransferListNetworkEvent event) {
Logger.d("zfy","onReceive TransferListNetworkEvent");
Logger.d("onReceive TransferListNetworkEvent");
for (int i=0;i<adapterDoing.dataList.size();i++){
if (adapterDoing.dataList.get(i).state == TransferHelper.STATE_DOING){
adapterDoing.notifyItemChanged(i,"refresh_network");
Expand All @@ -408,7 +408,7 @@ public void onEvent(TransferSpeedEvent.TransferSpeed event) {
for (int i = 0; i < adapterDoing.dataList.size(); i++) {
TransferItem adapterItem = adapterDoing.dataList.get(i);
if (!TextUtils.isEmpty(event.mKey) && event.mKey.equals(adapterItem.ext1)) {
Logger.d("zfy","onReceive TransferSpeedEvent.TransferSpeed event "+event.mKey);
Logger.d("onReceive TransferSpeedEvent.TransferSpeed event "+event.mKey);
adapterDoing.appendSpeedMap(event.mKey, event.mSpeed);
adapterDoing.notifyItemChanged(i, "refresh_speed");
break;
Expand All @@ -421,12 +421,12 @@ public void onEvent(TransferStateEvent event) {
if (type != event.transferType) {
return;
}
Logger.d("zfy", "transfer list receive TransferStateEvent:" + event.keyName + ";state=" + event.state + ";unique:" + event.uniqueTag + ";pageTransferType = " + type);
Logger.d("transfer list receive TransferStateEvent:" + event.keyName + ";state=" + event.state + ";unique:" + event.uniqueTag + ";pageTransferType = " + type);
for (int i = 0; i < adapterDoing.dataList.size(); i++) {
TransferItem adapterItem = adapterDoing.dataList.get(i);
Logger.d("zfy", "adapterItem uniqueTag=" + adapterItem.ext1);
Logger.d("adapterItem uniqueTag=" + adapterItem.ext1);
if (!TextUtils.isEmpty(event.uniqueTag) && event.uniqueTag.equals(adapterItem.ext1)) {
Logger.d("zfy", "uniqueTag match:" + event.uniqueTag);
Logger.d("uniqueTag match:" + event.uniqueTag);
if (event.state == TransferHelper.STATE_FINISH) {
//传输完成,删除传输中,新增传输完成
adapterDoing.dataList.get(i).state = TransferHelper.STATE_FINISH;
Expand Down Expand Up @@ -739,7 +739,7 @@ public void onTitleBarStateChange(int clickEvent) {
adapterDone.notifyDataSetChanged();
break;
case TitleBarWithSelect.CLICK_EVENT_SELECT_NULL:
Logger.d("zfy", "onSelectNone");
Logger.d("onSelectNone");
presenter.dataDoneSelected.clear();
presenter.selectedPositionList.clear();
refreshSelectedCount(presenter.dataDoneSelected.size());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public void initViewData() {

@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(ThumbEvent event) {
Logger.d("zfy", "onReceive ThumbEvent:" + event.uuid);
Logger.d("onReceive ThumbEvent:" + event.uuid);
for (int i = 0; i < adapter.mCustomizeFileList.size(); i++) {
if (adapter.mCustomizeFileList.get(i).getId().equals(event.uuid)) {
int realPosition = headerFooterWrapper.getHeaderCount() + i;
Expand Down
Loading
Loading