From 23e1accf8e8c69bc88de56430db9e548d2f6b96a Mon Sep 17 00:00:00 2001 From: Jimmie Date: Sat, 7 Feb 2026 01:46:52 +0800 Subject: [PATCH] Improve Android logging and simplify LAN-only deployment behavior --- app/build.gradle | 2 + .../eulix/space/EulixDeviceListActivity.java | 2 +- .../eulix/space/EulixSpaceApplication.java | 11 +- .../xyz/eulix/space/EulixSpaceService.java | 36 +++- .../java/xyz/eulix/space/abs/AbsActivity.java | 12 +- .../adapter/LocalMediaSelectAdapter.java | 2 +- .../adapter/TransferringListAdapter.java | 6 +- .../space/adapter/files/FileAdapter.java | 2 +- .../adapter/message/MessageCenterAdapter.java | 4 +- .../space/database/cache/CacheDBManager.java | 2 +- .../space/fragment/ImgPreviewFragment.java | 6 +- .../space/fragment/TransferListFragment.java | 12 +- .../space/fragment/files/FileAllFragment.java | 2 +- .../space/fragment/main/TabFileFragment.java | 16 +- .../space/fragment/main/TabMineFragment.java | 2 +- .../space/manager/AlreadyUploadedManager.java | 14 +- .../space/manager/BoxNetworkCheckManager.java | 4 +- .../eulix/space/manager/EulixPushManager.java | 19 ++- .../xyz/eulix/space/manager/LanManager.java | 85 +++++----- .../space/manager/LocalMediaCacheManager.java | 44 ++--- .../xyz/eulix/space/manager/ThumbManager.java | 22 +-- .../space/manager/TransferTaskManager.java | 74 ++++---- .../space/network/agent/AgentManager.java | 3 + .../space/network/agent/DeviceManager.java | 8 +- .../xyz/eulix/space/network/box/BKeyUtil.java | 2 +- .../space/network/files/FileListManager.java | 66 ++++---- .../space/network/files/FileListUtil.java | 12 +- .../space/network/gateway/GatewayManager.java | 6 +- .../interceptor/EulixGatewayInterceptor.java | 34 ++-- .../space/network/platform/PKeyManager.java | 22 ++- .../register/RegisterDeviceManager.java | 13 ++ .../space/network/upgrade/UpgradeManager.java | 44 ++--- .../network/userinfo/UserInfoManager.java | 34 ++-- .../space/network/userinfo/UserInfoUtil.java | 10 +- .../space/network/video/VideoNetManager.java | 30 ++-- .../space/presenter/AboutUsPresenter.java | 4 +- .../presenter/AutoUpdateSettingPresenter.java | 4 +- .../presenter/BoxSystemDetailPresenter.java | 8 +- .../presenter/DeviceManagePresenter.java | 6 +- .../space/presenter/FilePreviewPresenter.java | 4 +- .../presenter/GranterLoginPresenter.java | 13 +- .../ImgPreviewFragmentPresenter.java | 4 +- .../space/presenter/LanIpInputPresenter.java | 4 +- .../eulix/space/presenter/MainPresenter.java | 18 +- .../SpacePlatformEnvironmentPresenter.java | 30 +--- .../presenter/SystemUpdatePresenter.java | 28 +-- .../TransferListFragmentPresenter.java | 2 +- .../presenter/UnbindDevicePresenter.java | 8 +- .../space/presenter/UserInfoPresenter.java | 2 +- .../space/receiver/NetworkChangeReceiver.java | 11 +- .../receiver/PhotoAlbumContentObserver.java | 2 +- .../space/transfer/db/TransferDBManager.java | 2 +- .../transfer/multipart/BetagCalculator.java | 8 +- .../transfer/multipart/MultipartUtil.java | 44 ++--- .../transfer/multipart/lan/LanHttpsUtil.java | 10 +- .../lan/LanUploadFileProgressRequestBody.java | 2 +- .../network/MultipartNetworkManger.java | 160 +++++++++--------- .../multipart/task/MultipartDownloadTask.java | 20 +-- .../multipart/task/MultipartUploadTask.java | 62 +++---- .../space/transfer/net/TransferNetUtil.java | 16 +- .../xyz/eulix/space/ui/EulixMainActivity.java | 9 +- .../eulix/space/ui/EulixWebViewActivity.java | 14 +- .../xyz/eulix/space/ui/ExoPlayerActivity.java | 8 +- .../eulix/space/ui/FilePreviewActivity.java | 26 +-- .../eulix/space/ui/FileSearchActivity.java | 4 +- .../space/ui/LocalMediaSelectActivity.java | 4 +- .../eulix/space/ui/TransferListActivity.java | 10 +- .../authorization/GranteeLoginActivity.java | 2 +- .../authorization/GranterLoginActivity.java | 2 +- .../space/ui/bind/UnbindDeviceActivity.java | 2 +- .../eulix/space/ui/mine/AboutUsActivity.java | 2 +- .../ui/mine/BoxSystemDetailActivity.java | 2 +- .../space/ui/mine/DeviceManageActivity.java | 2 +- .../space/ui/mine/SystemUpdateActivity.java | 6 +- .../eulix/space/ui/mine/UserInfoActivity.java | 8 +- .../eulix/space/util/AlbumNotifyHelper.java | 2 +- .../xyz/eulix/space/util/ConstantField.java | 48 +++--- .../eulix/space/util/DeploymentModeUtil.java | 13 ++ .../xyz/eulix/space/util/EncryptionUtil.java | 6 +- .../java/xyz/eulix/space/util/FileUtil.java | 6 +- .../space/util/LocalMediaUpSelectHelper.java | 8 +- .../xyz/eulix/space/util/LocalMediaUtil.java | 2 +- .../java/xyz/eulix/space/util/Logger.java | 33 ++++ .../main/java/xyz/eulix/space/util/Urls.java | 4 + .../main/java/xyz/eulix/space/util/Utils.java | 2 +- .../xyz/eulix/space/util/VideoPlayUtil.java | 4 +- .../eulix/space/view/NormalEditInputView.java | 2 +- .../view/dialog/PrivacyAgreementDialog.java | 4 +- .../view/dialog/SecurityPwdVerifyDialog.java | 2 +- .../view/dialog/file/FileEditController.java | 2 +- .../space/view/dialog/file/FileEditView.java | 4 +- .../smartrefresh/CustomRefreshHeader.java | 4 +- gradlew | 0 93 files changed, 743 insertions(+), 639 deletions(-) create mode 100644 app/src/main/java/xyz/eulix/space/util/DeploymentModeUtil.java mode change 100644 => 100755 gradlew diff --git a/app/build.gradle b/app/build.gradle index e81774e..48e7b4a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' diff --git a/app/src/main/java/xyz/eulix/space/EulixDeviceListActivity.java b/app/src/main/java/xyz/eulix/space/EulixDeviceListActivity.java index f843ce0..447ab10 100644 --- a/app/src/main/java/xyz/eulix/space/EulixDeviceListActivity.java +++ b/app/src/main/java/xyz/eulix/space/EulixDeviceListActivity.java @@ -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); diff --git a/app/src/main/java/xyz/eulix/space/EulixSpaceApplication.java b/app/src/main/java/xyz/eulix/space/EulixSpaceApplication.java index 59c282e..0afcfbc 100644 --- a/app/src/main/java/xyz/eulix/space/EulixSpaceApplication.java +++ b/app/src/main/java/xyz/eulix/space/EulixSpaceApplication.java @@ -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; @@ -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); @@ -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); @@ -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); @@ -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(); } //系统默认异常处理器 diff --git a/app/src/main/java/xyz/eulix/space/EulixSpaceService.java b/app/src/main/java/xyz/eulix/space/EulixSpaceService.java index dc63a18..fc42041 100644 --- a/app/src/main/java/xyz/eulix/space/EulixSpaceService.java +++ b/app/src/main/java/xyz/eulix/space/EulixSpaceService.java @@ -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; @@ -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() { @@ -2199,23 +2204,24 @@ public void onSuccess(List 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)); } } @@ -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"); } } @@ -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); @@ -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); } } diff --git a/app/src/main/java/xyz/eulix/space/abs/AbsActivity.java b/app/src/main/java/xyz/eulix/space/abs/AbsActivity.java index 1bd960b..5bc329c 100644 --- a/app/src/main/java/xyz/eulix/space/abs/AbsActivity.java +++ b/app/src/main/java/xyz/eulix/space/abs/AbsActivity.java @@ -825,18 +825,18 @@ 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); @@ -844,7 +844,7 @@ private void pollStrongPush() { //删除换行符 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)) { @@ -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)); } @@ -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(); diff --git a/app/src/main/java/xyz/eulix/space/adapter/LocalMediaSelectAdapter.java b/app/src/main/java/xyz/eulix/space/adapter/LocalMediaSelectAdapter.java index f1df617..92631d4 100644 --- a/app/src/main/java/xyz/eulix/space/adapter/LocalMediaSelectAdapter.java +++ b/app/src/main/java/xyz/eulix/space/adapter/LocalMediaSelectAdapter.java @@ -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; } diff --git a/app/src/main/java/xyz/eulix/space/adapter/TransferringListAdapter.java b/app/src/main/java/xyz/eulix/space/adapter/TransferringListAdapter.java index 6593c9e..caef737 100644 --- a/app/src/main/java/xyz/eulix/space/adapter/TransferringListAdapter.java +++ b/app/src/main/java/xyz/eulix/space/adapter/TransferringListAdapter.java @@ -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); @@ -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)); diff --git a/app/src/main/java/xyz/eulix/space/adapter/files/FileAdapter.java b/app/src/main/java/xyz/eulix/space/adapter/files/FileAdapter.java index d587e61..1fdd3d9 100644 --- a/app/src/main/java/xyz/eulix/space/adapter/files/FileAdapter.java +++ b/app/src/main/java/xyz/eulix/space/adapter/files/FileAdapter.java @@ -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) { diff --git a/app/src/main/java/xyz/eulix/space/adapter/message/MessageCenterAdapter.java b/app/src/main/java/xyz/eulix/space/adapter/message/MessageCenterAdapter.java index 53458fd..7342208 100644 --- a/app/src/main/java/xyz/eulix/space/adapter/message/MessageCenterAdapter.java +++ b/app/src/main/java/xyz/eulix/space/adapter/message/MessageCenterAdapter.java @@ -216,7 +216,7 @@ 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); @@ -224,7 +224,7 @@ private void generateViewHolderData(ViewHolder holder, int position) { //删除换行符 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); diff --git a/app/src/main/java/xyz/eulix/space/database/cache/CacheDBManager.java b/app/src/main/java/xyz/eulix/space/database/cache/CacheDBManager.java index 427043d..e044ef1 100644 --- a/app/src/main/java/xyz/eulix/space/database/cache/CacheDBManager.java +++ b/app/src/main/java/xyz/eulix/space/database/cache/CacheDBManager.java @@ -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; } diff --git a/app/src/main/java/xyz/eulix/space/fragment/ImgPreviewFragment.java b/app/src/main/java/xyz/eulix/space/fragment/ImgPreviewFragment.java index 7df8cfd..a2add6e 100644 --- a/app/src/main/java/xyz/eulix/space/fragment/ImgPreviewFragment.java +++ b/app/src/main/java/xyz/eulix/space/fragment/ImgPreviewFragment.java @@ -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); @@ -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(); } @@ -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); } diff --git a/app/src/main/java/xyz/eulix/space/fragment/TransferListFragment.java b/app/src/main/java/xyz/eulix/space/fragment/TransferListFragment.java index 6c2e8d9..691d909 100644 --- a/app/src/main/java/xyz/eulix/space/fragment/TransferListFragment.java +++ b/app/src/main/java/xyz/eulix/space/fragment/TransferListFragment.java @@ -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 1) { String absolutePath = new String(paramsArray[0].getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); - Logger.d("zfy", "uploaded file path:" + absolutePath); + Logger.d("uploaded file path:" + absolutePath); String md5 = paramsArray[1]; mUploadedMap.put(absolutePath, md5); } @@ -125,12 +125,12 @@ public void init(Context context) { //插入一条已上传数据 public synchronized void insertItem(String absolutePath, String md5) { if (TextUtils.isEmpty(mFolderPath) || TextUtils.isEmpty(mFileName)) { - Logger.d("zfy", "UploadedManager not init"); + Logger.d("UploadedManager not init"); return; } FileUtil.mkFile(mFolderPath); if (mUploadedMap.containsKey(absolutePath)) { - Logger.d("zfy", "uploaded map already has " + absolutePath); + Logger.d("uploaded map already has " + absolutePath); return; } ThreadPool.getInstance().execute(() -> { @@ -150,7 +150,7 @@ public synchronized void insertItem(String absolutePath, String md5) { public synchronized void removeItemByAbsolutePath(String absolutePath) { if (mUploadedMap.containsKey(absolutePath)) { - Logger.d("zfy", "uploaded map remove:" + absolutePath); + Logger.d("uploaded map remove:" + absolutePath); mUploadedMap.remove(absolutePath); } } @@ -162,7 +162,7 @@ public void refreshUploadedRecord() { File uploadedFile = new File(folderPath, mFileName); if (uploadedFile.exists()) { boolean result = uploadedFile.delete(); - Logger.d("zfy", "uploaded file delete result: " + result); + Logger.d("uploaded file delete result: " + result); } ThreadPool.getInstance().execute(() -> { try (RandomAccessFile randomFile = new RandomAccessFile(mFolderPath + mFileName, "rw")) { @@ -187,7 +187,7 @@ public void clearAllRecords() { File uploadedFile = new File(folderPath, mFileName); if (uploadedFile.exists()) { boolean result = uploadedFile.delete(); - Logger.d("zfy", "uploaded file delete: " + result); + Logger.d("uploaded file delete: " + result); } } diff --git a/app/src/main/java/xyz/eulix/space/manager/BoxNetworkCheckManager.java b/app/src/main/java/xyz/eulix/space/manager/BoxNetworkCheckManager.java index fdafc0f..33c30d1 100644 --- a/app/src/main/java/xyz/eulix/space/manager/BoxNetworkCheckManager.java +++ b/app/src/main/java/xyz/eulix/space/manager/BoxNetworkCheckManager.java @@ -68,6 +68,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.EventBusUtil; import xyz.eulix.space.util.FormatUtil; import xyz.eulix.space.util.GatewayUtils; @@ -384,7 +385,8 @@ public void onSuccess(boolean lan, int code, String locationHost, String boxUuid spacePlatformInfo.setPrivateSpacePlatform(isPrivateSpacePlatform); spacePlatformInfo.setPlatformServerUrl(platformServerUrl); String platformServerHost = StringUtil.urlToHost(platformServerUrl); - if ((finalStatus == ConstantField.EulixDeviceStatus.ACTIVE || finalStatus == ConstantField.EulixDeviceStatus.OFFLINE_USE) + if (!DeploymentModeUtil.isNoPlatformMode() + && (finalStatus == ConstantField.EulixDeviceStatus.ACTIVE || finalStatus == ConstantField.EulixDeviceStatus.OFFLINE_USE) && platformServerUrl != null && !StringUtil.compare(platformServerHost, DataUtil.getCurrentPlatformServerHost())) { Logger.d(TAG, "space status platform change request platform ability: " + platformServerUrl); if (currentSpacePlatformInfo == null) { diff --git a/app/src/main/java/xyz/eulix/space/manager/EulixPushManager.java b/app/src/main/java/xyz/eulix/space/manager/EulixPushManager.java index b4af498..8481a71 100644 --- a/app/src/main/java/xyz/eulix/space/manager/EulixPushManager.java +++ b/app/src/main/java/xyz/eulix/space/manager/EulixPushManager.java @@ -22,7 +22,6 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import android.util.Log; import androidx.annotation.NonNull; @@ -84,6 +83,7 @@ import xyz.eulix.space.network.security.SecurityTokenResult; 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.EncryptionUtil; import xyz.eulix.space.util.EventBusUtil; @@ -267,7 +267,7 @@ private void keepAliveConnect() { .get() .build(); // 日志驻点 - Log.d(TAG, "eulix push request: " + httpParseUrl.toString() + ", request id: " + requestId); + Logger.d(TAG, "[PUSH] request: " + Logger.safeUrl(httpUrl.toString()) + ", requestId=" + requestId); mCall = mOkHttpClient.newCall(request); isLocked = true; isCancel = false; @@ -276,8 +276,8 @@ private void keepAliveConnect() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { // 日志驻点 - Log.d(TAG, "eulix push response on failure"); - Logger.e(TAG, "on failure: " + e.getMessage()); + Logger.d(TAG, "[PUSH] response failure"); + Logger.e(TAG, "[PUSH] onFailure, requestId=" + requestId, e); mHandler.post(() -> { isLocked = false; if (isCancel) { @@ -291,10 +291,10 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { - Logger.i(TAG, "on response: " + response.toString()); + Logger.i(TAG, "[PUSH] onResponse: " + response); int code = response.code(); // 日志驻点 - Log.d(TAG, "eulix push response on response: " + code); + Logger.d(TAG, "[PUSH] response code: " + code); int delay = 15000; if (code < 300) { delay = 0; @@ -500,6 +500,11 @@ private boolean handleMessage(String optType, String boxUuid, String boxBind, St } break; case ConstantField.PushType.ABILITY_CHANGE: + if (DeploymentModeUtil.isNoPlatformMode()) { + Logger.d(TAG, "skip push ability-change platform request in no-platform mode"); + hasConsumed = true; + break; + } String platformServerUrl = DebugUtil.getEnvironmentServices(); if (platformServerUrl != null) { Logger.d(TAG, "push ability change request platform ability: " + platformServerUrl); @@ -508,7 +513,7 @@ private boolean handleMessage(String optType, String boxUuid, String boxBind, St hasConsumed = true; break; case ConstantField.PushType.BOX_SYSTEM_RESTART: - Logger.d("zfy", "manageBoxSystemRestartPush:" + data); + Logger.d(TAG, "[PUSH] manageBoxSystemRestartPush: " + data); EventBusUtil.post(new BoxSystemRestartEvent()); hasConsumed = true; break; diff --git a/app/src/main/java/xyz/eulix/space/manager/LanManager.java b/app/src/main/java/xyz/eulix/space/manager/LanManager.java index a149f95..bb2907c 100644 --- a/app/src/main/java/xyz/eulix/space/manager/LanManager.java +++ b/app/src/main/java/xyz/eulix/space/manager/LanManager.java @@ -72,6 +72,7 @@ * History: 2021/12/24 */ public class LanManager { + private static final String TAG = LanManager.class.getSimpleName(); private static LanManager sInstance; private volatile boolean isLanEnable = false; //局域网http domain @@ -121,20 +122,20 @@ public void setLanEnable(boolean isLanEnable) { } private void setLanEnableCore(boolean isLanEnable, boolean isStopPoll) { - Logger.d("zfy", "#setLanEnableCore isLanEnable=" + isLanEnable + ",isStopPoll=" + isStopPoll); + Logger.d(TAG, "[LAN] #setLanEnableCore isLanEnable=" + isLanEnable + ", isStopPoll=" + isStopPoll); this.isLanEnable = isLanEnable; if (!isLanEnable) { //非局域网 this.lanDomain = null; this.lanHttpsDomain = null; mCheckFailedTime++; - Logger.d("zfy", "check lan failed time:" + mCheckFailedTime); + Logger.d(TAG, "[LAN] check lan failed time:" + mCheckFailedTime); if (mCheckFailedTime >= LAN_CHECK_MAX_COUNT) { - Logger.d("zfy", "lan check failed time reach limit, turn long interval time"); + Logger.d(TAG, "[LAN] lan check failed time reach limit, turn long interval time"); mPollingInterval = LONG_POLLING_INTERVAL_TIME; } if (isStopPoll) { - Logger.d("zfy", "stop poll"); + Logger.d(TAG, "[LAN] stop poll"); stopPollTask(); mCheckFailedTime = 0; mPollingInterval = NORMAL_POLLING_INTERVAL_TIME; @@ -164,7 +165,7 @@ public void refreshLanState(ResultCallback callback) { //刷新局域网状态 public void refreshLanState(ResultCallback callback, boolean isFore) { - Logger.d("zfy", "refreshLanState"); + Logger.d(TAG, "[LAN] refreshLanState"); if (!NetUtils.isWifiConnected(context)) { setLanEnableCore(false, false); callback.onResult(false, "client not wifi"); @@ -197,16 +198,16 @@ public void onError(String msg) { //查询ip地址是否可用 private void checkIpListConnect(List ipList, final int index, ResultCallback callback) { - Logger.d("zfy", "checkIpListConnect index=" + index); + Logger.d(TAG, "[LAN] checkIpListConnect index=" + index); if (!NetUtils.isWifiConnected(context) || ipList == null || ipList.isEmpty() || index >= ipList.size()) { callback.onResult(false, null); - Logger.d("zfy", "no available lan"); + Logger.d(TAG, "[LAN] no available lan"); return; } String baseDomain = genDomainUrl(ipList.get(index)); InitResponseNetwork finalIpItem = ipList.get(index); if (ipFailTimeMap.containsKey(finalIpItem.getIp()) && ipFailTimeMap.get(finalIpItem.getIp()) > 3) { - Logger.d("zfy", finalIpItem.getIp() + " failed too many times,try next"); + Logger.d(TAG, finalIpItem.getIp() + " failed too many times,try next"); int nextIndex = index + 1; checkIpListConnect(ipList, nextIndex, callback); return; @@ -218,19 +219,19 @@ public void onResult(boolean result, String extraMsg) { // isLanEnable = true; lanDomain = genDomainUrl(finalIpItem); lanHttpsDomain = genHttpsDomainUrl(finalIpItem); - Logger.d("zfy", "get available lan ip:" + lanDomain); + Logger.d(TAG, "[LAN] get available lan ip:" + lanDomain); if (!isLanEnable) { lanDomain = genDomainUrl(finalIpItem); lanHttpsDomain = genHttpsDomainUrl(finalIpItem); setLanEnableCore(true, false); - Logger.d("zfy", "get available lan ip:" + lanDomain); + Logger.d(TAG, "[LAN] get available lan ip:" + lanDomain); //获取局域网证书 if (mHttpsSwitch) { LanHttpsUtil.getCert(context, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { if (result && extraObj != null) { - Logger.d("zfy", "get https cert success"); + Logger.d(TAG, "[LAN] get https cert success"); lanCert = (X509Certificate) extraObj; } } @@ -250,10 +251,10 @@ public void onError(String msg) { ipFailTimeMap.put(finalIpItem.getIp(), 1); } if (index < ipList.size() - 1) { - Logger.d("zfy", "no available lan"); + Logger.d(TAG, "[LAN] no available lan"); return; } - Logger.d("zfy", finalIpItem.getIp() + " not available,try next"); + Logger.d(TAG, finalIpItem.getIp() + " not available,try next"); int nextIndex = index + 1; checkIpListConnect(ipList, nextIndex, callback); } @@ -308,7 +309,7 @@ private void checkAfterGetIpList(List ipList, ResultCallbac } if (ipList.isEmpty()) { - Logger.d("zfy", "has no local ips"); + Logger.d(TAG, "[LAN] has no local ips"); setLanEnableCore(false, false); callback.onResult(false, null); return; @@ -326,7 +327,7 @@ private void checkAfterGetIpList(List ipList, ResultCallbac String baseDomain = genDomainUrl(wireIpItem); InitResponseNetwork finalWireIpItem = wireIpItem; if (ipFailTimeMap.containsKey(finalWireIpItem.getIp()) && ipFailTimeMap.get(finalWireIpItem.getIp()) > 3) { - Logger.d("zfy", finalWireIpItem.getIp() + " failed too many times,try wireless"); + Logger.d(TAG, finalWireIpItem.getIp() + " failed too many times,try wireless"); ipList.remove(finalWireIpItem); checkIpListConnect(ipList, 0, callback); return; @@ -340,30 +341,30 @@ public void onResult(boolean result, String extraMsg) { lanDomain = genDomainUrl(finalWireIpItem); lanHttpsDomain = genHttpsDomainUrl(finalWireIpItem); setLanEnableCore(true, false); - Logger.d("zfy", "get available lan ip:" + lanDomain); + Logger.d(TAG, "[LAN] get available lan ip:" + lanDomain); if (mHttpsSwitch) { //获取局域网证书 LanHttpsUtil.getCert(context, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { if (result && extraObj != null) { - Logger.d("zfy", "get https cert success"); + Logger.d(TAG, "[LAN] get https cert success"); lanCert = (X509Certificate) extraObj; } else { - Logger.d("zfy", "get https cert failed"); + Logger.d(TAG, "[LAN] get https cert failed"); } } @Override public void onError(String msg) { - Logger.d("zfy", "get https cert error"); + Logger.d(TAG, "[LAN] get https cert error"); } }); } } callback.onResult(true, null); } else { - Logger.d("zfy", "wire not available, try others"); + Logger.d(TAG, "[LAN] wire not available, try others"); if (ipFailTimeMap.containsKey(finalWireIpItem.getIp())) { ipFailTimeMap.put(finalWireIpItem.getIp(), ipFailTimeMap.get(finalWireIpItem.getIp()) + 1); } else { @@ -375,11 +376,11 @@ public void onError(String msg) { } }); } else { - Logger.d("zfy", "no wire lan,check wireless list"); + Logger.d(TAG, "[LAN] no wire lan,check wireless list"); checkIpListConnect(ipList, 0, callback); } } else { - Logger.d("zfy", "has no local ips"); + Logger.d(TAG, "[LAN] has no local ips"); setLanEnableCore(false, false); callback.onResult(false, null); } @@ -417,7 +418,7 @@ private void checkConnectStates(final String finalBaseUrl, ResultCallback callba ThreadPool.getInstance().execute(() -> gatewayManager.getSpaceStatus(new ISpaceStatusCallback() { @Override public void onResult(SpaceStatusResult result) { - Logger.d("zfy", "checkConnectStates on result: " + result); + Logger.d(TAG, "[LAN] checkConnectStates on result: " + result); if (result != null) { callback.onResult(true, null); } else { @@ -427,7 +428,7 @@ public void onResult(SpaceStatusResult result) { @Override public void onError(String errMsg) { - Logger.d("zfy", "checkConnectStates on error: " + errMsg); + Logger.d(TAG, "[LAN] checkConnectStates on error: " + errMsg); callback.onResult(false, null); } })); @@ -436,7 +437,7 @@ public void onError(String errMsg) { //通过在局域网内发现设备的方式刷新局域网状态-不走平台 public void refreshLanStateBySearchDevice(ResultCallback callback) { - Logger.d("zfy", "searchLanDevice"); + Logger.d(TAG, "[LAN] searchLanDevice"); if (!NetUtils.isWifiConnected(context)) { setLanEnableCore(false, false); if (callback != null) { @@ -456,7 +457,7 @@ public void refreshLanStateBySearchDevice(ResultCallback callback) { @Override public void onResult(boolean result, LanDeviceInfoBean deviceInfo, LanSearchServiceConnection connection) { if (deviceInfo != null && deviceInfo.btidhash != null && currentBtidhash.startsWith(deviceInfo.btidhash)) { - Logger.d("zfy", "find lan device with same btidhash, ip=" + deviceInfo.ipAddress); + Logger.d(TAG, "[LAN] find lan device with same btidhash, ip=" + deviceInfo.ipAddress); if (connection != null) { connection.stopDiscovery(); } @@ -554,7 +555,7 @@ public void discoveryChange(int number) { @Override public void resolveDevice(NsdServiceInfo serviceInfo) { //发现设备 - Logger.d("zfy", "#resolveDevice serviceName=" + serviceInfo.getServiceName() + ",host=" + serviceInfo.getHost()); + Logger.d(TAG, "[LAN] #resolveDevice serviceName=" + serviceInfo.getServiceName() + ",host=" + serviceInfo.getHost()); InetAddress inetAddress = serviceInfo.getHost(); if (inetAddress instanceof Inet6Address) { //过滤IPv6 @@ -568,9 +569,9 @@ public void resolveDevice(NsdServiceInfo serviceInfo) { Set> entrySet = attributes.entrySet(); for (Map.Entry entry : entrySet) { if (entry != null) { - Logger.d("zfy", "key: " + entry.getKey()); + Logger.d(TAG, "[LAN] key: " + entry.getKey()); if (entry.getValue() != null) { - Logger.d("zfy", "value: " + new String(entry.getValue(), StandardCharsets.UTF_8)); + Logger.d(TAG, "[LAN] value: " + new String(entry.getValue(), StandardCharsets.UTF_8)); } String key = entry.getKey(); if (key.equals("btidhash") && entry.getValue() != null) { @@ -670,7 +671,7 @@ public void resetHttpsCertInfo() { @Override public void onResult(boolean result, Object extraObj) { if (result && extraObj != null) { - Logger.d("zfy", "get https cert success"); + Logger.d(TAG, "[LAN] get https cert success"); lanCert = (X509Certificate) extraObj; } } @@ -684,11 +685,11 @@ public void onError(String msg) { //启动轮询 public void startPollCheckTask() { - Logger.d("zfy", "#startPollCheckTask"); + Logger.d(TAG, "[LAN] #startPollCheckTask"); stopPollTask(); if (!NetUtils.isWifiConnected(context)) { - Logger.d("zfy", "network is not wifi,stop poll"); + Logger.d(TAG, "[LAN] network is not wifi,stop poll"); setLanEnableCore(false, true); return; } @@ -705,11 +706,11 @@ public class PoolCheckRunnable implements Runnable { @Override public void run() { while (!isStop) { - Logger.d("zfy", "runnable poll check"); + Logger.d(TAG, "[LAN] runnable poll check"); //应用在后台，且当前没有正在传输的任务，不进行局域网状态查询 if (!((EulixSpaceApplication) EulixSpaceApplication.getContext()).getIsAppForeground() && (TransferTaskManager.getInstance().getTransferringCount() <= 0)) { - Logger.d("zfy", "app is background and no transfer task, jump lan poll check"); + Logger.d(TAG, "[LAN] app is background and no transfer task, jump lan poll check"); } else { checkLanState(); } @@ -756,7 +757,7 @@ public void onResult(boolean result, Object extraObj) { checkAfterGetIpList(ipList, new ResultCallback() { @Override public void onResult(boolean result, String extraMsg) { - Logger.d("zfy", "refreshLanStateBySearchDevice onResult:" + result); + Logger.d(TAG, "[LAN] refreshLanStateBySearchDevice onResult:" + result); setLanEnableCore(result, false); if (result) { EventBusUtil.post(new LanStatusEvent(true)); @@ -794,7 +795,7 @@ public void onResult(boolean result, Object extraObj) { checkAfterGetIpList(ipList, new ResultCallback() { @Override public void onResult(boolean result, String extraMsg) { - Logger.d("zfy", "refreshLanStateBySearchDevice onResult:" + result); + Logger.d(TAG, "[LAN] refreshLanStateBySearchDevice onResult:" + result); setLanEnableCore(result, false); if (result) { EventBusUtil.post(new LanStatusEvent(true)); @@ -805,7 +806,7 @@ public void onResult(boolean result, String extraMsg) { refreshLanStateBySearchDevice(new ResultCallback() { @Override public void onResult(boolean result, String extraMsg) { - Logger.d("zfy", "refreshLanStateBySearchDevice onResult:" + result); + Logger.d(TAG, "[LAN] refreshLanStateBySearchDevice onResult:" + result); setLanEnableCore(result, false); if (result) { EventBusUtil.post(new LanStatusEvent(true)); @@ -820,7 +821,7 @@ public void onError(String msg) { refreshLanStateBySearchDevice(new ResultCallback() { @Override public void onResult(boolean result, String extraMsg) { - Logger.d("zfy", "refreshLanStateBySearchDevice onResult:" + result); + Logger.d(TAG, "[LAN] refreshLanStateBySearchDevice onResult:" + result); setLanEnableCore(result, false); if (result) { EventBusUtil.post(new LanStatusEvent(true)); @@ -854,23 +855,23 @@ public void setLanDomainInfo(String lanIp, String port, String tlsPort) { lanHttpsDomain = "https://" + lanIp + (!TextUtils.isEmpty(tlsPort) ? ":" + tlsPort : ":443") + "/"; setLanEnableCore(true, false); EventBusUtil.post(new LanStatusEvent(true)); - Logger.d("zfy", "get available lan ip:" + lanDomain); + Logger.d(TAG, "[LAN] get available lan ip:" + lanDomain); if (mHttpsSwitch) { //获取局域网证书 LanHttpsUtil.getCert(context, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { if (result && extraObj != null) { - Logger.d("zfy", "get https cert success"); + Logger.d(TAG, "[LAN] get https cert success"); lanCert = (X509Certificate) extraObj; } else { - Logger.d("zfy", "get https cert failed"); + Logger.d(TAG, "[LAN] get https cert failed"); } } @Override public void onError(String msg) { - Logger.d("zfy", "get https cert error"); + Logger.d(TAG, "[LAN] get https cert error"); } }); } diff --git a/app/src/main/java/xyz/eulix/space/manager/LocalMediaCacheManager.java b/app/src/main/java/xyz/eulix/space/manager/LocalMediaCacheManager.java index 0e9bae5..0a7f2b7 100644 --- a/app/src/main/java/xyz/eulix/space/manager/LocalMediaCacheManager.java +++ b/app/src/main/java/xyz/eulix/space/manager/LocalMediaCacheManager.java @@ -176,16 +176,16 @@ private static void getAllFilesList(GetAlbumListListener listener) { //相册有新增 public static void onGalleryAdd(LocalMediaUpItem addItem, Uri uri) { - Logger.d("zfy", "onGalleryAdd"); + Logger.d("onGalleryAdd"); if (addItem.getMediaId().equals(lastAddId)) { - Logger.d("zfy", "file repeat"); + Logger.d("file repeat"); return; } lastAddId = addItem.getMediaId(); boolean isExit = false; if (addItem.getMimeType().contains("image")) { if (totalImageList.isEmpty()) { - Logger.d("zfy", "has no cache data"); + Logger.d("has no cache data"); } else { if (currentImagesMap.containsKey(addItem.getMediaId())) { isExit = true; @@ -198,7 +198,7 @@ public static void onGalleryAdd(LocalMediaUpItem addItem, Uri uri) { } } else { if (totalVideoList.isEmpty()) { - Logger.d("zfy", "has no cache data"); + Logger.d("has no cache data"); } else { if (currentVideosMap.containsKey(addItem.getMediaId())) { isExit = true; @@ -211,7 +211,7 @@ public static void onGalleryAdd(LocalMediaUpItem addItem, Uri uri) { } if (totalImageAndVideList.isEmpty()) { - Logger.d("zfy", "has no cache data"); + Logger.d("has no cache data"); } else { boolean isExitImageAndVideo = false; if (currentImageAndVideMap.containsKey(addItem.getMediaId())) { @@ -240,18 +240,18 @@ private static void addImageToBucket(LocalMediaUpItem localMediaUpItem, Uri uri) for (int i = 0; i < imageBucketList.size(); i++) { if (imageBucketList.get(i).getBucketId().equals(ConstantField.ALL_IMAGES_BUCKET_ID)) { //添加至“所有图片”相册 - Logger.d("zfy", "add to all image bucket:" + imageBucketList.get(i).getBucketName()); + Logger.d("add to all image bucket:" + imageBucketList.get(i).getBucketName()); addMediaToRightPosition(localMediaUpItem, imageBucketList.get(i).getImageList()); } if (imageBucketList.get(i).getBucketId().equals(bucketId)) { - Logger.d("zfy", "add to bucket:" + imageBucketList.get(i).getBucketName()); + Logger.d("add to bucket:" + imageBucketList.get(i).getBucketName()); bucketExist = true; addMediaToRightPosition(localMediaUpItem, imageBucketList.get(i).getImageList()); break; } } if (!bucketExist) { - Logger.d("zfy", "create bucket:" + bucketName); + Logger.d("create bucket:" + bucketName); PhotoUpImageBucket bucket = new PhotoUpImageBucket(); bucket.setBucketId(bucketId); bucket.setBucketName(bucketName); @@ -292,18 +292,18 @@ private static void addToImageAndVideoBucket(LocalMediaUpItem localMediaUpItem, for (int i = 0; i < imageAndVideoBucketList.size(); i++) { if (imageAndVideoBucketList.get(i).getBucketId().equals(ConstantField.ALL_IMAGES_BUCKET_ID)) { //添加至“所有图片”相册 - Logger.d("zfy", "add to all image bucket:" + imageAndVideoBucketList.get(i).getBucketName()); + Logger.d("add to all image bucket:" + imageAndVideoBucketList.get(i).getBucketName()); addMediaToRightPosition(localMediaUpItem, imageAndVideoBucketList.get(i).getImageList()); } if (imageAndVideoBucketList.get(i).getBucketId().equals(bucketId)) { - Logger.d("zfy", "add to bucket:" + imageAndVideoBucketList.get(i).getBucketName()); + Logger.d("add to bucket:" + imageAndVideoBucketList.get(i).getBucketName()); bucketExist = true; addMediaToRightPosition(localMediaUpItem, imageAndVideoBucketList.get(i).getImageList()); break; } } if (!bucketExist) { - Logger.d("zfy", "create bucket:" + bucketName); + Logger.d("create bucket:" + bucketName); PhotoUpImageBucket bucket = new PhotoUpImageBucket(); bucket.setBucketId(bucketId); bucket.setBucketName(bucketName); @@ -372,11 +372,11 @@ public static void onGalleryDelete(boolean isImage, String mediaId) { } } else { //部分手机无法确定删除文件id，整体刷新 - Logger.d("zfy", "onGalleryDelete refresh totalImageList"); + Logger.d("onGalleryDelete refresh totalImageList"); for (int i = 0; i < totalImageList.size(); i++) { File file = new File(totalImageList.get(i).getMediaPath()); if (!file.exists()) { - Logger.d("zfy", "remove " + totalImageList.get(i).getMediaPath()); + Logger.d("remove " + totalImageList.get(i).getMediaPath()); deleteItem = totalImageList.get(i); totalImageList.remove(i); break; @@ -385,7 +385,7 @@ public static void onGalleryDelete(boolean isImage, String mediaId) { } if (deleteItem != null) { String deleteItemBucketId = currentImagesMap.get(deleteItem.getMediaId()); - Logger.d("zfy", "deleteItemBucketId = " + deleteItemBucketId); + Logger.d("deleteItemBucketId = " + deleteItemBucketId); for (int i = 0; i < imageBucketList.size(); i++) { if (!imageBucketList.get(i).getBucketId().equals(ConstantField.ALL_IMAGES_BUCKET_ID) && !imageBucketList.get(i).getBucketId().equals(deleteItemBucketId)) { @@ -395,7 +395,7 @@ public static void onGalleryDelete(boolean isImage, String mediaId) { for (int j = 0; j < imageBucketList.get(i).getImageList().size(); j++) { if (imageBucketList.get(i).getImageList().get(j).getMediaId().equals(deleteItem.getMediaId())) { imageBucketList.get(i).getImageList().remove(j); - Logger.d("zfy", "remove from bucket: " + imageBucketList.get(i).getBucketName()); + Logger.d("remove from bucket: " + imageBucketList.get(i).getBucketName()); if (!imageBucketList.get(i).getBucketId().equals(ConstantField.ALL_IMAGES_BUCKET_ID)) { isDeleted = true; } @@ -427,16 +427,16 @@ public static void onGalleryDelete(boolean isImage, String mediaId) { } } if (!currentVideosMap.containsKey(mediaId)) { - Logger.d("zfy", "mediaId not exist:" + mediaId); + Logger.d("mediaId not exist:" + mediaId); return; } } else { - Logger.d("zfy", "onGalleryDelete refresh totalImageList"); + Logger.d("onGalleryDelete refresh totalImageList"); //部分手机无法确定删除文件id，整体刷新 for (int i = 0; i < totalVideoList.size(); i++) { File file = new File(totalVideoList.get(i).getMediaPath()); if (!file.exists()) { - Logger.d("zfy", "remove " + totalVideoList.get(i).getMediaPath()); + Logger.d("remove " + totalVideoList.get(i).getMediaPath()); totalVideoList.remove(i); currentVideosMap.remove(totalVideoList.get(i).getMediaId()); break; @@ -459,11 +459,11 @@ private static void onDeleteImageAndVideo(boolean isImage, String mediaId) { } } else { //部分手机无法确定删除文件id，整体刷新 - Logger.d("zfy", "onGalleryDelete refresh totalImageAndVideList"); + Logger.d("onGalleryDelete refresh totalImageAndVideList"); for (int i = 0; i < totalImageAndVideList.size(); i++) { File file = new File(totalImageAndVideList.get(i).getMediaPath()); if (!file.exists()) { - Logger.d("zfy", "remove " + totalImageAndVideList.get(i).getMediaPath()); + Logger.d("remove " + totalImageAndVideList.get(i).getMediaPath()); deleteItem = totalImageAndVideList.get(i); totalImageAndVideList.remove(i); break; @@ -472,7 +472,7 @@ private static void onDeleteImageAndVideo(boolean isImage, String mediaId) { } if (deleteItem != null) { String deleteItemBucketId = currentImageAndVideMap.get(deleteItem.getMediaId()); - Logger.d("zfy", "deleteItemBucketId = " + deleteItemBucketId); + Logger.d("deleteItemBucketId = " + deleteItemBucketId); for (int i = 0; i < imageAndVideoBucketList.size(); i++) { if (!imageAndVideoBucketList.get(i).getBucketId().equals(ConstantField.ALL_IMAGES_BUCKET_ID) && !imageAndVideoBucketList.get(i).getBucketId().equals(deleteItemBucketId)) { @@ -482,7 +482,7 @@ private static void onDeleteImageAndVideo(boolean isImage, String mediaId) { for (int j = 0; j < imageAndVideoBucketList.get(i).getImageList().size(); j++) { if (imageAndVideoBucketList.get(i).getImageList().get(j).getMediaId().equals(deleteItem.getMediaId())) { imageAndVideoBucketList.get(i).getImageList().remove(j); - Logger.d("zfy", "remove from bucket: " + imageAndVideoBucketList.get(i).getBucketName()); + Logger.d("remove from bucket: " + imageAndVideoBucketList.get(i).getBucketName()); if (!imageAndVideoBucketList.get(i).getBucketId().equals(ConstantField.ALL_IMAGES_BUCKET_ID)) { isDeleted = true; } diff --git a/app/src/main/java/xyz/eulix/space/manager/ThumbManager.java b/app/src/main/java/xyz/eulix/space/manager/ThumbManager.java index 8d7b0b2..45e1c9f 100644 --- a/app/src/main/java/xyz/eulix/space/manager/ThumbManager.java +++ b/app/src/main/java/xyz/eulix/space/manager/ThumbManager.java @@ -89,7 +89,7 @@ public synchronized void insertItem(String uuid, String from) { return; } if (downloadingZipList.contains(uuid)) { - Logger.d("zfy", "current thumb is downloading by zip " + uuid); + Logger.d("current thumb is downloading by zip " + uuid); return; } if (queueList.contains(uuid)) { @@ -106,7 +106,7 @@ public synchronized void insertItem(String uuid, String from) { public void start() { if (isCaching) { - Logger.d("zfy", "thumbs is caching"); + Logger.d("thumbs is caching"); } else { isCaching = true; startCore(); @@ -120,7 +120,7 @@ private void startCore() { } //限制数量 if (queueList.size() > 0) { - Logger.d("zfy", "0 thumb currentSize=" + currentList.size() + ",queueSize=" + queueList.size()); + Logger.d("0 thumb currentSize=" + currentList.size() + ",queueSize=" + queueList.size()); int realLimitCount = Math.min(LIMIT_COUNT, queueList.size()); while (currentList.size() < realLimitCount) { String tempUuidStr = ""; @@ -134,7 +134,7 @@ private void startCore() { if (TextUtils.isEmpty(tempUuidStr)) { break; } - Logger.d("zfy", "1 thumb currentSize=" + currentList.size() + ",queueSize=" + queueList.size()); + Logger.d("1 thumb currentSize=" + currentList.size() + ",queueSize=" + queueList.size()); final String uuidStr = tempUuidStr; executor.execute(() -> { if (localPathMap.contains(uuidStr)) { @@ -156,7 +156,7 @@ private void startCore() { } //发起缓存 - Logger.d("zfy", "thumb cache start!current uuid:" + uuidStr); + Logger.d("thumb cache start!current uuid:" + uuidStr); GatewayCommunicationBase gatewayCommunicationBase = GatewayUtils.generateGatewayCommunication(EulixSpaceApplication.getContext()); if (gatewayCommunicationBase != null) { String from = fromMap.get(uuidStr); @@ -169,7 +169,7 @@ private void startCore() { ConstantField.BoxVersionName.VERSION_0_1_0, EulixSpaceApplication.getContext(), from, new ThumbCacheCallback() { @Override public void onResult(String uuid, String absolutePath) { - Logger.d("zfy", "thumb cache success!uuid=" + uuid + ",path=" + absolutePath); + Logger.d("thumb cache success!uuid=" + uuid + ",path=" + absolutePath); currentList.remove(uuid); queueList.remove(uuid); fromMap.remove(uuid); @@ -187,20 +187,20 @@ public void onResult(String uuid, String absolutePath) { @Override public void onError(String msg) { - Logger.d("zfy", "thumb cache failed:" + msg); + Logger.d("thumb cache failed:" + msg); //单项最多重试次数限制 int thisItemFailedTime = 0; if (itemFailedTimes.containsKey(uuidStr)) { thisItemFailedTime = itemFailedTimes.get(uuidStr); } if (thisItemFailedTime < RETRY_TIME) { - Logger.d("zfy", "item " + uuidStr + " failed time is:" + thisItemFailedTime + ",retry!"); + Logger.d("item " + uuidStr + " failed time is:" + thisItemFailedTime + ",retry!"); currentList.remove(uuidStr); thisItemFailedTime++; itemFailedTimes.put(uuidStr, thisItemFailedTime); } else { //超过重试次数 - Logger.d("zfy", "item failed too many time,give up " + uuidStr); + Logger.d("item failed too many time,give up " + uuidStr); if (currentList.contains(uuidStr)) { currentList.remove(uuidStr); queueList.remove(uuidStr); @@ -222,13 +222,13 @@ public void onError(String msg) { } else if (isCaching) { isCaching = false; - Logger.d("zfy", "thumb cache stop! currentSize=" + currentList.size() + ",queueSize=" + queueList.size()); + Logger.d("thumb cache stop! currentSize=" + currentList.size() + ",queueSize=" + queueList.size()); } } //取消缓存 public void cancelCache() { - Logger.d("zfy", "thumb cache cancel"); + Logger.d("thumb cache cancel"); if (executor != null) { executor.shutdown(); executor = null; diff --git a/app/src/main/java/xyz/eulix/space/manager/TransferTaskManager.java b/app/src/main/java/xyz/eulix/space/manager/TransferTaskManager.java index 50f7783..95f9f69 100644 --- a/app/src/main/java/xyz/eulix/space/manager/TransferTaskManager.java +++ b/app/src/main/java/xyz/eulix/space/manager/TransferTaskManager.java @@ -165,7 +165,7 @@ private TransferTaskManager() { TransferItem item = unFinishDownList.get(i); if (item.state == TransferHelper.STATE_PREPARE) { mDownPrepareList.add(item); - Logger.d("zfy", "int mDownPrepareList size=" + mDownPrepareList.size()); + Logger.d("int mDownPrepareList size=" + mDownPrepareList.size()); } else if (item.state == TransferHelper.STATE_DOING) { mDownDoingList.add(item); } else if (item.state == TransferHelper.STATE_ERROR) { @@ -186,7 +186,7 @@ private TransferTaskManager() { public static synchronized TransferTaskManager getInstance() { if (sInstance == null) { - Logger.d("zfy", "create TransferTaskManager"); + Logger.d("create TransferTaskManager"); sInstance = new TransferTaskManager(); } return sInstance; @@ -197,22 +197,22 @@ public static synchronized TransferTaskManager getInstance() { public synchronized void insertUploadTask(String filepath, String filename, String remotePath, boolean insertFirst, String albumId) { File file = new File(filepath, filename); if (!file.exists()) { - Logger.d("zfy", "file to upload not exist"); + Logger.d("file to upload not exist"); return; } final String uniqueTag = TransferItemFactory.getUniqueTagWithAlbumId(TransferHelper.TYPE_UPLOAD, filename, filepath, remotePath, null, albumId); for (TransferItem item : mUploadDoingList) { if (uniqueTag.equals(item.ext1)) { - Logger.d("zfy", "upload doing list exist item"); + Logger.d("upload doing list exist item"); //复查数据库 TransferItem transferItem = TransferDBManager.getInstance(mContext).queryByUniqueTag(uniqueTag, TransferHelper.TYPE_UPLOAD); if (transferItem != null && transferItem.state == TransferHelper.STATE_DOING) { //数据库存在 - Logger.d("zfy", "file is uploading, exit"); + Logger.d("file is uploading, exit"); return; } else { //数据库不存在，删除当前正在进行列表数据 - Logger.d("zfy", "db not exist item"); + Logger.d("db not exist item"); mDownDoingList.remove(item); break; } @@ -237,7 +237,7 @@ public synchronized void insertUploadTask(String filepath, String filename, Stri TransferDBManager.getInstance(mContext).updateTransferInfo(uniqueTag, item, true); } else { - Logger.d("zfy", "create upload task"); + Logger.d("create upload task"); String fileMD5 = ""; item = TransferItemFactory.createUploadPrepareItem(mContext, filename, filepath, remotePath, file.length(), file.lastModified(), null, fileMD5, uniqueTag, false, albumId); @@ -273,14 +273,14 @@ public synchronized void insertUploadTaskList(List list, Strin String filePath = localItem.getMediaPath().substring(0, index + 1); File file = new File(filePath, fileName); if (!file.exists()) { - Logger.d("zfy", "file to upload not exist"); + Logger.d("file to upload not exist"); return; } final String uniqueTag = TransferItemFactory.getUniqueTagWithAlbumId(TransferHelper.TYPE_UPLOAD, fileName, filePath, remotePath, null, albumId); boolean isDoing = false; for (TransferItem item : mUploadDoingList) { if (uniqueTag.equals(item.ext1)) { - Logger.d("zfy", "file is uploading, exit"); + Logger.d("file is uploading, exit"); isDoing = true; break; } @@ -315,7 +315,7 @@ public synchronized void insertUploadTaskList(List list, Strin item.createTime = System.currentTimeMillis(); TransferDBManager.getInstance(mContext).updateTransferInfo(uniqueTag, item, true); } else { - Logger.d("zfy", "create upload task"); + Logger.d("create upload task"); String fileMD5 = ""; item = TransferItemFactory.createUploadPrepareItem(mContext, fileName, filePath, remotePath, file.length(), System.currentTimeMillis(), null, fileMD5, uniqueTag, false, albumId); mUploadPrepareList.add(0, item); @@ -340,7 +340,7 @@ public synchronized void insertUploadTaskList(List list, Strin //重试下载失败的任务 public synchronized void retryDownloadFailedItems() { - Logger.d("zfy", "retryDownloadFailedItems"); + Logger.d("retryDownloadFailedItems"); if (mDownFailedList.size() > 0) { for (TransferItem item : mDownFailedList) { insertDownloadTask(item.uuid, item.remotePath, item.keyName, item.totalSize, item.md5, true, item.ext2); @@ -352,12 +352,12 @@ public synchronized void retryDownloadFailedItems() { //重试下载失败的任务 public synchronized void retryUploadFailedItems() { - Logger.d("zfy", "retryUploadFailedItems"); + Logger.d("retryUploadFailedItems"); if (mUploadFailedList.size() > 0) { - Logger.d("zfy", "mUploadFailedList.size = " + mUploadFailedList.size()); + Logger.d("mUploadFailedList.size = " + mUploadFailedList.size()); for (TransferItem item : mUploadFailedList) { - Logger.d("zfy", "insert uploadTask:" + item.keyName); + Logger.d("insert uploadTask:" + item.keyName); insertUploadTask(item.localPath, item.keyName, item.remotePath, true, item.ext3); mUploadFailedList.remove(item); } @@ -510,7 +510,7 @@ public CustomUploadRunnable(TransferItem transferItem, ResultCallback callback) public void run() { File file = new File(transferItem.localPath, transferItem.keyName); if (!file.exists()) { - Logger.d("zfy", "file to upload not exist"); + Logger.d("file to upload not exist"); callback.onResult(false, FailCodeUtil.ERROR_UPLOAD_LOCAL_SOURCE_DELETE + ""); return; } @@ -539,7 +539,7 @@ public void run() { betag = betagCalculator.getFileBetag(); if (TextUtils.isEmpty(betag)) { if (isPaused) { - Logger.d("zfy", "customUploadRunnable is paused"); + Logger.d("customUploadRunnable is paused"); isFinished = true; } else { callback.onResult(false, ""); @@ -563,7 +563,7 @@ public void run() { //判断任务是否手动停止 if (isPaused) { - Logger.d("zfy", "customUploadRunnable is paused"); + Logger.d("customUploadRunnable is paused"); isFinished = true; return; } @@ -586,7 +586,7 @@ public void onGetUploadId(String uploadId) { @Override public void onProgress(long currentSize, long totalSize, long appendSize, boolean isPercentChange, boolean isResume) { if (isPercentChange) { -// Logger.d("zfy", "onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); +// Logger.d("onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); TransferDBManager.getInstance(mContext).updateTransferSize(transferItem.keyName, TransferHelper.TYPE_UPLOAD, currentSize, totalSize, true, transferItem.ext1); } } @@ -601,7 +601,7 @@ public void onProgress(long currentSize, long totalSize, long appendSize, boolea } } if (hasSameContentDoing) { - Logger.d("zfy", "has same betag task uploading"); + Logger.d("has same betag task uploading"); return; } @@ -619,7 +619,7 @@ public void onResult(boolean result, Object extraObj) { if (result && extraObj != null) { FileListItem fileListItem = (FileListItem) extraObj; String fileUuid = fileListItem.getUuid(); - Logger.d("zfy", "file upload success:" + transferItem.keyName + ";uuid=" + fileUuid); + Logger.d("file upload success:" + transferItem.keyName + ";uuid=" + fileUuid); if (!TextUtils.isEmpty(transferItem.ext3)) { TransferDBManager.getInstance(mContext).updateTransferRemotePath(transferItem.ext1, fileListItem.getPath()); //相簿更新路径 @@ -676,16 +676,16 @@ public synchronized void insertDownloadTask(String fileUuid, String filepath, St final String uniqueTag = TransferItemFactory.getUniqueTag(TransferHelper.TYPE_DOWNLOAD, null, null, null, fileUuid); for (TransferItem item : mDownDoingList) { if (uniqueTag.equals(item.ext1)) { - Logger.d("zfy", "download doing list exist item"); + Logger.d("download doing list exist item"); //复查数据库 TransferItem transferItem = TransferDBManager.getInstance(mContext).queryByUniqueTag(uniqueTag, TransferHelper.TYPE_DOWNLOAD); if (transferItem != null && transferItem.state == TransferHelper.STATE_DOING) { //数据库存在 - Logger.d("zfy", "file is downloading, exit"); + Logger.d("file is downloading, exit"); return; } else { //数据库不存在，删除当前数据 - Logger.d("zfy", "db not exist item"); + Logger.d("db not exist item"); mDownDoingList.remove(item); break; } @@ -700,10 +700,10 @@ public synchronized void insertDownloadTask(String fileUuid, String filepath, St //判断文件是否本地还在 File localFile = new File(dbItem.localPath, dbItem.keyName); if (localFile.exists()) { - Logger.d("zfy", "local file is exist"); + Logger.d("local file is exist"); long localFileSize = localFile.length(); if (fileSize == localFileSize) { - Logger.d("zfy", "local file size is match"); + Logger.d("local file size is match"); //修改时间 item.createTime = dbItem.createTime; TransferDBManager.getInstance(mContext).updateTransferInfo(uniqueTag, dbItem, true); @@ -724,7 +724,7 @@ public synchronized void insertDownloadTask(String fileUuid, String filepath, St TransferDBManager.getInstance(mContext).updateTransferInfo(uniqueTag, item, true); } else { - Logger.d("zfy", "create download task:" + filename); + Logger.d("create download task:" + filename); String localFilePath = getDownloadLocalFolderPath(filepath); //判断是否为本地文件未删除，仅下载记录删除 item = TransferItemFactory.createDownloadPrepareItem(filename, localFilePath, filepath, null, @@ -732,15 +732,15 @@ public synchronized void insertDownloadTask(String fileUuid, String filepath, St File localFile = new File(localFilePath, filename); boolean hasLocalFile = false; if (localFile.exists()) { - Logger.d("zfy", "local file is exist"); + Logger.d("local file is exist"); long localFileSize = localFile.length(); if (fileSize == localFileSize) { - Logger.d("zfy", "local file size is match"); + Logger.d("local file size is match"); hasLocalFile = true; } } if (hasLocalFile && item != null) { - Logger.d("zfy", "add finish record"); + Logger.d("add finish record"); item.state = TransferHelper.STATE_FINISH; TransferDBManager.getInstance(mContext).insert(item); return; @@ -768,7 +768,7 @@ public class DownWorkManager implements Runnable { // private ArrayList currentList = new ArrayList<>(); public DownWorkManager(BlockingDeque items) { - Logger.d("zfy", "#create DownWorkManager"); + Logger.d("#create DownWorkManager"); waitingQueue = items; } @@ -776,7 +776,7 @@ public DownWorkManager(BlockingDeque items) { public void run() { while (taskSwitch) { if (!NetUtils.isNetAvailable(mContext)) { - Logger.d("zfy", "no network, transfer task waiting"); + Logger.d("no network, transfer task waiting"); // retryDownloadFailedItems(); try { Thread.sleep(3000); @@ -789,7 +789,7 @@ public void run() { if (mDownloadCurrentList.size() < LIMIT_COUNT_DOWNLOAD) { try { TransferItem item = waitingQueue.take(); - Logger.d("zfy", "waitingQueue item:" + item.keyName + ";thread:" + Thread.currentThread()); + Logger.d("waitingQueue item:" + item.keyName + ";thread:" + Thread.currentThread()); mDownPrepareList.remove(item); mDownDoingList.add(item); mDownloadCurrentList.add(item); @@ -866,7 +866,7 @@ private void downWrap(TransferItem transferItem, ResultCallback callback) { for (TransferItem item : finishedList) { File finishedFile = new File(item.localPath, item.keyName); if (finishedFile.exists()) { - Logger.d("zfy", "has exist same md5 file,copy!"); + Logger.d("has exist same md5 file,copy!"); //复制文件 try { File targetFile = new File(transferItem.localPath, transferItem.keyName); @@ -892,7 +892,7 @@ private void downWrap(TransferItem transferItem, ResultCallback callback) { //判断任务是否手动停止 if (!mDownWorkManager.isTransferring(transferItem.ext1)) { - Logger.d("zfy", "task has removed, quite this thread"); + Logger.d("task has removed, quite this thread"); return; } @@ -905,7 +905,7 @@ private void downWrap(TransferItem transferItem, ResultCallback callback) { @Override public void onProgress(long currentSize, long totalSize, long appendSize, boolean isPercentChange, boolean isResume) { if (isPercentChange) { -// Logger.d("zfy", "onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); +// Logger.d("onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); TransferDBManager.getInstance(mContext).updateTransferSize(transferItem.keyName, transferItem.transferType, currentSize, totalSize, true, transferItem.ext1); } //统计传输速度 @@ -923,7 +923,7 @@ public void onProgress(long currentSize, long totalSize, long appendSize, boolea getLogItem(transferItem.ext1).taskEndTime = System.currentTimeMillis(); //更改数据库状态 if (result) { - Logger.d("zfy", "file download success:" + transferItem.keyName + ";uuid=" + transferItem.uuid); + Logger.d("file download success:" + transferItem.keyName + ";uuid=" + transferItem.uuid); TransferDBManager.getInstance(mContext).updateTransferState(transferItem.keyName, TransferHelper.TYPE_DOWNLOAD, TransferHelper.STATE_FINISH, 0, transferItem.uuid, true, transferItem.ext1); //加入媒体库 File file = new File(transferItem.localPath, transferItem.keyName); @@ -1296,7 +1296,7 @@ public void resetManagerData() { TransferItem item = unFinishDownList.get(i); if (item.state == TransferHelper.STATE_PREPARE) { mDownPrepareList.add(item); - Logger.d("zfy", "int mDownPrepareList size=" + mDownPrepareList.size()); + Logger.d("int mDownPrepareList size=" + mDownPrepareList.size()); } else if (item.state == TransferHelper.STATE_DOING) { mDownDoingList.add(item); } else if (item.state == TransferHelper.STATE_ERROR) { diff --git a/app/src/main/java/xyz/eulix/space/network/agent/AgentManager.java b/app/src/main/java/xyz/eulix/space/network/agent/AgentManager.java index 0740640..b54ecf4 100644 --- a/app/src/main/java/xyz/eulix/space/network/agent/AgentManager.java +++ b/app/src/main/java/xyz/eulix/space/network/agent/AgentManager.java @@ -119,12 +119,14 @@ private String generateBaseUrl(String boxDomain) { String baseUrl = boxDomain; if (baseUrl == null) { baseUrl = DebugUtil.getEnvironmentServices(); + Logger.w(TAG, "boxDomain is null, fallback baseUrl=" + Logger.safeUrl(baseUrl)); } else { while ((baseUrl.startsWith(":") || baseUrl.startsWith("/")) && baseUrl.length() > 1) { baseUrl = baseUrl.substring(1); } if (TextUtils.isEmpty(baseUrl)) { baseUrl = DebugUtil.getEnvironmentServices(); + Logger.w(TAG, "boxDomain is empty after normalize, fallback baseUrl=" + Logger.safeUrl(baseUrl)); } else { if (!(baseUrl.startsWith("http://") || baseUrl.startsWith("https://"))) { baseUrl = "https://" + baseUrl; @@ -134,6 +136,7 @@ private String generateBaseUrl(String boxDomain) { } } } + Logger.d(TAG, "generateBaseUrl result=" + Logger.safeUrl(baseUrl)); return baseUrl; } diff --git a/app/src/main/java/xyz/eulix/space/network/agent/DeviceManager.java b/app/src/main/java/xyz/eulix/space/network/agent/DeviceManager.java index 9e738ed..172b12f 100644 --- a/app/src/main/java/xyz/eulix/space/network/agent/DeviceManager.java +++ b/app/src/main/java/xyz/eulix/space/network/agent/DeviceManager.java @@ -125,12 +125,12 @@ public static void getLocalIps(String boxDomain, String accessToken, String secr .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "get local ip on subscribe"); + Logger.d("get local ip on subscribe"); } @Override public void onNext(LocalIpInfo localIpInfo) { - Logger.i("zfy", "on next: " + (localIpInfo == null ? "null" : localIpInfo.toString())); + Logger.i("on next: " + (localIpInfo == null ? "null" : localIpInfo.toString())); if (callback != null) { callback.onResult(localIpInfo); } @@ -139,7 +139,7 @@ public void onNext(LocalIpInfo localIpInfo) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "on error: " + errMsg); + Logger.e("on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -147,7 +147,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "get local ip on complete"); + Logger.d("get local ip on complete"); } }); } diff --git a/app/src/main/java/xyz/eulix/space/network/box/BKeyUtil.java b/app/src/main/java/xyz/eulix/space/network/box/BKeyUtil.java index 5ca37fb..68135bd 100644 --- a/app/src/main/java/xyz/eulix/space/network/box/BKeyUtil.java +++ b/app/src/main/java/xyz/eulix/space/network/box/BKeyUtil.java @@ -117,7 +117,7 @@ public void onResult(BKeyCreateResponseBody result) { } public static void obtainAuthResult(@NonNull Context context, String boxDomain, String boxUUID, String boxKey, boolean isAutoLogin, boolean isLAN, BKeyPollCallback callback) { - Logger.d("zfy", "#obtainAuthResult bKey=" + boxKey); + Logger.d("#obtainAuthResult bKey=" + boxKey); String finalBoxDomain = Urls.getBaseUrl(); if (finalBoxDomain != null) { diff --git a/app/src/main/java/xyz/eulix/space/network/files/FileListManager.java b/app/src/main/java/xyz/eulix/space/network/files/FileListManager.java index 1732cc2..9e4e7ce 100644 --- a/app/src/main/java/xyz/eulix/space/network/files/FileListManager.java +++ b/app/src/main/java/xyz/eulix/space/network/files/FileListManager.java @@ -606,7 +606,7 @@ public static void downloadFile(String fileUuid, String filepath, String filenam return; } - Logger.d("zfy", "start download:" + filename); + Logger.d("start download:" + filename); Logger.d("GarveyP2P", "http download single start"); OkHttpClient okHttpClient = OkHttpUtil.generateOkHttpClient(true).newBuilder() .addInterceptor(new EulixGatewayInterceptor(boxDomain, setUUIDMapping(UUID.fromString(fileUuid)), ConstantField.ServiceFunction.DOWNLOAD_FILE @@ -699,14 +699,14 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO File file = new File(nFilePathFinal, filename); if (file.exists()) { boolean result = file.delete(); - Logger.d("zfy", "delete file result =" + result); + Logger.d("delete file result =" + result); } Headers headers = response.headers(); String contentType = headers.get("content-type"); - Logger.d("zfy", "content-type = " + contentType); + Logger.d("content-type = " + contentType); if (TextUtils.isEmpty(contentType) || contentType.contains("json")) { //没有文件流，下载文件失败 - Logger.d("zfy", "no stream"); + Logger.d("no stream"); try { String cipherResponseText = response.body().string(); if (!TextUtils.isEmpty(cipherResponseText)) { @@ -715,17 +715,17 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (realCallResult != null) { String body = realCallResult.getBody(); String decryptBody = EncryptionUtil.decrypt(transformation, null, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "decryptBody=" + decryptBody); + Logger.d("decryptBody=" + decryptBody); } } } catch (Exception e) { - Logger.d("zfy", "exception " + e.getMessage()); + Logger.d("exception " + e.getMessage()); } TransferDBManager.getInstance(context).updateTransferState(filename, transferType, TransferHelper.STATE_ERROR, 0, null, true, uniqueTag); } else { //文件大小 String headerFileSizeStr = headers.get("file-size"); - Logger.d("zfy", "file-size=" + headerFileSizeStr); + Logger.d("file-size=" + headerFileSizeStr); if (TextUtils.isEmpty(headerFileSizeStr)) { headerFileSizeStr = "0"; } @@ -734,7 +734,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO TransferProgressListener progressListener = (currentSize, totalSize, appendSize, isPercentChange, isResume) -> { if (isPercentChange) { - Logger.d("zfy", "currentDownSize=" + currentSize + ",totalSize=" + totalSize); + Logger.d("currentDownSize=" + currentSize + ",totalSize=" + totalSize); //回调返回的totalSize为加密文件的值，与实际文件大小有区别 if (currentSize > fileSize) { currentSize = fileSize; @@ -755,12 +755,12 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (decryptFile != null) { //下载解析成功，size校验 long tempFileSize = decryptFile.length(); - Logger.d("zfy", "downloadSize=" + tempFileSize); - Logger.d("zfy", "targetSize=" + fileSize); + Logger.d("downloadSize=" + tempFileSize); + Logger.d("targetSize=" + fileSize); if (FILE_CHECK_SWITCH) { if (tempFileSize == fileSize) { - Logger.d("zfy", "size校验通过"); + Logger.d("size校验通过"); TransferDBManager.getInstance(context).updateTransferState(filename, transferType, TransferHelper.STATE_FINISH, 0, null, true, uniqueTag); if (!isCache) { AlbumNotifyHelper.insertToAlbum(context, decryptFile); @@ -769,16 +769,16 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO callback.onResult(true, decryptFile.getAbsolutePath()); } } else { - Logger.d("zfy", "size校验失败"); + Logger.d("size校验失败"); boolean result = decryptFile.delete(); - Logger.d("zfy", "decrypt file delete: " + result); + Logger.d("decrypt file delete: " + result); TransferDBManager.getInstance(context).updateTransferState(filename, transferType, TransferHelper.STATE_ERROR, -1, null, true, uniqueTag); if (callback != null) { callback.onResult(false, "size校验失败"); } } } else { - Logger.d("zfy", "下载完成"); + Logger.d("下载完成"); TransferDBManager.getInstance(context).updateTransferState(filename, transferType, TransferHelper.STATE_FINISH, 0, null, true, uniqueTag); if (!isCache) { AlbumNotifyHelper.insertToAlbum(context, decryptFile); @@ -842,7 +842,7 @@ public static void downloadThumb(UUID uuid, String boxDomain, String accessToken call.enqueue(new Callback() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - Logger.e("zfy", "get thumb on failure, e: " + e.getMessage()); + Logger.e("get thumb on failure, e: " + e.getMessage()); if (callback != null) { callback.onError("response not stream"); } @@ -850,21 +850,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { - Logger.i("zfy", "get thumb on response " + response.code()); + Logger.i("get thumb on response " + response.code()); if (!response.isSuccessful()) { return; } Headers headers = response.headers(); String contentType = headers.get("content-type"); - Logger.d("zfy", "thumb content-type = " + contentType); + Logger.d("thumb content-type = " + contentType); if (!TextUtils.isEmpty(contentType) && (contentType.contains("stream") || contentType.contains("image"))) { //文件大小 String fileSizeStr = headers.get("file-size"); - Logger.d("zfy", "file-size=" + fileSizeStr); + Logger.d("file-size=" + fileSizeStr); long fileSize = Long.parseLong(fileSizeStr); //文件名称等(inline; filename="header_chosen.jpg"; filename*=UTF-8''header_chosen.jpg) String contentDisposition = headers.get("content-disposition"); - Logger.d("zfy", "content-disposition=" + contentDisposition); + Logger.d("content-disposition=" + contentDisposition); String suffix = "jpg"; if (!TextUtils.isEmpty(contentDisposition)) { int contentDotIndex = contentDisposition.lastIndexOf("."); @@ -873,11 +873,11 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO Logger.d(TAG, "filepath: " + nFilePathFinal); FileUtil.mkFile(nFilePathFinal); String saveFileName = uuid.toString() + "." + suffix; - Logger.d("zfy", "saveFileName = " + saveFileName); + Logger.d("saveFileName = " + saveFileName); File file = new File(nFilePathFinal, saveFileName); if (file.exists()) { boolean result = file.delete(); - Logger.d("zfy", "delete file result =" + result); + Logger.d("delete file result =" + result); } InputStream inputStream = response.body().byteStream(); @@ -886,7 +886,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO File decryptFile = EncryptionUtil.decrypt(ConstantField.Algorithm.Transformation.AES_CBC_PKCS5, null, inputStream, secret, StandardCharsets.UTF_8, ivParams, nFilePathFinal, tempFileName, fileSize, null); if (decryptFile != null) { - Logger.d("zfy", "get thumb success." + decryptFile.getAbsolutePath()); + Logger.d("get thumb success." + decryptFile.getAbsolutePath()); //获取完成，修改名称 File finalFile = new File(nFilePathFinal, saveFileName); decryptFile.renameTo(finalFile); @@ -900,7 +900,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO } } } else {//没有文件流，下载文件失败 - Logger.d("zfy", "no stream"); + Logger.d("no stream"); if (callback != null) { callback.onError("response not stream"); } @@ -953,12 +953,12 @@ public static void downloadCompressed(UUID uuid, String filename, String boxDoma call.enqueue(new Callback() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - Logger.e("zfy", "get compressed on failure, e: " + e.getMessage()); + Logger.e("get compressed on failure, e: " + e.getMessage()); } @Override public void onResponse(@NotNull Call call, @NotNull Response response) { - Logger.i("zfy", "on response " + response.code()); + Logger.i("on response " + response.code()); if (!response.isSuccessful()) { if (listener != null) { listener.onResult(false, null); @@ -967,15 +967,15 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { } Headers headers = response.headers(); String contentType = headers.get("content-type"); - Logger.d("zfy", "content-type = " + contentType); + Logger.d("content-type = " + contentType); if (!TextUtils.isEmpty(contentType) && (contentType.contains("stream") || contentType.contains("image"))) { //文件大小 String fileSizeStr = headers.get("file-size"); - Logger.d("zfy", "file-size=" + fileSizeStr); + Logger.d("file-size=" + fileSizeStr); long fileSize = Long.parseLong(fileSizeStr); //文件名称等(inline; filename="header_chosen.jpg"; filename*=UTF-8''header_chosen.jpg) String contentDisposition = headers.get("content-disposition"); - Logger.d("zfy", "content-disposition=" + contentDisposition); + Logger.d("content-disposition=" + contentDisposition); String suffix = ""; if (!TextUtils.isEmpty(filename)) { int typeIndex = filename.lastIndexOf("."); @@ -988,17 +988,17 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { Logger.d(TAG, "filepath: " + nFilePathFinal); FileUtil.mkFile(nFilePathFinal); String saveFileName = uuid + "." + suffix; - Logger.d("zfy", "saveFileName = " + saveFileName); + Logger.d("saveFileName = " + saveFileName); File file = new File(nFilePathFinal, saveFileName); if (file.exists()) { boolean result = file.delete(); - Logger.d("zfy", "delete file result =" + result); + Logger.d("delete file result =" + result); } InputStream inputStream = response.body().byteStream(); TransferProgressListener progressListener = (currentSize, totalSize, appendSize, isPercentChange, isResume) -> { - Logger.d("zfy", "currentDownSize=" + currentSize + ",totalSize=" + totalSize); + Logger.d("currentDownSize=" + currentSize + ",totalSize=" + totalSize); if (isPercentChange) { TransferDBManager.getInstance(context).updateTransferSize(filename, TransferHelper.TYPE_CACHE, currentSize, totalSize, true, uniqueTag); } @@ -1009,7 +1009,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { secret, StandardCharsets.UTF_8, ivParams, nFilePathFinal, tempFileName, fileSize, progressListener); if (decryptFile != null) { //获取完成，修改名称 - Logger.d("zfy", "get compressed image success." + decryptFile.getAbsolutePath()); + Logger.d("get compressed image success." + decryptFile.getAbsolutePath()); File finalFile = new File(nFilePathFinal, saveFileName); decryptFile.renameTo(finalFile); ThumbManager.getInstance().insertLocalCompressPath(uuid.toString(), finalFile.getAbsolutePath()); @@ -1022,7 +1022,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { } } else { //没有文件流，下载文件失败 - Logger.d("zfy", "no stream:" + response.body().toString()); + Logger.d("no stream:" + response.body().toString()); listener.onResult(false, null); } } diff --git a/app/src/main/java/xyz/eulix/space/network/files/FileListUtil.java b/app/src/main/java/xyz/eulix/space/network/files/FileListUtil.java index 2f39f59..aa1b0cf 100644 --- a/app/src/main/java/xyz/eulix/space/network/files/FileListUtil.java +++ b/app/src/main/java/xyz/eulix/space/network/files/FileListUtil.java @@ -850,7 +850,7 @@ public static void uploadFileMultipart(Context context, String filepath, String TransferThreadPool.getInstance().execute(() -> { File file = new File(filepath, filename); if (!file.exists()) { - Logger.d("zfy", "file to upload not exist"); + Logger.d("file to upload not exist"); if (callback != null) { callback.onResult(false, FailCodeUtil.ERROR_UPLOAD_LOCAL_SOURCE_DELETE + ""); } @@ -919,7 +919,7 @@ public void onGetUploadId(String uploadId) { @Override public void onProgress(long currentSize, long totalSize, long appendSize, boolean isPercentChange, boolean isResume) { if (isPercentChange) { -// Logger.d("zfy", "onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); +// Logger.d("onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); TransferDBManager.getInstance(context).updateTransferSize(finalTransferItem.keyName, transferType, currentSize, totalSize, true, uniqueTag); } } @@ -935,7 +935,7 @@ public void onResult(boolean result, Object extraObj) { if (result && extraObj != null) { FileListItem fileListItem = (FileListItem) extraObj; String fileUuid = fileListItem.getUuid(); - Logger.d("zfy", "file upload success:" + filename + ";uuid=" + fileUuid); + Logger.d("file upload success:" + filename + ";uuid=" + fileUuid); if (!TextUtils.isEmpty(albumId)) { TransferDBManager.getInstance(context).updateTransferRemotePath(uniqueTag, fileListItem.getPath()); //相簿更新路径 @@ -1019,7 +1019,7 @@ public static void downloadFileMultipart(Context context, String uuidStr, String for (TransferItem item : finishedList) { File finishedFile = new File(item.localPath, item.keyName); if (finishedFile.exists()) { - Logger.d("zfy", "has exist same md5 file,copy!"); + Logger.d("has exist same md5 file,copy!"); //复制文件 try { @@ -1064,7 +1064,7 @@ public static void downloadFileMultipart(Context context, String uuidStr, String @Override public void onProgress(long currentSize, long totalSize, long appendSize, boolean isPercentChange, boolean isResume) { if (isPercentChange) { -// Logger.d("zfy", "onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); +// Logger.d("onProgressResult:currentSize=" + currentSize + ",totalSize=" + totalSize); TransferDBManager.getInstance(context).updateTransferSize(filename, transferType, currentSize, totalSize, true, uniqueTag); } //统计传输速度 @@ -1080,7 +1080,7 @@ public void onProgress(long currentSize, long totalSize, long appendSize, boolea TaskSpeed.getInstance().removeTask(uniqueTag); //更改数据库状态 if (result) { - Logger.d("zfy", "file download success:" + filename + ";uuid=" + uuidStr); + Logger.d("file download success:" + filename + ";uuid=" + uuidStr); TransferDBManager.getInstance(context).updateTransferState(filename, transferType, TransferHelper.STATE_FINISH, 0, uuidStr, true, uniqueTag); //加入媒体库 if (!isCache) { diff --git a/app/src/main/java/xyz/eulix/space/network/gateway/GatewayManager.java b/app/src/main/java/xyz/eulix/space/network/gateway/GatewayManager.java index 0b64e3b..e4f241a 100644 --- a/app/src/main/java/xyz/eulix/space/network/gateway/GatewayManager.java +++ b/app/src/main/java/xyz/eulix/space/network/gateway/GatewayManager.java @@ -126,12 +126,14 @@ private String generateBaseUrl(String boxDomain) { String baseUrl = boxDomain; if (baseUrl == null) { baseUrl = DebugUtil.getEnvironmentServices(); + Logger.w(TAG, "boxDomain is null, fallback baseUrl=" + Logger.safeUrl(baseUrl)); } else { while ((baseUrl.startsWith(":") || baseUrl.startsWith("/")) && baseUrl.length() > 1) { baseUrl = baseUrl.substring(1); } if (TextUtils.isEmpty(baseUrl)) { baseUrl = DebugUtil.getEnvironmentServices(); + Logger.w(TAG, "boxDomain is empty after normalize, fallback baseUrl=" + Logger.safeUrl(baseUrl)); } else { if (!(baseUrl.startsWith("http://") || baseUrl.startsWith("https://"))) { baseUrl = "https://" + baseUrl; @@ -141,6 +143,7 @@ private String generateBaseUrl(String boxDomain) { } } } + Logger.d(TAG, "generateBaseUrl result=" + Logger.safeUrl(baseUrl)); return baseUrl; } @@ -198,9 +201,10 @@ public void getSpaceStatus(String requestId, ISpaceStatusExtensionCallback callb call.enqueue(new Callback() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { + Logger.e(TAG, "getSpaceStatus request failed, requestId=" + requestId + + ", url=" + Logger.safeUrl(httpUrl.toString()), e); if (callback != null) { callback.onError(500, e.getMessage(), requestId); - e.printStackTrace(); } } diff --git a/app/src/main/java/xyz/eulix/space/network/interceptor/EulixGatewayInterceptor.java b/app/src/main/java/xyz/eulix/space/network/interceptor/EulixGatewayInterceptor.java index 6c35be6..daf9303 100644 --- a/app/src/main/java/xyz/eulix/space/network/interceptor/EulixGatewayInterceptor.java +++ b/app/src/main/java/xyz/eulix/space/network/interceptor/EulixGatewayInterceptor.java @@ -320,10 +320,10 @@ public Response intercept(@NotNull Chain chain) throws IOException { .post(cipherRequestBody) .url(baseUrl + apiUrl) .build(); - Logger.d("zfy", "request realCallRequest:" + new Gson().toJson(realCallRequest, RealCallRequest.class)); - Logger.d("zfy", "request url:" + baseUrl + apiUrl); - Logger.d("zfy", "request header:" + request.headers().toString()); - Logger.d("zfy", "request body:" + new Gson().toJson(callRequest, CallRequest.class)); + Logger.d("request realCallRequest:" + new Gson().toJson(realCallRequest, RealCallRequest.class)); + Logger.d("request url:" + baseUrl + apiUrl); + Logger.d("request header:" + request.headers().toString()); + Logger.d("request body:" + new Gson().toJson(callRequest, CallRequest.class)); finalUrl = (baseUrl + apiUrl); finalHeader = request.headers().toString(); } @@ -472,7 +472,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.UPLOAD_FILE: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "decryptBody = " + decryptBody); + Logger.d("decryptBody = " + decryptBody); if (decryptBody != null) { UploadResponseBodyResult fileListResponseBody = null; try { @@ -537,7 +537,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.PERSONALINFO_UPDATE: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "decryptBody = " + decryptBody); + Logger.d("decryptBody = " + decryptBody); if (decryptBody != null) { AccountInfoResult accountInfoResult = null; try { @@ -557,7 +557,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.PERSONALINFO_SHOW: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "PERSONALINFO_SHOW decryptBody = " + decryptBody); + Logger.d("PERSONALINFO_SHOW decryptBody = " + decryptBody); if (decryptBody != null) { AccountInfoResult accountInfoResult = null; try { @@ -596,7 +596,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.IMAGE_SHOW: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "decryptBody = " + decryptBody); + Logger.d("decryptBody = " + decryptBody); isDecrypt = true; } @@ -1101,7 +1101,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.SET_UPGRADE_CONFIG: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "get/set upgrade config decryptBody = " + decryptBody); + Logger.d("get/set upgrade config decryptBody = " + decryptBody); if (!TextUtils.isEmpty(decryptBody)) { UpgradeConfigResponseBody responseBody = null; try { @@ -1121,7 +1121,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.UPGRADE_STATUS: if (responseCode == 400) { //当前没有升级任务（升级已完成或未开始升级） - Logger.d("zfy", "check upgrade status, response 400"); + Logger.d("check upgrade status, response 400"); // break; } case ConstantField.ServiceFunction.UPGRADE_START_PULL: @@ -1129,9 +1129,9 @@ public Response intercept(@NotNull Chain chain) throws IOException { if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); if (requestType.equals(ConstantField.ServiceFunction.UPGRADE_START_UPGRADE)) { - Logger.d("zfy", "start upgrade decryptBody = " + decryptBody); + Logger.d("start upgrade decryptBody = " + decryptBody); } else { - Logger.d("zfy", "get upgrade status decryptBody = " + decryptBody); + Logger.d("get upgrade status decryptBody = " + decryptBody); } if (!TextUtils.isEmpty(decryptBody)) { UpgradeStatusResponseBody responseBody = null; @@ -1228,7 +1228,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.MULTIPART_CREATE_UPLOAD: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "multipart_create decryptBody:" + decryptBody); + Logger.d("multipart_create decryptBody:" + decryptBody); if (decryptBody != null) { UploadCreateResponseBody responseBody = null; try { @@ -1249,7 +1249,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.MULTIPART_LIST_UPLOAD: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "multipart_list decryptBody:" + decryptBody); + Logger.d("multipart_list decryptBody:" + decryptBody); if (decryptBody != null) { UploadListResponseBody responseBody = null; @@ -1271,7 +1271,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { case ConstantField.ServiceFunction.MULTIPART_COMPLETE_UPLOAD: if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "multipart_complete decryptBody=" + decryptBody); + Logger.d("multipart_complete decryptBody=" + decryptBody); if (decryptBody != null) { UploadCompleteResponseBody responseBody = null; try { @@ -1322,7 +1322,7 @@ public Response intercept(@NotNull Chain chain) throws IOException { cipherResponseBody.close(); if (isDecrypt) { ResponseBody plainResponseBody = ResponseBody.create(plainResponseText, responseMediaType); - Logger.d("zfy", "plainResponseText=" + plainResponseText); + Logger.d("plainResponseText=" + plainResponseText); if (errorInterceptor) { response = response.newBuilder() .code(200) @@ -1389,7 +1389,7 @@ private ResponseManageResult manageResponse(String body, Class clazz) { boolean isDecrypt = false; if (body != null) { String decryptBody = EncryptionUtil.decrypt(algorithm, provider, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "decryptBody:" + decryptBody); + Logger.d("decryptBody:" + decryptBody); if (decryptBody != null) { T responseBody = null; try { diff --git a/app/src/main/java/xyz/eulix/space/network/platform/PKeyManager.java b/app/src/main/java/xyz/eulix/space/network/platform/PKeyManager.java index 09a9d9c..1e7522b 100644 --- a/app/src/main/java/xyz/eulix/space/network/platform/PKeyManager.java +++ b/app/src/main/java/xyz/eulix/space/network/platform/PKeyManager.java @@ -70,6 +70,8 @@ public static void sendBoxInfo(String requestId, PKeyBoxInfo pKeyBoxInfo, IPKeyB OkHttpClient okHttpClient = OkHttpUtil.generateOkHttpClient(false); HttpUrl httpParseUrl = HttpUrl.parse((DebugUtil.getEnvironmentServices() + ConstantField.URL.AUTH_PLATFORM_KEY_BOX_INFO_API)); if (httpParseUrl != null) { + Logger.i(TAG, "sendBoxInfo request, requestId=" + requestId + + ", url=" + Logger.safeUrl(httpParseUrl.toString())); HttpUrl httpUrl = httpParseUrl.newBuilder() .build(); String requestBody = new Gson().toJson(pKeyBoxInfo, PKeyBoxInfo.class); @@ -82,7 +84,8 @@ public static void sendBoxInfo(String requestId, PKeyBoxInfo pKeyBoxInfo, IPKeyB call.enqueue(new Callback() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - Logger.e(TAG, "on failure, e: " + e.getMessage()); + Logger.e(TAG, "sendBoxInfo onFailure, requestId=" + requestId + + ", url=" + Logger.safeUrl(httpUrl.toString()), e); if (callback != null) { callback.onError(e.getMessage()); } @@ -92,12 +95,15 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { int code = response.code(); String message = response.message(); - Logger.i(TAG, "on response: " + code + ", message: " + message); + Logger.i(TAG, "sendBoxInfo onResponse, requestId=" + requestId + + ", code=" + code + ", message=" + message); if (callback != null) { callback.onResult(code); } } }); + } else { + Logger.e(TAG, "sendBoxInfo request url parse failed, requestId=" + requestId); } } @@ -106,6 +112,9 @@ public static void sendBoxInfoV2(String platformKey, String requestId, PKeyBoxIn HttpUrl httpParseUrl = HttpUrl.parse((DebugUtil.getOfficialEnvironmentServices() + ConstantField.URL.AUTH_PLATFORM_KEY_BOX_INFO_API_V2_PREFIX + StringUtil.nullToEmpty(platformKey) + ConstantField.URL.AUTH_PLATFORM_KEY_BOX_INFO_API_V2_SUFFIX)); if (httpParseUrl != null) { + Logger.i(TAG, "sendBoxInfoV2 request, requestId=" + requestId + + ", platformKey=" + Logger.maskMiddle(platformKey, 4, 4) + + ", url=" + Logger.safeUrl(httpParseUrl.toString())); HttpUrl httpUrl = httpParseUrl.newBuilder() .build(); String requestBody = new Gson().toJson(pKeyBoxInfo, PKeyBoxInfoV2.class); @@ -118,7 +127,8 @@ public static void sendBoxInfoV2(String platformKey, String requestId, PKeyBoxIn call.enqueue(new Callback() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - Logger.e(TAG, "on failure, e: " + e.getMessage()); + Logger.e(TAG, "sendBoxInfoV2 onFailure, requestId=" + requestId + + ", url=" + Logger.safeUrl(httpUrl.toString()), e); if (callback != null) { callback.onError(e.getMessage()); } @@ -128,12 +138,16 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { int code = response.code(); String message = response.message(); - Logger.i(TAG, "on response: " + code + ", message: " + message); + Logger.i(TAG, "sendBoxInfoV2 onResponse, requestId=" + requestId + + ", code=" + code + ", message=" + message); if (callback != null) { callback.onResult(code); } } }); + } else { + Logger.e(TAG, "sendBoxInfoV2 request url parse failed, requestId=" + requestId + + ", platformKey=" + Logger.maskMiddle(platformKey, 4, 4)); } } } diff --git a/app/src/main/java/xyz/eulix/space/network/register/RegisterDeviceManager.java b/app/src/main/java/xyz/eulix/space/network/register/RegisterDeviceManager.java index d1a2899..c778729 100644 --- a/app/src/main/java/xyz/eulix/space/network/register/RegisterDeviceManager.java +++ b/app/src/main/java/xyz/eulix/space/network/register/RegisterDeviceManager.java @@ -29,6 +29,7 @@ import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; import retrofit2.converter.gson.GsonConverterFactory; import xyz.eulix.space.util.ConstantField; +import xyz.eulix.space.util.DeploymentModeUtil; import xyz.eulix.space.util.Logger; /** @@ -40,6 +41,18 @@ public class RegisterDeviceManager { private static Retrofit retrofit; public static void registerDevice(RegisterDeviceRequestBody requestBody, final IRegisterDeviceCallback callback) { + Logger.i(TAG, "registerDevice start, noPlatformMode=" + DeploymentModeUtil.isNoPlatformMode() + + ", baseUrl=" + Logger.safeUrl(ConstantField.URL.BASE_SERVER_URL_RELEASE)); + if (DeploymentModeUtil.isNoPlatformMode()) { + Logger.d(TAG, "skip register-device request in no-platform mode"); + if (callback != null) { + RegisterDeviceResponseBody result = new RegisterDeviceResponseBody(); + result.setCode(200); + result.setData("skip register in no-platform mode"); + callback.onResult(result); + } + return; + } if (retrofit == null) { retrofit = new Retrofit.Builder() .baseUrl(ConstantField.URL.BASE_SERVER_URL_RELEASE) diff --git a/app/src/main/java/xyz/eulix/space/network/upgrade/UpgradeManager.java b/app/src/main/java/xyz/eulix/space/network/upgrade/UpgradeManager.java index 7a6634d..2e5e52a 100644 --- a/app/src/main/java/xyz/eulix/space/network/upgrade/UpgradeManager.java +++ b/app/src/main/java/xyz/eulix/space/network/upgrade/UpgradeManager.java @@ -104,15 +104,15 @@ public static void getSystemAutoUpgradeConfig(String boxDomain, String accessTok .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "get upgrade config on subscribe"); + Logger.d("get upgrade config on subscribe"); } @Override public void onNext(UpgradeConfigResponseBody baseRsp) { - Logger.d("zfy", "get upgrade config on next: " + (baseRsp == null ? "null" : baseRsp.toString())); + Logger.d("get upgrade config on next: " + (baseRsp == null ? "null" : baseRsp.toString())); if (callback != null) { if (baseRsp != null && baseRsp.getCodeInt() == 0) { - Logger.d("zfy", "baseRsp=" + baseRsp.toString()); + Logger.d("baseRsp=" + baseRsp.toString()); callback.onResult(baseRsp.autoDownload, baseRsp.autoInstall); } else { callback.onError(baseRsp != null ? baseRsp.getMessage() : ""); @@ -123,7 +123,7 @@ public void onNext(UpgradeConfigResponseBody baseRsp) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.d("zfy", "get upgrade config on error: " + errMsg); + Logger.d("get upgrade config on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -132,7 +132,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "get upgrade config on complete"); + Logger.d("get upgrade config on complete"); } }); } @@ -154,12 +154,12 @@ public static void setSystemAutoUpgradeConfig(boolean autoDownload, boolean auto .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "set upgrade config on subscribe"); + Logger.d("set upgrade config on subscribe"); } @Override public void onNext(BaseResponseBody baseRsp) { - Logger.d("zfy", "set upgrade config on next: " + (baseRsp == null ? "null" : baseRsp.toString())); + Logger.d("set upgrade config on next: " + (baseRsp == null ? "null" : baseRsp.toString())); if (callback != null) { callback.onResult(true, ""); } @@ -168,7 +168,7 @@ public void onNext(BaseResponseBody baseRsp) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.d("zfy", "set upgrade config on error: " + errMsg); + Logger.d("set upgrade config on error: " + errMsg); if (callback != null) { callback.onResult(null, errMsg); } @@ -177,7 +177,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "set upgrade config on complete"); + Logger.d("set upgrade config on complete"); } }); } @@ -195,15 +195,15 @@ public static void checkUpgradeStatus(String boxDomain, String accessToken, Stri .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "get upgrade status on subscribe"); + Logger.d("get upgrade status on subscribe"); } @Override public void onNext(UpgradeStatusResponseBody baseRsp) { - Logger.d("zfy", "get upgrade status on next: " + (baseRsp == null ? "null" : baseRsp.toString())); + Logger.d("get upgrade status on next: " + (baseRsp == null ? "null" : baseRsp.toString())); if (callback != null) { if (baseRsp != null && baseRsp.getCodeInt() == 0) { - Logger.d("zfy", "baseRsp=" + baseRsp.toString()); + Logger.d("baseRsp=" + baseRsp.toString()); // callback.onResult(baseRsp.autoInstall, baseRsp.autoDownload); callback.onResult(baseRsp); } else { @@ -215,7 +215,7 @@ public void onNext(UpgradeStatusResponseBody baseRsp) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.d("zfy", "get upgrade status on error: " + errMsg); + Logger.d("get upgrade status on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -224,7 +224,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "get upgrade status on complete"); + Logger.d("get upgrade status on complete"); } }); } @@ -263,12 +263,12 @@ public static void startUpgrade(Context context, boolean isPull, String versionI .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "start upgrade on subscribe"); + Logger.d("start upgrade on subscribe"); } @Override public void onNext(UpgradeStatusResponseBody responseBody) { - Logger.i("zfy", "start upgrade on next: " + (responseBody == null ? "null" : responseBody.toString())); + Logger.i("start upgrade on next: " + (responseBody == null ? "null" : responseBody.toString())); if (callback != null) { if (responseBody != null && responseBody.getCodeInt() == 0) { callback.onResult(true, null); @@ -288,7 +288,7 @@ public void onNext(UpgradeStatusResponseBody responseBody) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "start upgrade on error: " + errMsg); + Logger.e("start upgrade on error: " + errMsg); e.printStackTrace(); if (callback != null) { callback.onResult(null, errMsg); @@ -297,7 +297,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "start upgrade on complete"); + Logger.d("start upgrade on complete"); } }); } @@ -315,12 +315,12 @@ public static void getDeviceVersionInfo(Context context, String boxDomain, Strin .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "get device version info on subscribe"); + Logger.d("get device version info on subscribe"); } @Override public void onNext(DeviceVersionInfoResponseBody responseBody) { - Logger.i("zfy", "get device version info on next: " + (responseBody == null ? "null" : responseBody.toString())); + Logger.i("get device version info on next: " + (responseBody == null ? "null" : responseBody.toString())); if (callback != null) { if (responseBody != null && responseBody.getCodeInt() == 200) { callback.onResult(true, responseBody.results); @@ -333,7 +333,7 @@ public void onNext(DeviceVersionInfoResponseBody responseBody) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "get device version info on error: " + errMsg); + Logger.e("get device version info on error: " + errMsg); e.printStackTrace(); if (callback != null) { callback.onResult(false, errMsg); @@ -342,7 +342,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "get device version info on complete"); + Logger.d("get device version info on complete"); } }); } diff --git a/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoManager.java b/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoManager.java index 6938237..54c1ab3 100644 --- a/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoManager.java +++ b/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoManager.java @@ -312,7 +312,7 @@ public static void updateHeader(Context context, String clientUUID, String filep if (filepath != null && filename != null) { File file = new File(filepath, filename); if (file.exists()) { - Logger.d("zfy", "filePath=" + file.getAbsolutePath()); + Logger.d("filePath=" + file.getAbsolutePath()); HttpUrl httpParseUrl = HttpUrl.parse(generateBaseUrl(boxDomain) + ConstantField.URL.UPLOAD_GATEWAY_API); if (httpParseUrl != null) { HttpUrl httpUrl = httpParseUrl.newBuilder() @@ -324,7 +324,7 @@ public static void updateHeader(Context context, String clientUUID, String filep if (externalCacheDir != null) { String cachePath = externalCacheDir.getAbsolutePath() + "/header/"; FileUtil.mkFile(cachePath); - Logger.d("zfy", "cachePath=" + cachePath); + Logger.d("cachePath=" + cachePath); String fileMD5 = ""; try { @@ -365,14 +365,14 @@ public static void updateHeader(Context context, String clientUUID, String filep callRequestJson.put("headers", headerJsonObject); callRequestJson.put("entity", entityJsonObject); callRequestJson.put("serviceName", ConstantField.ServiceName.EULIXSPACE_ACCOUNT_SERVICE); - Logger.d("zfy", "callJson=" + callRequestJson.toString()); + Logger.d("callJson=" + callRequestJson.toString()); } catch (JSONException e) { e.printStackTrace(); } //加密callRequest String encryptCallJsonStr = EncryptionUtil.encrypt(ConstantField.Algorithm.Transformation.AES_CBC_PKCS5, null, callRequestJson.toString(), secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "encryptCallJsonStr=" + encryptCallJsonStr); + Logger.d("encryptCallJsonStr=" + encryptCallJsonStr); CallRequest callRequest = new CallRequest(); callRequest.setAccessToken(accessToken); @@ -388,19 +388,19 @@ public static void updateHeader(Context context, String clientUUID, String filep Integer code = uploadResponseBody.getCodeInt(); //删除加密缓存文件 if (encryptFile != null && encryptFile.exists()) { - Logger.d("zfy", "delete cache file"); + Logger.d("delete cache file"); boolean result = encryptFile.delete(); - Logger.d("zfy", "encrypt file delete: " + result); + Logger.d("encrypt file delete: " + result); } new Handler(context.getMainLooper()).post(() -> { if (code != null && code >= 200 && code < 300) { - Logger.d("zfy", "上传成功"); + Logger.d("上传成功"); if (listener != null) { listener.onResult(true, null); } } else { String message = uploadResponseBody.getMessage(); - Logger.d("zfy", "上传失败" + code + "\n" + message); + Logger.d("上传失败" + code + "\n" + message); listener.onResult(false, message); } }); @@ -431,7 +431,7 @@ public static void downloadHeader(Context context, String clientUUID, String aoi HttpUrl httpUrl = httpParseUrl.newBuilder() .addQueryParameter("aoid", aoid) .build(); - Logger.i("zfy", "download header url: " + httpUrl); + Logger.i("download header url: " + httpUrl); Request request = new Request.Builder() .url(httpUrl) .addHeader("Request-Id", uuid.toString()) @@ -468,18 +468,18 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { - Logger.i("zfy", "on response " + response.code()); + Logger.i("on response " + response.code()); if (!response.isSuccessful()) { return; } Headers headers = response.headers(); //文件大小 String fileSizeStr = headers.get("file-size"); - Logger.d("zfy", "file-size=" + fileSizeStr); + Logger.d("file-size=" + fileSizeStr); long fileSize = (fileSizeStr == null ? 0L : Long.parseLong(fileSizeStr)); //文件名称等(inline; filename="header_chosen.jpg"; filename*=UTF-8''header_chosen.jpg) String contentDisposition= headers.get("content-disposition"); - Logger.d("zfy", "content-disposition=" + contentDisposition); + Logger.d("content-disposition=" + contentDisposition); String suffix = "png"; if (contentDisposition != null && !TextUtils.isEmpty(contentDisposition)) { int contentDotIndex = contentDisposition.lastIndexOf("."); @@ -488,12 +488,12 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO String saveFilename = filename + "." + suffix; Logger.d(TAG, "filepath: " + nFilePathFinal); FileUtil.mkFile(nFilePathFinal); - Logger.d("zfy", "saveFileName = " + saveFilename); + Logger.d("saveFileName = " + saveFilename); File file = new File(nFilePathFinal, saveFilename); if (file.exists()) { boolean result = file.delete(); - Logger.d("zfy", "delete file result =" + result); + Logger.d("delete file result =" + result); } ResponseBody responseBody = response.body(); @@ -853,7 +853,7 @@ public static void revokeDevice(CreateTokenInfo createTokenInfo, String boxDomai UserInfoService service = retrofit.create(UserInfoService.class); Observable observable = service.revokeMember(uuid.toString(), createTokenInfo); if (isAdmin){ - Logger.d("zfy", "current is admin"); + Logger.d("current is admin"); observable = service.revokeAdmin(uuid.toString(), createTokenInfo); } observable.subscribeOn(Schedulers.trampoline()) @@ -866,7 +866,7 @@ public void onSubscribe(Disposable d) { @Override public void onNext(RevokeMemberResponseBody revokeMemberResult) { - Logger.i("zfy", "on next: " + (revokeMemberResult == null ? "null" : revokeMemberResult.toString())); + Logger.i("on next: " + (revokeMemberResult == null ? "null" : revokeMemberResult.toString())); if (callback != null) { callback.onResult(revokeMemberResult); } @@ -875,7 +875,7 @@ public void onNext(RevokeMemberResponseBody revokeMemberResult) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "on error: " + errMsg); + Logger.e("on error: " + errMsg); if (callback != null) { callback.onError(errMsg); if (e != null) { diff --git a/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoUtil.java b/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoUtil.java index a6cfcb2..d143de5 100644 --- a/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoUtil.java +++ b/app/src/main/java/xyz/eulix/space/network/userinfo/UserInfoUtil.java @@ -139,7 +139,7 @@ public void onResult(AccountInfoResult result) { } } if (isFind) { - Logger.d("zfy", "getUserInfo success, name:" + name + ",sign:" + sign); + Logger.d("getUserInfo success, name:" + name + ",sign:" + sign); Map userMap = new HashMap<>(); userMap.put(NICKNAME, name); userMap.put(SIGNATURE, sign); @@ -163,7 +163,7 @@ public void onResult(AccountInfoResult result) { @Override public void onError(String msg) { - Logger.d("zfy", "get user info error:" + msg); + Logger.d("get user info error:" + msg); } }); }); @@ -969,8 +969,8 @@ public static void revokeMember(Context context, boolean isAdmin, String passwor if (isFindSpace && !TextUtils.isEmpty(clientUuid)) { - Logger.d("zfy", "authKey=" + authKey); - Logger.d("zfy", "clientUuid=" + clientUuid); + Logger.d("authKey=" + authKey); + Logger.d("clientUuid=" + clientUuid); CreateTokenInfo createTokenInfo = new CreateTokenInfo(); createTokenInfo.setEncryptedAuthKey(EncryptionUtil.encrypt(ConstantField.Algorithm.Transformation.RSA_ECB_PKCS1 @@ -980,7 +980,7 @@ public static void revokeMember(Context context, boolean isAdmin, String passwor if (isAdmin) { String encryptPwd = EncryptionUtil.encrypt(ConstantField.Algorithm.Transformation.RSA_ECB_PKCS1 , null, password, boxPublicKeyValue, null, null); - Logger.d("zfy", "pwd=" + password + ";encryptPwd=" + encryptPwd); + Logger.d("pwd=" + password + ";encryptPwd=" + encryptPwd); createTokenInfo.setEncryptedPasscode(encryptPwd); } String baseUrl = Urls.getBaseUrl(); diff --git a/app/src/main/java/xyz/eulix/space/network/video/VideoNetManager.java b/app/src/main/java/xyz/eulix/space/network/video/VideoNetManager.java index f669d1d..42050a9 100644 --- a/app/src/main/java/xyz/eulix/space/network/video/VideoNetManager.java +++ b/app/src/main/java/xyz/eulix/space/network/video/VideoNetManager.java @@ -121,12 +121,12 @@ public static void checkVideoSupport(String uuid, GatewayCommunicationBase gatew .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "check video support on subscribe"); + Logger.d("check video support on subscribe"); } @Override public void onNext(BaseResponseBody responseBody) { - Logger.d("zfy", "check video support on next: " + (responseBody == null ? "null" : responseBody.toString())); + Logger.d("check video support on next: " + (responseBody == null ? "null" : responseBody.toString())); if (callback != null) { if (responseBody != null && responseBody.getCodeInt() == 200) { callback.onResult(true, null); @@ -139,7 +139,7 @@ public void onNext(BaseResponseBody responseBody) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "check video support on error: " + errMsg); + Logger.e("check video support on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -150,7 +150,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "check video support on complete"); + Logger.d("check video support on complete"); } }); } @@ -181,7 +181,7 @@ public static void downloadM3u8(Context context, String uuid, GatewayCommunicati HttpUrl httpUrl = httpParseUrl.newBuilder() .addQueryParameter("uuid", uuid) .build(); - Logger.d("zfy", "download file preview url: " + httpUrl); + Logger.d("download file preview url: " + httpUrl); Request request = new Request.Builder() .url(httpUrl) .get() @@ -200,12 +200,12 @@ public static void downloadM3u8(Context context, String uuid, GatewayCommunicati call.enqueue(new Callback() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - Logger.e("zfy", "get file preview on failure, e: " + e.getMessage()); + Logger.e("get file preview on failure, e: " + e.getMessage()); } @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { - Logger.i("zfy", "on response " + response.code()); + Logger.i("on response " + response.code()); if (!response.isSuccessful()) { if (callback != null) { callback.onResult(false, null); @@ -214,25 +214,25 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO } Headers headers = response.headers(); String contentType = headers.get("content-type"); - Logger.d("zfy", "content-type = " + contentType); + Logger.d("content-type = " + contentType); if (!TextUtils.isEmpty(contentType) && (contentType.contains("stream") || contentType.contains("zip"))) { //文件大小 String fileSizeStr = headers.get("file-size"); - Logger.d("zfy", "file-size=" + fileSizeStr); + Logger.d("file-size=" + fileSizeStr); long fileSize = Long.parseLong(fileSizeStr); //文件名称等(inline; filename="header_chosen.jpg"; filename*=UTF-8''header_chosen.jpg) String contentDisposition = headers.get("content-disposition"); - Logger.d("zfy", "content-disposition=" + contentDisposition); + Logger.d("content-disposition=" + contentDisposition); String suffix = "zip"; - Logger.d("zfy", "filepath: " + nFilePathFinal); + Logger.d("filepath: " + nFilePathFinal); FileUtil.mkFile(nFilePathFinal); String saveFileName = "m3u8_" + uuid + "." + suffix; - Logger.d("zfy", "saveFileName = " + saveFileName); + Logger.d("saveFileName = " + saveFileName); File file = new File(nFilePathFinal, saveFileName); if (file.exists()) { boolean result = file.delete(); - Logger.d("zfy", "delete file result =" + result); + Logger.d("delete file result =" + result); } InputStream inputStream = response.body().byteStream(); @@ -241,7 +241,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO File decryptFile = EncryptionUtil.decrypt(ConstantField.Algorithm.Transformation.AES_CBC_PKCS5, null, inputStream, secret, StandardCharsets.UTF_8, ivParams, nFilePathFinal, saveFileName, fileSize, null); if (decryptFile != null) { - Logger.d("zfy", "get file preview success." + decryptFile.getAbsolutePath()); + Logger.d("get file preview success." + decryptFile.getAbsolutePath()); //回调 if (callback != null) { callback.onResult(true, decryptFile.getAbsolutePath()); @@ -251,7 +251,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO } } else { //没有文件流，下载文件失败 - Logger.d("zfy", "no stream:" + response.body().toString()); + Logger.d("no stream:" + response.body().toString()); if (callback != null) { callback.onResult(false, null); } diff --git a/app/src/main/java/xyz/eulix/space/presenter/AboutUsPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/AboutUsPresenter.java index dcfc557..20ebc48 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/AboutUsPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/AboutUsPresenter.java @@ -138,7 +138,7 @@ public void getDeviceVersionDetailInfo() { UpgradeUtils.getDeviceVersionDetailInfo(context, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { - Logger.d("zfy", "getDeviceVersionDetailInfo onResult:" + result + ",extraObj:" + extraObj.toString()); + Logger.d("getDeviceVersionDetailInfo onResult:" + result + ",extraObj:" + extraObj.toString()); if (result) { deviceVersionInfoBean = (DeviceVersionInfoBean) extraObj; Gson gson = new Gson(); @@ -156,7 +156,7 @@ public void onResult(boolean result, Object extraObj) { @Override public void onError(String msg) { - Logger.d("zfy", "getDeviceVersionDetailInfo onError " + msg); + Logger.d("getDeviceVersionDetailInfo onError " + msg); iView.refreshDeviceInfoViews(null); } }); diff --git a/app/src/main/java/xyz/eulix/space/presenter/AutoUpdateSettingPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/AutoUpdateSettingPresenter.java index 5846a35..bab87c7 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/AutoUpdateSettingPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/AutoUpdateSettingPresenter.java @@ -50,7 +50,7 @@ public void getAutoUpgradeConfig() { UpgradeUtils.getSystemAutoUpgradeConfig(context, new IGetUpgradeConfigCallback() { @Override public void onResult(boolean autoDownload, boolean autoInstall) { - Logger.d("zfy", "autoDownload = " + autoDownload + ",autoInstall = " + autoInstall); + Logger.d("autoDownload = " + autoDownload + ",autoInstall = " + autoInstall); PreferenceUtil.saveUpgradeAutoDownload(context, autoDownload); PreferenceUtil.saveUpgradeAutoInstall(context, autoInstall); iView.setResult(autoDownload, autoInstall); @@ -58,7 +58,7 @@ public void onResult(boolean autoDownload, boolean autoInstall) { @Override public void onError(String msg) { - Logger.d("zfy", "get system auto upgrade config error:" + msg); + Logger.d("get system auto upgrade config error:" + msg); iView.setFailed(true); } }); diff --git a/app/src/main/java/xyz/eulix/space/presenter/BoxSystemDetailPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/BoxSystemDetailPresenter.java index 1eefeec..531af59 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/BoxSystemDetailPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/BoxSystemDetailPresenter.java @@ -63,7 +63,7 @@ public void checkBoxVersion() { public void onResult(VersionCheckResponseBody responseBody) { if (responseBody != null && responseBody.results != null) { VersionCheckResponseBody.Results results = responseBody.results; - Logger.d("zfy", "result newVersionExist:" + results.newVersionExist); + Logger.d("result newVersionExist:" + results.newVersionExist); if (results.newVersionExist && results.latestBoxPkg != null) { ConstantField.boxVersionCheckBody = results; @@ -81,7 +81,7 @@ public void onResult(VersionCheckResponseBody responseBody) { @Override public void onError(String msg) { - Logger.d("zfy", "checkVersion error:" + msg); + Logger.d("checkVersion error:" + msg); iView.onCheckError(""); } }); @@ -92,7 +92,7 @@ public void getDeviceVersionDetailInfo() { UpgradeUtils.getDeviceVersionDetailInfo(context, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { - Logger.d("zfy", "getDeviceVersionDetailInfo onResult:" + result + ",extraObj:" + extraObj.toString()); + Logger.d("getDeviceVersionDetailInfo onResult:" + result + ",extraObj:" + extraObj.toString()); if (result) { DeviceVersionInfoBean deviceVersionInfoBean = (DeviceVersionInfoBean) extraObj; iView.onGetDeviceVersionInfo(true, deviceVersionInfoBean); @@ -110,7 +110,7 @@ public void onResult(boolean result, Object extraObj) { @Override public void onError(String msg) { - Logger.d("zfy", "getDeviceVersionDetailInfo onError " + msg); + Logger.d("getDeviceVersionDetailInfo onError " + msg); iView.onGetDeviceVersionInfo(false, null); } }); diff --git a/app/src/main/java/xyz/eulix/space/presenter/DeviceManagePresenter.java b/app/src/main/java/xyz/eulix/space/presenter/DeviceManagePresenter.java index cba3dcb..76d2a69 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/DeviceManagePresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/DeviceManagePresenter.java @@ -220,7 +220,7 @@ public void revokeDevice() { public void onSuccess(String source, int code, String boxUuidValue, String boxBindValue, String extraMsg, boolean isSuccess) { if (isSuccess) { //解绑成功 - Logger.d("zfy", "revoke member success, box uuid: " + boxUuidValue + ", bind: " + boxBindValue); + Logger.d("revoke member success, box uuid: " + boxUuidValue + ", bind: " + boxBindValue); //删除盒子数据 if (boxUuidValue != null && boxBindValue != null) { DataUtil.boxUnavailable(boxUuidValue, boxBindValue); @@ -283,7 +283,7 @@ public void getDeviceVersionDetailInfo() { UpgradeUtils.getDeviceVersionDetailInfo(context, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { - Logger.d("zfy", "getDeviceVersionDetailInfo onResult:" + result + ",extraObj:" + extraObj.toString()); + Logger.d("getDeviceVersionDetailInfo onResult:" + result + ",extraObj:" + extraObj.toString()); if (result) { deviceVersionInfoBean = (DeviceVersionInfoBean) extraObj; Gson gson = new Gson(); @@ -301,7 +301,7 @@ public void onResult(boolean result, Object extraObj) { @Override public void onError(String msg) { - Logger.d("zfy", "getDeviceVersionDetailInfo onError " + msg); + Logger.d("getDeviceVersionDetailInfo onError " + msg); iView.refreshDeviceInfoViews(null); } }); diff --git a/app/src/main/java/xyz/eulix/space/presenter/FilePreviewPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/FilePreviewPresenter.java index 7fe279c..a1ee286 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/FilePreviewPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/FilePreviewPresenter.java @@ -100,7 +100,7 @@ public void checkFileExist(Activity activity, String fileName, String fileUuid, for (TransferItem item : finishList) { File localFile = new File(item.localPath, item.keyName); if (localFile.exists()) { - Logger.d("zfy", "has transferred item,open local file"); + Logger.d("has transferred item,open local file"); iView.showPreview(localFile.getAbsolutePath(), true); return; } @@ -148,7 +148,7 @@ public void run() { iView.showPreview(path, false); } else { // 下载压缩图失败，缓存原图 - Logger.d("zfy", "download compressed image failed,start download original image"); + Logger.d("download compressed image failed,start download original image"); FileListUtil.downloadFile(context, fileUuid, filePath, fileName, fileSize, md5, true, from, null); } } diff --git a/app/src/main/java/xyz/eulix/space/presenter/GranterLoginPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/GranterLoginPresenter.java index b5e1b5c..8b3fc67 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/GranterLoginPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/GranterLoginPresenter.java @@ -40,6 +40,7 @@ import xyz.eulix.space.network.platform.PKeyUtil; import xyz.eulix.space.util.ConstantField; import xyz.eulix.space.util.DataUtil; +import xyz.eulix.space.util.Logger; import xyz.eulix.space.util.ThreadPool; /** @@ -48,6 +49,7 @@ * date: 2021/8/10 15:08 */ public class GranterLoginPresenter extends AbsPresenter { + private static final String TAG = GranterLoginPresenter.class.getSimpleName(); private CountDownTimer countDownTimer; private static final int SECOND_UNIT = 1000; private static final int timeSecond = 30; @@ -68,6 +70,7 @@ public interface IGranterLogin extends IBaseView { private PKeyBoxInfoCallback pKeyBoxInfoCallback = new PKeyBoxInfoCallback() { @Override public void onError(String msg) { + Logger.e(TAG, "send box info callback onError: " + msg); if (iView != null) { iView.boxInfoCallback(false, msg); } @@ -75,6 +78,7 @@ public void onError(String msg) { @Override public void onFailed(int code) { + Logger.w(TAG, "send box info callback onFailed, code=" + code); if (iView != null) { iView.boxInfoCallback(false, String.valueOf(code)); } @@ -82,6 +86,7 @@ public void onFailed(int code) { @Override public void onSuccess(int code) { + Logger.i(TAG, "send box info callback onSuccess, code=" + code); if (iView != null) { iView.boxInfoCallback(true, String.valueOf(code)); } @@ -165,6 +170,9 @@ public String getAccountName() { } public boolean sendBoxInfo(String boxKey, String platformKey, String lanDomain, String lanIp) { + Logger.i(TAG, "start sendBoxInfo, boxKey=" + Logger.maskMiddle(boxKey, 4, 4) + + ", platformKey=" + Logger.maskMiddle(platformKey, 4, 4) + + ", lanDomain=" + lanDomain + ", lanIp=" + lanIp); boolean result = false; String boxDomainValue = null; String boxPublicKeyValue = null; @@ -191,14 +199,17 @@ public boolean sendBoxInfo(String boxKey, String platformKey, String lanDomain, result = true; String boxDomain = boxDomainValue; String boxPubKey = boxPublicKeyValue; + Logger.d(TAG, "active box found for sendBoxInfo, boxDomain=" + Logger.safeUrl(boxDomain) + + ", boxPubKeyAvailable=" + (boxPubKey != null && boxPubKey.length() > 0)); try { // ThreadPool.getInstance().execute(() -> PKeyUtil.sendBoxInfo(boxKey, boxDomain, boxPubKey, platformKey, pKeyBoxInfoCallback)); ThreadPool.getInstance().execute(() -> PKeyUtil.sendBoxInfoV2(boxKey, boxDomain, boxPubKey, platformKey, lanDomain, lanIp, pKeyBoxInfoCallback)); } catch (RejectedExecutionException e) { - e.printStackTrace(); + Logger.e(TAG, "sendBoxInfo task rejected", e); } } if (!result && iView != null) { + Logger.w(TAG, "sendBoxInfo aborted, no active/offline-use box found with domain and public key"); iView.boxInfoCallback(false, null); } return result; diff --git a/app/src/main/java/xyz/eulix/space/presenter/ImgPreviewFragmentPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/ImgPreviewFragmentPresenter.java index bf3bf67..97f9c5b 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/ImgPreviewFragmentPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/ImgPreviewFragmentPresenter.java @@ -62,7 +62,7 @@ public void checkFileExist(Context context, String fileName, String fileUuid, St for (TransferItem item : finishList) { File localFile = new File(item.localPath, item.keyName); if (localFile.exists()) { - Logger.d("zfy", "has transferred item,open local file"); + Logger.d("has transferred item,open local file"); if (mimeType.contains("video")) { iView.showVideoPreview(localFile.getAbsolutePath()); return; @@ -137,7 +137,7 @@ public void run() { } } else if (mimeType.contains("image")){ //下载压缩图失败，缓存原图 - Logger.d("zfy", "download compressed image failed,start download original image"); + Logger.d("download compressed image failed,start download original image"); FileListUtil.downloadFile(context, fileUuid, filePath, fileName, fileSize, md5, true, from, null); } } diff --git a/app/src/main/java/xyz/eulix/space/presenter/LanIpInputPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/LanIpInputPresenter.java index c87a3a4..8092976 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/LanIpInputPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/LanIpInputPresenter.java @@ -47,7 +47,7 @@ public void checkDomainAvailable(String domain) { ThreadPool.getInstance().execute(() -> gatewayManager.getSpaceStatus(new ISpaceStatusCallback() { @Override public void onResult(SpaceStatusResult result) { - Logger.d("zfy", "checkConnectStates on result: " + result); + Logger.d("checkConnectStates on result: " + result); if (result != null) { iView.onCheckDomainResult(true); } else { @@ -57,7 +57,7 @@ public void onResult(SpaceStatusResult result) { @Override public void onError(String errMsg) { - Logger.d("zfy", "checkConnectStates on error: " + errMsg); + Logger.d("checkConnectStates on error: " + errMsg); iView.onCheckDomainResult(false); } })); diff --git a/app/src/main/java/xyz/eulix/space/presenter/MainPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/MainPresenter.java index 707c04f..0aca43c 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/MainPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/MainPresenter.java @@ -424,7 +424,7 @@ public void checkBoxVersion() { public void onResult(VersionCheckResponseBody responseBody) { if (responseBody != null && responseBody.results != null) { VersionCheckResponseBody.Results results = responseBody.results; - Logger.d("zfy", "result newVersionExist:" + results.newVersionExist); + Logger.d("result newVersionExist:" + results.newVersionExist); if (results.newVersionExist && results.latestBoxPkg != null) { ConstantField.boxVersionCheckBody = results; @@ -437,7 +437,7 @@ public void onResult(VersionCheckResponseBody responseBody) { @Override public void onError(String msg) { - Logger.d("zfy", "checkVersion error:" + msg); + Logger.d("checkVersion error:" + msg); } }); } @@ -445,7 +445,7 @@ public void onError(String msg) { public void getCurrentBoxVersion() { GatewayUtil.getCurrentBoxVersion(context, (result, extraMsg) -> { if (result && !TextUtils.isEmpty(extraMsg)) { - Logger.d("zfy", "get current box version:" + extraMsg); + Logger.d("get current box version:" + extraMsg); PreferenceUtil.saveCurrentBoxVersion(context, extraMsg); } }); @@ -492,7 +492,7 @@ public void setUpdateDescription(String updateDescription) { } public void upgradeDbAccountValue() { - Logger.d("zfy", "#upgradeDbAccountValue"); + Logger.d("#upgradeDbAccountValue"); ThreadPool.getInstance().getBackThreadPoolExecutor().execute(() -> { String clientUuid = DataUtil.getClientUuid(EulixSpaceApplication.getContext()); List> boxValues = EulixSpaceDBUtil.queryBox(EulixSpaceApplication.getContext()); @@ -505,10 +505,10 @@ public void upgradeDbAccountValue() { && boxValue.containsKey(EulixSpaceDBManager.FIELD_BOX_STATUS)) { String boxUuid = boxValue.get(EulixSpaceDBManager.FIELD_BOX_UUID); - Logger.d("zfy", "boxUuid=" + boxUuid); + Logger.d("boxUuid=" + boxUuid); if (boxUpgradeStateMap.containsKey(boxUuid) && Boolean.TRUE.equals(boxUpgradeStateMap.get(boxUuid))) { //该盒子已处理过 - Logger.d("zfy", "this box value has upgraded"); + Logger.d("this box value has upgraded"); continue; } boolean hasMultiUser = false; @@ -520,14 +520,14 @@ public void upgradeDbAccountValue() { } if (hasMultiUser) { //该盒子上有多个用户 - Logger.d("zfy", "has multi user"); + Logger.d("has multi user"); CacheDBManager.getInstance(EulixSpaceApplication.getContext()).deleteByAccount(boxUuid); TransferDBManager.getInstance(EulixSpaceApplication.getContext()).deleteByAccount(boxUuid); } else { //该盒子上只有一个用户 - Logger.d("zfy", "only one user"); + Logger.d("only one user"); String userId = getUserIdByBox(boxValue, clientUuid); - Logger.d("zfy", "userId = " + userId); + Logger.d("userId = " + userId); String newAccount = boxUuid + userId; CacheDBManager.getInstance(EulixSpaceApplication.getContext()).upgradeAccountValue(boxUuid, newAccount); TransferDBManager.getInstance(EulixSpaceApplication.getContext()).upgradeAccountValue(boxUuid, newAccount); diff --git a/app/src/main/java/xyz/eulix/space/presenter/SpacePlatformEnvironmentPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/SpacePlatformEnvironmentPresenter.java index 85ca8fd..23b5702 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/SpacePlatformEnvironmentPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/SpacePlatformEnvironmentPresenter.java @@ -90,32 +90,10 @@ public SpacePlatformInfo getSpacePlatformInfo() { } } if (subHost != null && !TextUtils.isEmpty(subHost)) { - boolean isOfficialSpaceDomain = true; - String serverUrl = null; - switch (subHost) { - case ConstantField.URL.PROD_SPACE_API: - serverUrl = ConstantField.URL.PROD_WEB_BASE_URL; - break; - case ConstantField.URL.RC_SPACE_API: - serverUrl = ConstantField.URL.RC_WEB_BASE_URL; - break; - case ConstantField.URL.DEV_SPACE_API: - serverUrl = ConstantField.URL.DEV_WEB_BASE_URL; - break; - case ConstantField.URL.TEST_SPACE_API: - serverUrl = ConstantField.URL.TEST_WEB_BASE_URL; - break; - case ConstantField.URL.QA_SPACE_API: - serverUrl = ConstantField.URL.QA_WEB_BASE_URL; - break; - case ConstantField.URL.SIT_SPACE_API: - serverUrl = ConstantField.URL.SIT_WEB_BASE_URL; - break; - default: - isOfficialSpaceDomain = false; - serverUrl = "https://" + subHost; - break; - } + boolean isOfficialSpaceDomain = ConstantField.URL.PROD_SPACE_API.equals(subHost); + String serverUrl = isOfficialSpaceDomain + ? ConstantField.URL.PROD_WEB_BASE_URL + : "https://" + subHost; spacePlatformInfo = new SpacePlatformInfo(); spacePlatformInfo.setPrivateSpacePlatform(!isOfficialSpaceDomain); spacePlatformInfo.setPlatformServerUrl(serverUrl); diff --git a/app/src/main/java/xyz/eulix/space/presenter/SystemUpdatePresenter.java b/app/src/main/java/xyz/eulix/space/presenter/SystemUpdatePresenter.java index 5b1af47..3cc70ad 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/SystemUpdatePresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/SystemUpdatePresenter.java @@ -93,7 +93,7 @@ public void checkBoxVersion(ResultCallbackObj callback) { public void onResult(VersionCheckResponseBody responseBody) { if (responseBody != null && responseBody.results != null) { VersionCheckResponseBody.Results results = responseBody.results; - Logger.d("zfy", "result newVersionExist:" + results.newVersionExist); + Logger.d("result newVersionExist:" + results.newVersionExist); if (results.newVersionExist && results.latestBoxPkg != null) { ConstantField.boxVersionCheckBody = results; @@ -114,7 +114,7 @@ public void onResult(VersionCheckResponseBody responseBody) { @Override public void onError(String msg) { - Logger.d("zfy", "checkVersion error:" + msg); + Logger.d("checkVersion error:" + msg); ConstantField.boxVersionCheckBody = null; EventBusUtil.post(new BoxVersionCheckEvent()); iView.onCheckVersionError(); @@ -127,7 +127,7 @@ public void getAutoUpgradeConfig() { UpgradeUtils.getSystemAutoUpgradeConfig(context, new IGetUpgradeConfigCallback() { @Override public void onResult(boolean autoDownload, boolean autoInstall) { - Logger.d("zfy", "autoDownload = " + autoDownload + ",autoInstall = " + autoInstall); + Logger.d("autoDownload = " + autoDownload + ",autoInstall = " + autoInstall); PreferenceUtil.saveUpgradeAutoDownload(context, autoDownload); PreferenceUtil.saveUpgradeAutoInstall(context, autoInstall); iView.refreshConfigState(autoDownload || autoInstall); @@ -135,7 +135,7 @@ public void onResult(boolean autoDownload, boolean autoInstall) { @Override public void onError(String msg) { - Logger.d("zfy", "get system auto upgrade config error:" + msg); + Logger.d("get system auto upgrade config error:" + msg); } }); } @@ -143,7 +143,7 @@ public void onError(String msg) { public void getCurrentBoxVersion() { GatewayUtil.getCurrentBoxVersion(context, (result, extraMsg) -> { if (result && !TextUtils.isEmpty(extraMsg)) { - Logger.d("zfy", "get current box version:" + extraMsg); + Logger.d("get current box version:" + extraMsg); iView.onGetCurrentVersion(extraMsg); } }); @@ -154,7 +154,7 @@ public void checkUpgradeStatusOnce(ResultCallback callback) { UpgradeUtils.checkUpgradeStatus(context, new ICheckUpgradeStatusCallback() { @Override public void onResult(UpgradeStatusResponseBody upgradeStatusResponseBody) { - Logger.d("zfy", "check upgrade status:" + upgradeStatusResponseBody.status); + Logger.d("check upgrade status:" + upgradeStatusResponseBody.status); if (!TextUtils.isEmpty(upgradeStatusResponseBody.status)) { callback.onResult(true, upgradeStatusResponseBody.status); } else { @@ -174,7 +174,7 @@ public void checkUpgradeStatus() { UpgradeUtils.checkUpgradeStatus(context, new ICheckUpgradeStatusCallback() { @Override public void onResult(UpgradeStatusResponseBody upgradeStatusResponseBody) { - Logger.d("zfy", "check upgrade status:" + upgradeStatusResponseBody.status); + Logger.d("check upgrade status:" + upgradeStatusResponseBody.status); if (sUpgradeState == STATE_NORMAL) { //方式重复接收 return; @@ -198,28 +198,28 @@ public void onResult(UpgradeStatusResponseBody upgradeStatusResponseBody) { @Override public void onError(String msg) { - Logger.d("zfy", "check upgrade status error:" + msg); + Logger.d("check upgrade status error:" + msg); if (sUpgradeState >= STATE_POLLING && !TextUtils.isEmpty(msg)) { if (msg.equals("closed")) { //开始正常轮询，网络断开，说明镜像开始重启，延迟轮询时间 if (sUpgradeState == STATE_POLLING) { sUpgradeState = STATE_DOCKER_RESTART; - Logger.d("zfy", "docker begin restart"); + Logger.d("docker begin restart"); if (mFirstCheckErrorTime == -1) { //记录开始重启时间 mFirstCheckErrorTime = System.currentTimeMillis(); } } else if (sUpgradeState == STATE_DOCKER_RESTART) { - Logger.d("zfy", "docker is restarting"); + Logger.d("docker is restarting"); if (mFirstCheckErrorTime > -1 && System.currentTimeMillis() - mFirstCheckErrorTime > RESTARTING_CHECK_LIMIT_TIME) { - Logger.d("zfy", "restart check over limit time!stop task"); + Logger.d("restart check over limit time!stop task"); mFirstCheckErrorTime = -1; cancelPollingCheck(); iView.onCheckInfoResult(false, ""); } } } else { - Logger.d("zfy", "check error:" + msg); + Logger.d("check error:" + msg); } } else { cancelPollingCheck(); @@ -236,7 +236,7 @@ public void startUpgrade(boolean isPull) { @Override public void onResult(Boolean result, String extraMsg) { if (result != null && result) { - Logger.d("zfy", "start upgrade success"); + Logger.d("start upgrade success"); if (sUpgradeState < STATE_UPGRADING) { sUpgradeState = STATE_UPGRADING; } @@ -263,7 +263,7 @@ public void run() { //取消轮询 public void cancelPollingCheck() { - Logger.d("zfy", "cancelPollingCheck"); + Logger.d("cancelPollingCheck"); if (pollingTask != null) { pollingTask.cancel(); pollingTask = null; diff --git a/app/src/main/java/xyz/eulix/space/presenter/TransferListFragmentPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/TransferListFragmentPresenter.java index 97e975f..59565f4 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/TransferListFragmentPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/TransferListFragmentPresenter.java @@ -83,7 +83,7 @@ public void refreshDoneSelectedData(TransferItem item, boolean isSelected, int p //删除选中 for (int i = 0; i < dataDoneSelected.size(); i++) { if (dataDoneSelected.get(i).keyName.equals(item.keyName)) { - Logger.d("zfy","delete done item"); + Logger.d("delete done item"); dataDoneSelected.remove(i); selectedPositionList.remove(i); break; diff --git a/app/src/main/java/xyz/eulix/space/presenter/UnbindDevicePresenter.java b/app/src/main/java/xyz/eulix/space/presenter/UnbindDevicePresenter.java index 0e64139..24f0bb0 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/UnbindDevicePresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/UnbindDevicePresenter.java @@ -157,7 +157,7 @@ public void revokeDevice(String password) { public void onSuccess(String source, int code, String boxUuidValue, String boxBindValue, String extraMsg, boolean isSuccess) { if (isSuccess) { //解绑成功 - Logger.d("zfy","revoke member success, box uuid: "+ boxUuidValue + ", bind: " + boxBindValue); + Logger.d("revoke member success, box uuid: "+ boxUuidValue + ", bind: " + boxBindValue); //删除盒子数据 if (boxUuidValue != null && boxBindValue != null) { DataUtil.boxUnavailable(boxUuidValue, boxBindValue); @@ -173,7 +173,7 @@ public void onSuccess(String source, int code, String boxUuidValue, String boxBi } } else { //解绑失败 - Logger.d("zfy","revoke member failed:" + extraMsg + ", code: " + code + ", source: " + source); + Logger.d("revoke member failed:" + extraMsg + ", code: " + code + ", source: " + source); handleRevokeResult(boxUuidValue, boxBindValue, code, source); } } @@ -181,7 +181,7 @@ public void onSuccess(String source, int code, String boxUuidValue, String boxBi @Override public void onFailed(String source, int code, String boxUuidValue, String boxBindValue, String extraMsg) { //解绑失败 - Logger.d("zfy","revoke member failed:" + extraMsg + ", code: " + code + ", source: " + source); + Logger.d("revoke member failed:" + extraMsg + ", code: " + code + ", source: " + source); if (iView != null) { iView.onRevokeResult(false, code, source, null); } @@ -190,7 +190,7 @@ public void onFailed(String source, int code, String boxUuidValue, String boxBin @Override public void onError(String errMsg) { //解绑失败 - Logger.d("zfy", "revoke member failed:" + errMsg); + Logger.d("revoke member failed:" + errMsg); int errorCode = ConstantField.SERVER_EXCEPTION_CODE; if (!TextUtils.isEmpty(errMsg)) { try { diff --git a/app/src/main/java/xyz/eulix/space/presenter/UserInfoPresenter.java b/app/src/main/java/xyz/eulix/space/presenter/UserInfoPresenter.java index 67aca76..3d98797 100644 --- a/app/src/main/java/xyz/eulix/space/presenter/UserInfoPresenter.java +++ b/app/src/main/java/xyz/eulix/space/presenter/UserInfoPresenter.java @@ -57,7 +57,7 @@ public void updateHeader(Context context,String pictureAbsolutePath){ int index = pictureAbsolutePath.lastIndexOf("/"); String headerFilePath = pictureAbsolutePath.substring(0, index); String headerFileName = pictureAbsolutePath.substring(index + 1); - Logger.d("zfy", "headerPath = " + headerFilePath + ",headerFileName = " + headerFileName); + Logger.d("headerPath = " + headerFilePath + ",headerFileName = " + headerFileName); String boxUuid = null; String boxBind = null; List> boxValues = EulixSpaceDBUtil.queryBox(context, EulixSpaceDBManager.FIELD_BOX_STATUS diff --git a/app/src/main/java/xyz/eulix/space/receiver/NetworkChangeReceiver.java b/app/src/main/java/xyz/eulix/space/receiver/NetworkChangeReceiver.java index 7fd5983..a574c57 100644 --- a/app/src/main/java/xyz/eulix/space/receiver/NetworkChangeReceiver.java +++ b/app/src/main/java/xyz/eulix/space/receiver/NetworkChangeReceiver.java @@ -40,25 +40,26 @@ * History: 2021/10/9 */ public class NetworkChangeReceiver extends BroadcastReceiver { + private static final String TAG = NetworkChangeReceiver.class.getSimpleName(); private int changeTime = 0; private String lastNetworkType; @Override public void onReceive(Context context, Intent intent) { if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) { - Logger.d("zfy", "network change action:" + intent.getAction()); + Logger.d(TAG, "[NET] network change action: " + intent.getAction()); String currentNetworkType = NetUtils.getNetworkType(EulixSpaceApplication.getContext()); if (currentNetworkType.equals(lastNetworkType)) { - Logger.d("zfy", "network type not change"); + Logger.d(TAG, "[NET] network type not change"); return; } lastNetworkType = currentNetworkType; changeTime++; - Logger.d("zfy", "networkChangeTime = " + changeTime); + Logger.d(TAG, "[NET] networkChangeTime = " + changeTime); if (changeTime <= 1) { return; } - Logger.d("zfy", "network change:" + NetUtils.getNetworkType(context)); + Logger.d(TAG, "[NET] network change: " + NetUtils.getNetworkType(context)); if (!NetUtils.isNetAvailable(context)) { new Handler(Looper.getMainLooper()).postDelayed(() -> { @@ -67,7 +68,7 @@ public void onReceive(Context context, Intent intent) { } if (NetUtils.isWifiConnected(context)) { - Logger.d("zfy", "wifi connect"); + Logger.d(TAG, "[NET] wifi connected"); EventBusUtil.post(new NetworkStateEvent()); EventBusUtil.post(new TransferListNetworkEvent()); //wifi连接，刷新局域网状态 diff --git a/app/src/main/java/xyz/eulix/space/receiver/PhotoAlbumContentObserver.java b/app/src/main/java/xyz/eulix/space/receiver/PhotoAlbumContentObserver.java index d376b35..21e3229 100644 --- a/app/src/main/java/xyz/eulix/space/receiver/PhotoAlbumContentObserver.java +++ b/app/src/main/java/xyz/eulix/space/receiver/PhotoAlbumContentObserver.java @@ -41,7 +41,7 @@ public PhotoAlbumContentObserver(Handler handler) { public void onChange(boolean selfChange, @Nullable Uri uri) { super.onChange(selfChange, uri); if (uri != null && (uri.toString().contains("images") || uri.toString().contains("video"))) { - Logger.d("zfy", "photo album onChange：Uri = " + uri.toString()); + Logger.d("photo album onChange：Uri = " + uri.toString()); if (onChangeListener != null) { onChangeListener.onChange(uri); } diff --git a/app/src/main/java/xyz/eulix/space/transfer/db/TransferDBManager.java b/app/src/main/java/xyz/eulix/space/transfer/db/TransferDBManager.java index 98011fc..a0680db 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/db/TransferDBManager.java +++ b/app/src/main/java/xyz/eulix/space/transfer/db/TransferDBManager.java @@ -725,7 +725,7 @@ public int updateTransferState(String keyName, int transferType, int state, int result = update(cv, where, null); if (isFeedBack) { - Logger.d("zfy", "post transfer state event:" + state); + Logger.d("post transfer state event:" + state); EventBusUtil.post(new TransferStateEvent(keyName, transferType, state, uniqueTag)); } diff --git a/app/src/main/java/xyz/eulix/space/transfer/multipart/BetagCalculator.java b/app/src/main/java/xyz/eulix/space/transfer/multipart/BetagCalculator.java index e7604cb..15abac7 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/multipart/BetagCalculator.java +++ b/app/src/main/java/xyz/eulix/space/transfer/multipart/BetagCalculator.java @@ -61,7 +61,7 @@ public String getFileBetag() { } long fileSize = file.length(); String sizeFlag = getSizeFlag(fileSize); - Logger.d("zfy", "sizeFlag = " + sizeFlag); + Logger.d("sizeFlag = " + sizeFlag); //片数 int chunkCount = (int) Math.ceil((double) fileSize / (double) betagChunkSize); try (RandomAccessFile randomAccessFile = new RandomAccessFile(filePath, "r")) { @@ -85,7 +85,7 @@ public String getFileBetag() { byte[] md5Byte = messagedigest.digest(); md5ByteList.add(md5Byte); String md5 = MD5Util.bufferToHex(md5Byte); - Logger.d("zfy", "chunk " + i + ",md5:" + md5); + Logger.d("chunk " + i + ",md5:" + md5); } String chunksMd5 = ""; if (md5ByteList.size() > 1) { @@ -99,9 +99,9 @@ public String getFileBetag() { //单片，直接取md5值 chunksMd5 = MD5Util.bufferToHex(md5ByteList.get(0)); } - Logger.d("zfy", "chunksMd5 = " + chunksMd5); + Logger.d("chunksMd5 = " + chunksMd5); betag = sizeFlag + chunksMd5; - Logger.d("zfy", "betag = " + betag); + Logger.d("betag = " + betag); } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/main/java/xyz/eulix/space/transfer/multipart/MultipartUtil.java b/app/src/main/java/xyz/eulix/space/transfer/multipart/MultipartUtil.java index 8209cb0..d419e7f 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/multipart/MultipartUtil.java +++ b/app/src/main/java/xyz/eulix/space/transfer/multipart/MultipartUtil.java @@ -86,7 +86,7 @@ public static String getFileBetag(String filePath) { } long fileSize = file.length(); String sizeFlag = getSizeFlag(fileSize); - Logger.d("zfy", "sizeFlag = " + sizeFlag); + Logger.d("sizeFlag = " + sizeFlag); //片数 int chunkCount = (int) Math.ceil((double) fileSize / (double) betagChunkSize); try (RandomAccessFile randomAccessFile = new RandomAccessFile(filePath, "r")) { @@ -106,7 +106,7 @@ public static String getFileBetag(String filePath) { byte[] md5Byte = messagedigest.digest(); md5ByteList.add(md5Byte); String md5 = MD5Util.bufferToHex(md5Byte); - Logger.d("zfy", "chunk " + i + ",md5:" + md5); + Logger.d("chunk " + i + ",md5:" + md5); } String chunksMd5 = ""; if (md5ByteList.size() > 1) { @@ -120,9 +120,9 @@ public static String getFileBetag(String filePath) { //单片，直接取md5值 chunksMd5 = MD5Util.bufferToHex(md5ByteList.get(0)); } - Logger.d("zfy", "chunksMd5 = " + chunksMd5); + Logger.d("chunksMd5 = " + chunksMd5); betag = sizeFlag + chunksMd5; - Logger.d("zfy", "betag = " + betag); + Logger.d("betag = " + betag); } catch (Exception e) { e.printStackTrace(); } @@ -256,11 +256,11 @@ public static ArrayList getUnUploadedChunksInfo(String filePath public static UploadChunkBean createChunkFile(String filePath, String cacheDirPath, long start, long end) { File file = new File(filePath); if (!file.exists()) { - Logger.d("zfy", "file not exist"); + Logger.d("file not exist"); return null; } if (end > file.length()) { - Logger.d("zfy", "end position overSize"); + Logger.d("end position overSize"); return null; } FileOutputStream fileOutputStream = null; @@ -295,8 +295,8 @@ public static UploadChunkBean createChunkFile(String filePath, String cacheDirPa uploadChunkBean.end = end; uploadChunkBean.md5 = chunkMd5; uploadChunkBean.path = chunkFile.getAbsolutePath(); - Logger.d("zfy", "chunk name:" + chunkFile.getName()); -// Logger.d("zfy", "chunk md5:" + uploadChunkBean.md5 + ";realMd5:" + MD5Util.getFileMD5String(chunkFile)); + Logger.d("chunk name:" + chunkFile.getName()); +// Logger.d("chunk md5:" + uploadChunkBean.md5 + ";realMd5:" + MD5Util.getFileMD5String(chunkFile)); return uploadChunkBean; } catch (Exception e) { Logger.e(e.getMessage()); @@ -326,16 +326,16 @@ public static UploadChunkBean createEncryptChunkFile(String filePath, String cac String algorithm, String encryptKey, String ivParams) { File file = new File(filePath); if (!file.exists()) { - Logger.d("zfy", "file not exist"); + Logger.d("file not exist"); return null; } if (end > file.length()) { - Logger.d("zfy", "end position overSize"); + Logger.d("end position overSize"); return null; } if (TextUtils.isEmpty(algorithm)) { - Logger.d("zfy", "algorithm is null"); + Logger.d("algorithm is null"); return null; } @@ -346,7 +346,7 @@ public static UploadChunkBean createEncryptChunkFile(String filePath, String cac Cipher cipher = EncryptionUtil.getCipher(algorithm, baseAlgorithm, null); Charset charset = StandardCharsets.UTF_8; if (cipher == null || baseAlgorithm == null) { - Logger.d("zfy", "ciper is null"); + Logger.d("ciper is null"); return null; } @@ -417,8 +417,8 @@ public static UploadChunkBean createEncryptChunkFile(String filePath, String cac uploadChunkBean.end = end; uploadChunkBean.md5 = chunkMd5; uploadChunkBean.path = chunkFile.getAbsolutePath(); - Logger.d("zfy", "chunk name:" + chunkFile.getName()); -// Logger.d("zfy", "chunk md5:" + uploadChunkBean.md5 + ";realMd5:" + MD5Util.getFileMD5String(chunkFile)); + Logger.d("chunk name:" + chunkFile.getName()); +// Logger.d("chunk md5:" + uploadChunkBean.md5 + ";realMd5:" + MD5Util.getFileMD5String(chunkFile)); return uploadChunkBean; } catch (Exception e) { Logger.e(e.getMessage()); @@ -445,11 +445,11 @@ public static UploadChunkBean createEncryptChunkFile(String filePath, String cac public static UploadChunkBean getPlainChunkInfo(String filePath, long start, long end){ File file = new File(filePath); if (!file.exists()) { - Logger.d("zfy", "file not exist"); + Logger.d("file not exist"); return null; } if (end > file.length()) { - Logger.d("zfy", "end position overSize"); + Logger.d("end position overSize"); return null; } @@ -583,7 +583,7 @@ public synchronized static void mergeDownloadChunk(String fileUuid, UploadChunkB //比已完成第一批更靠前 if (chunkToMerge.end + 1 < firstChunkStart) { //与其他片段不连续 - Logger.d("zfy", "no continuous file,quit"); + Logger.d("no continuous file,quit"); } else { FileInputStream fileInputStream = null; try (RandomAccessFile firstRandomAccessFile = new RandomAccessFile(fileToMerge, "rwd")) { @@ -625,7 +625,7 @@ public synchronized static void mergeDownloadChunk(String fileUuid, UploadChunkB if (chunkToMerge.start > itemStart && chunkToMerge.start <= itemEnd + 1 && chunkToMerge.end >= itemEnd) { if (chunkToMerge.end <= itemEnd) { //需合并片段全部包含在已完成片段内 - Logger.d("zfy", "chunkToMerge include"); + Logger.d("chunkToMerge include"); break; } else { RandomAccessFile nextRandomAccessFile = null; @@ -635,7 +635,7 @@ public synchronized static void mergeDownloadChunk(String fileUuid, UploadChunkB randomAccessFile.seek(seekPos); if (!fileToMerge.exists()) { //分片文件不存在 - Logger.d("zfy", "chunk to merge file not exist"); + Logger.d("chunk to merge file not exist"); return; } long currentLength = seekPos; @@ -753,7 +753,7 @@ public int compare(File o1, File o2) { //合并所有下载完成分片 public static boolean mergeAllDownloadChunks(String fileUuid, String cacheDirPath, String targetDirPath, String fileName, long fileSize) { - Logger.d("zfy", "call mergeAllDownloadChunks"); + Logger.d("call mergeAllDownloadChunks"); if (TextUtils.isEmpty(fileUuid) || TextUtils.isEmpty(cacheDirPath) || TextUtils.isEmpty(fileName) || TextUtils.isEmpty(targetDirPath) || fileSize < 0) { return false; @@ -803,7 +803,7 @@ public static boolean mergeAllDownloadChunks(String fileUuid, String cacheDirPat //校验文件大小 if (resultFile.length() != fileSize) { - Logger.d("zfy", "check file size error"); + Logger.d("check file size error"); resultFile.delete(); return false; } @@ -824,7 +824,7 @@ public static synchronized void clearDownloadCacheChunks(String cacheDirPath, St for (int i = 0; i < itemFiles.length; i++) { File itemFile = itemFiles[i]; if (itemFile.getName().startsWith(fileUuid)) { - Logger.d("zfy", "clear " + itemFile.getName()); + Logger.d("clear " + itemFile.getName()); itemFile.delete(); } } diff --git a/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanHttpsUtil.java b/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanHttpsUtil.java index 12be5f0..6eb1d3e 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanHttpsUtil.java +++ b/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanHttpsUtil.java @@ -90,7 +90,7 @@ public void checkClientTrusted(X509Certificate[] chain, String authType) @Override public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { - Logger.d("zfy", "checkServerTrusted"); + Logger.d("checkServerTrusted"); if (chain == null || chain.length == 0) { throw new CertificateException("checkServerTrusted: X509Certificate array is null"); } @@ -125,13 +125,13 @@ public void checkServerTrusted(X509Certificate[] chain, String authType) if (!clientEncoded.equals(serverEncoded)) { //证书验证失败，重新下载 - Logger.d("zfy", "verify cert failed!"); + Logger.d("verify cert failed!"); LanManager.getInstance().resetHttpsCertInfo(); - Logger.d("zfy", "clientPublicKeyEncode=" + clientPublicKeyEncode); - Logger.d("zfy", "serverPublicKeyEncode=" + serverPublicKeyEncode); + Logger.d("clientPublicKeyEncode=" + clientPublicKeyEncode); + Logger.d("serverPublicKeyEncode=" + serverPublicKeyEncode); throw new CertificateException("server's PublicKey is not equals to client's PublicKey"); } - Logger.d("zfy", "verify cert pass"); + Logger.d("verify cert pass"); } @Override diff --git a/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanUploadFileProgressRequestBody.java b/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanUploadFileProgressRequestBody.java index 8570d82..3c5b29b 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanUploadFileProgressRequestBody.java +++ b/app/src/main/java/xyz/eulix/space/transfer/multipart/lan/LanUploadFileProgressRequestBody.java @@ -93,7 +93,7 @@ public void write(Buffer source, long byteCount) throws IOException { } else { isPercentChange = false; } -// Logger.d("zfy", "LanUploadFileProgressRequestBody progress:" + currentPercent); +// Logger.d("LanUploadFileProgressRequestBody progress:" + currentPercent); progressListener.onProgress(bytesWritten, length, byteCount, isPercentChange, false); } } diff --git a/app/src/main/java/xyz/eulix/space/transfer/multipart/network/MultipartNetworkManger.java b/app/src/main/java/xyz/eulix/space/transfer/multipart/network/MultipartNetworkManger.java index c5789e6..170f537 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/multipart/network/MultipartNetworkManger.java +++ b/app/src/main/java/xyz/eulix/space/transfer/multipart/network/MultipartNetworkManger.java @@ -194,15 +194,15 @@ public static void createUpload(Context context, GatewayCommunicationBase gatewa .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "create upload on subscribe"); + Logger.d("create upload on subscribe"); } @Override public void onNext(UploadCreateResponseBody result) { - Logger.d("zfy", "create upload on next: " + (result == null ? "null" : result.toString())); + Logger.d("create upload on next: " + (result == null ? "null" : result.toString())); if (result != null && result.getCodeInt() == 1036) { //盒子空间不足 - Logger.d("zfy", "空间不足，上传失败，请清理空间后再重试~"); + Logger.d("空间不足，上传失败，请清理空间后再重试~"); ToastUtil.showToast(context.getString(R.string.transfer_upload_failed)); if (callback != null) { callback.onResult(false, String.valueOf(result.getCodeInt())); @@ -213,7 +213,7 @@ public void onNext(UploadCreateResponseBody result) { if (!TextUtils.isEmpty(albumId)) { //相簿更新文件上传路径 if (result != null && result.getResults().completeInfo != null) { - Logger.d("zfy", "update album upload target path"); + Logger.d("update album upload target path"); String uniqueTag = TransferItemFactory.getUniqueTagWithAlbumId(TransferHelper.TYPE_UPLOAD, file.getName(), fileLocalPath, targetPath, null, albumId); TransferDBManager.getInstance(context).updateTransferRemotePath(uniqueTag, result.getResults().completeInfo.getPath()); } @@ -226,7 +226,7 @@ public void onNext(UploadCreateResponseBody result) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "create upload on error: " + errMsg); + Logger.e("create upload on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -237,7 +237,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "create upload on complete"); + Logger.d("create upload on complete"); } }); } @@ -270,12 +270,12 @@ public static void listUpload(Context context, String uploadId, ResultCallbackOb .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "list upload on subscribe"); + Logger.d("list upload on subscribe"); } @Override public void onNext(UploadListResponseBody result) { - Logger.d("zfy", "list upload on next: " + (result == null ? "null" : result.toString())); + Logger.d("list upload on next: " + (result == null ? "null" : result.toString())); if (callback != null) { callback.onResult(true, result); } @@ -284,7 +284,7 @@ public void onNext(UploadListResponseBody result) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "list upload on error: " + errMsg); + Logger.e("list upload on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -295,7 +295,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "list upload on complete"); + Logger.d("list upload on complete"); } }); } @@ -321,7 +321,7 @@ public static void uploadFile(Context context, GatewayCommunicationBase gatewayC callback.onResult(false, "local file is not exist"); return; } - Logger.d("zfy", "filePath=" + file.getAbsolutePath()); + Logger.d("filePath=" + file.getAbsolutePath()); String transformation = gatewayCommunicationBase.getTransformation(); String secret = gatewayCommunicationBase.getSecretKey(); @@ -347,7 +347,7 @@ public static void uploadFile(Context context, GatewayCommunicationBase gatewayC queryJsonObject.put("md5sum", uploadChunk.md5); entityJsonObject.put("businessId", isSync ? 1 : 0); queryJsonObject.put("mediaType", "application/octet-stream"); - Logger.d("zfy", "entity:" + entityJsonObject.toString()); + Logger.d("entity:" + entityJsonObject.toString()); headerJsonObject.put("Request-Id", requestId.toString()); headerJsonObject.put("Accept", "*/*"); @@ -360,7 +360,7 @@ public static void uploadFile(Context context, GatewayCommunicationBase gatewayC callRequestJson.put("headers", headerJsonObject); callRequestJson.put("entity", entityJsonObject); callRequestJson.put("serviceName", ConstantField.ServiceName.EULIXSPACE_FILE_SERVICE); - Logger.d("zfy", "callJson=" + callRequestJson.toString()); + Logger.d("callJson=" + callRequestJson.toString()); } catch (JSONException e) { e.printStackTrace(); } @@ -369,7 +369,7 @@ public static void uploadFile(Context context, GatewayCommunicationBase gatewayC //加密callRequest String encryptCallJsonStr = EncryptionUtil.encrypt(transformation, null, callRequestJson.toString(), secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "encryptCallJsonStr=" + encryptCallJsonStr); + Logger.d("encryptCallJsonStr=" + encryptCallJsonStr); CallRequest callRequest = new CallRequest(); callRequest.setAccessToken(accessToken); @@ -379,44 +379,44 @@ public static void uploadFile(Context context, GatewayCommunicationBase gatewayC HttpUrl httpUrl = httpParseUrl.newBuilder() .build(); - Logger.d("zfy", "multipart upload url: " + httpUrl); + Logger.d("multipart upload url: " + httpUrl); String responseBodyStr = TransferNetUtil.postFile(httpUrl.toString(), file.getName(), file, accessToken, callRequestStr, requestId.toString(), secret, transformation, ivParams, progressListener); //删除加密缓存文件 if (file.exists()) { - Logger.d("zfy", "delete chunk cache file"); + Logger.d("delete chunk cache file"); boolean result = file.delete(); - Logger.d("zfy", "chunk file delete: " + result); + Logger.d("chunk file delete: " + result); } if (!TextUtils.isEmpty(responseBodyStr)) { UploadResponseBodyResult uploadResponseBody = new Gson().fromJson(responseBodyStr, UploadResponseBodyResult.class); int code = uploadResponseBody.getCodeInt(); - Logger.d("zfy", "upload chunk response code=" + code); + Logger.d("upload chunk response code=" + code); // CodeMultipartRangeUploaded CodeType = 1037 //分片范围已上传 if (code == 200 || code == 1037) { - Logger.d("zfy", "片段上传成功：" + file.getName()); + Logger.d("片段上传成功：" + file.getName()); if (callback != null) { callback.onResult(true, null); } } else if (code == 1036) { //盒子空间不足 - Logger.d("zfy", "空间不足，上传失败，请清理空间后再重试~"); + Logger.d("空间不足，上传失败，请清理空间后再重试~"); ToastUtil.showToast(context.getString(R.string.transfer_upload_failed)); if (callback != null) { callback.onResult(false, String.valueOf(code)); } } else { String message = uploadResponseBody.getMessage(); - Logger.d("zfy", "上传失败" + code + "\n" + message); + Logger.d("上传失败" + code + "\n" + message); if (callback != null) { callback.onResult(false, String.valueOf(code)); } } } else { - Logger.d("zfy", "片段上传失败：" + file.getName()); + Logger.d("片段上传失败：" + file.getName()); if (callback != null) { callback.onResult(false, "上传失败"); } @@ -453,20 +453,20 @@ public static void completeUpload(Context context, GatewayCommunicationBase gate .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "complete upload on subscribe"); + Logger.d("complete upload on subscribe"); } @Override public void onNext(UploadCompleteResponseBody result) { - Logger.d("zfy", "complete upload on next: " + (result == null ? "null" : result.toString())); + Logger.d("complete upload on next: " + (result == null ? "null" : result.toString())); if (result != null) { int code = result.getCodeInt(); if (code == 200) { - Logger.d("zfy", "complete chunks success!"); + Logger.d("complete chunks success!"); callback.onResult(true, result.Results); } else { String message = result.getMessage(); - Logger.d("zfy", "complete chunks failed!!" + message); + Logger.d("complete chunks failed!!" + message); callback.onResult(false, String.valueOf(code)); } } else { @@ -478,7 +478,7 @@ public void onNext(UploadCompleteResponseBody result) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "complete upload on error: " + errMsg); + Logger.e("complete upload on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -489,7 +489,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "complete upload on complete"); + Logger.d("complete upload on complete"); } }); } @@ -527,12 +527,12 @@ public static void deleteUpload(Context context, String uploadId, ResultCallback .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "delete upload on subscribe"); + Logger.d("delete upload on subscribe"); } @Override public void onNext(BaseResponseBody result) { - Logger.d("zfy", "delete upload on next: " + (result == null ? "null" : result.toString())); + Logger.d("delete upload on next: " + (result == null ? "null" : result.toString())); if (callback != null) { if (result != null && result.getCodeInt() == 200) { callback.onResult(true, result); @@ -545,7 +545,7 @@ public void onNext(BaseResponseBody result) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "delete upload on error: " + errMsg); + Logger.e("delete upload on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -556,7 +556,7 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "delete upload on complete"); + Logger.d("delete upload on complete"); } }); } @@ -597,16 +597,16 @@ public static void downloadFile(GatewayCommunicationBase gatewayCommunicationBas } String chunkFileName = fileUuid + "_" + start + "_" + end; - Logger.d("zfy", "chunkFileName = " + chunkFileName); + Logger.d("chunkFileName = " + chunkFileName); String rangeValue = "bytes=" + start + "-" + end; - Logger.d("zfy", "range is:" + rangeValue); + Logger.d("range is:" + rangeValue); if (httpParseUrl != null) { HttpUrl httpUrl = httpParseUrl.newBuilder() .addQueryParameter("uuid", fileUuid) .build(); - Logger.d("zfy", "download url: " + httpUrl); + Logger.d("download url: " + httpUrl); Request request = new Request.Builder() .url(httpUrl) .addHeader("Range", rangeValue) @@ -624,7 +624,7 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { @Override public void onResponse(@NotNull Call call, @NotNull Response response) { - Logger.d("zfy", "on response " + response.code()); + Logger.d("on response " + response.code()); if (!response.isSuccessful()) { if (callback != null) { @@ -635,16 +635,16 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { Headers headers = response.headers(); String contentType = headers.get("content-type"); - Logger.d("zfy", "content-type = " + contentType); + Logger.d("content-type = " + contentType); if (TextUtils.isEmpty(contentType) || contentType.contains("json")) { //没有文件流，下载文件失败 - Logger.d("zfy", "no stream"); + Logger.d("no stream"); String errorCode = "-1"; try { byte[] bodyStr = response.body().bytes(); byte[] cipherResponseByte = EncryptionUtil.decrypt(transformation, null, bodyStr, secret, StandardCharsets.UTF_8, ivParams); String cipherResponseText = new String(cipherResponseByte); - Logger.d("zfy", "cipherResponseText=" + cipherResponseText); + Logger.d("cipherResponseText=" + cipherResponseText); if (!TextUtils.isEmpty(cipherResponseText)) { RealCallResult realCallResult = null; realCallResult = new Gson().fromJson(cipherResponseText, RealCallResult.class); @@ -659,7 +659,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { } } } catch (Exception e) { - Logger.d("zfy", "exception " + e.getMessage()); + Logger.d("exception " + e.getMessage()); } if (callback != null) { callback.onResult(false, errorCode); @@ -667,7 +667,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { } else { //文件大小 String headerFileSizeStr = headers.get("file-size"); - Logger.d("zfy", "file-size=" + headerFileSizeStr); + Logger.d("file-size=" + headerFileSizeStr); if (TextUtils.isEmpty(headerFileSizeStr)) { headerFileSizeStr = "0"; } @@ -676,7 +676,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { File chunkFile = new File(cacheDirPath, chunkFileName); if (chunkFile.exists()) { - Logger.d("zfy", "chunk file to download exist, delete"); + Logger.d("chunk file to download exist, delete"); chunkFile.delete(); } @@ -688,19 +688,19 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { if (decryptFile != null) { //下载解析成功，size校验 long tempFileSize = decryptFile.length(); - Logger.d("zfy", "downloadSize=" + tempFileSize); - Logger.d("zfy", "targetSize=" + fileSize); + Logger.d("downloadSize=" + tempFileSize); + Logger.d("targetSize=" + fileSize); if (tempFileSize == fileSize) { - Logger.d("zfy", "size校验通过"); + Logger.d("size校验通过"); decryptFile.renameTo(chunkFile); if (callback != null) { callback.onResult(true, null); } } else { - Logger.d("zfy", "size校验失败"); + Logger.d("size校验失败"); boolean result = decryptFile.delete(); - Logger.d("zfy", "decrypt file delete: " + result); + Logger.d("decrypt file delete: " + result); if (callback != null) { callback.onResult(false, "size校验失败"); } @@ -773,12 +773,12 @@ public static void getHttpsCert(GatewayCommunicationBase gatewayCommunicationBas .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Logger.d("zfy", "list upload on subscribe"); + Logger.d("list upload on subscribe"); } @Override public void onNext(GetCertResponseBody responseBody) { - Logger.d("zfy", "list upload on next: " + (responseBody == null ? "null" : responseBody.toString())); + Logger.d("list upload on next: " + (responseBody == null ? "null" : responseBody.toString())); if (callback != null) { if (responseBody != null) { if (responseBody.getCodeInt() == 200) { @@ -795,7 +795,7 @@ public void onNext(GetCertResponseBody responseBody) { @Override public void onError(Throwable e) { String errMsg = (e == null ? "null" : (e.getMessage() == null ? "" : e.getMessage())); - Logger.e("zfy", "list upload on error: " + errMsg); + Logger.e("list upload on error: " + errMsg); if (callback != null) { callback.onError(errMsg); } @@ -806,14 +806,14 @@ public void onError(Throwable e) { @Override public void onComplete() { - Logger.d("zfy", "list upload on complete"); + Logger.d("list upload on complete"); } }); } //通过https上传 public static void uploadFromHttps(Context context, OkHttpClient okHttpClient, String httpsDomain, String verifyToken, UploadChunkBean chunkBean, String uploadId, ResultCallback callback, TransferProgressListener progressListener, boolean isSync) { - Logger.d("zfy", "uploadFromHttps"); + Logger.d("uploadFromHttps"); if (chunkBean == null) { return; } @@ -832,15 +832,15 @@ public static void uploadFromHttps(Context context, OkHttpClient okHttpClient, S urlSb.append(chunkBean.md5); String url = urlSb.toString(); HttpUrl httpUrl = HttpUrl.parse(url); - Logger.d("zfy", "url = " + url); - Logger.d("zfy", "token:" + verifyToken); + Logger.d("url = " + url); + Logger.d("token:" + verifyToken); if (httpUrl == null) { - Logger.d("zfy", "url is error"); + Logger.d("url is error"); return; } File file = new File(chunkBean.path); if (!file.exists()) { - Logger.d("zfy", "local file not exist"); + Logger.d("local file not exist"); return; } LanUploadFileProgressRequestBody requestBody = new LanUploadFileProgressRequestBody(file, chunkBean.start, chunkBean.end - chunkBean.start, progressListener); @@ -857,19 +857,19 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO int code = response.code(); String message = response.message(); if (code == 200 || code == 1037) { - Logger.d("zfy", "片段上传成功：" + file.getName() + "_" + chunkBean.start + "_" + chunkBean.end); + Logger.d("片段上传成功：" + file.getName() + "_" + chunkBean.start + "_" + chunkBean.end); if (callback != null) { callback.onResult(true, null); } } else if (code == 1036) { //盒子空间不足 - Logger.d("zfy", "空间不足，上传失败，请清理空间后再重试~"); + Logger.d("空间不足，上传失败，请清理空间后再重试~"); ToastUtil.showToast(context.getString(R.string.transfer_upload_failed)); if (callback != null) { callback.onResult(false, String.valueOf(code)); } } else { - Logger.d("zfy", "片段上传失败：" + file.getName() + "_" + chunkBean.start + "_" + chunkBean.end + " " + code + "\n" + message); + Logger.d("片段上传失败：" + file.getName() + "_" + chunkBean.start + "_" + chunkBean.end + " " + code + "\n" + message); //关闭通道https通道可用性 LanManager.getInstance().closeHttpsChannel(); if (callback != null) { @@ -880,7 +880,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - Logger.d("zfy", "片段上传失败onFailure：" + file.getName() + "_" + chunkBean.start + "_" + chunkBean.end); + Logger.d("片段上传失败onFailure：" + file.getName() + "_" + chunkBean.start + "_" + chunkBean.end); //关闭通道https通道可用性 LanManager.getInstance().closeHttpsChannel(); Logger.e(e.getMessage()); @@ -894,7 +894,7 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { //通过https下载 public static void downloadFromHttps(OkHttpClient okHttpClient, String httpsDomain, String verifyToken, String fileUuid, String cacheDirPath, long start, long end, ResultCallback callback, TransferProgressListener progressListener) { - Logger.d("zfy", "download from https"); + Logger.d("download from https"); StringBuilder urlSb = new StringBuilder(); urlSb.append(httpsDomain); @@ -903,18 +903,18 @@ public static void downloadFromHttps(OkHttpClient okHttpClient, String httpsDoma urlSb.append(fileUuid); String url = urlSb.toString(); HttpUrl httpUrl = HttpUrl.parse(url); - Logger.d("zfy", "download url = " + url); - Logger.d("zfy", "token:" + verifyToken); + Logger.d("download url = " + url); + Logger.d("token:" + verifyToken); if (httpUrl == null) { - Logger.d("zfy", "url is error"); + Logger.d("url is error"); return; } String chunkFileName = fileUuid + "_" + start + "_" + end; - Logger.d("zfy", "chunkFileName = " + chunkFileName); + Logger.d("chunkFileName = " + chunkFileName); String rangeValue = "bytes=" + start + "-" + end; - Logger.d("zfy", "range is:" + rangeValue); + Logger.d("range is:" + rangeValue); long fileSize = end - start + 1; @@ -933,7 +933,7 @@ public static void downloadFromHttps(OkHttpClient okHttpClient, String httpsDoma call.enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) { - Logger.d("zfy", "https download on response " + response.code()); + Logger.d("https download on response " + response.code()); if (!response.isSuccessful()) { if (callback != null) { @@ -945,10 +945,10 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { int code = response.code(); Headers headers = response.headers(); String contentType = headers.get("content-type"); - Logger.d("zfy", "content-type = " + contentType); + Logger.d("content-type = " + contentType); if (TextUtils.isEmpty(contentType) || contentType.contains("json")) { //没有文件流，下载文件失败 - Logger.d("zfy", "no stream"); + Logger.d("no stream"); String errorCode = code + ""; String errorMsg = response.message(); if (code == 1003) { @@ -967,18 +967,18 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { } else { //文件大小 String headerFileSizeStr = headers.get("file-size"); - Logger.d("zfy", "file-size=" + headerFileSizeStr); + Logger.d("file-size=" + headerFileSizeStr); File chunkFile = new File(cacheDirPath, chunkFileName); if (chunkFile.exists()) { - Logger.d("zfy", "chunk file to download exist, delete"); + Logger.d("chunk file to download exist, delete"); chunkFile.delete(); } String tempChunkFileName = chunkFileName + "_temp"; File tempChunkFile = new File(cacheDirPath, tempChunkFileName); if (tempChunkFile.exists()) { - Logger.d("zfy", "temp chunk file to download exist, delete"); + Logger.d("temp chunk file to download exist, delete"); tempChunkFile.delete(); } try (InputStream inputStream = Objects.requireNonNull(response.body()).byteStream(); @@ -1017,13 +1017,13 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { //下载解析成功，size校验 long tempFileSize = tempChunkFile.length(); - Logger.d("zfy", "downloadSize=" + tempFileSize); - Logger.d("zfy", "targetSize=" + fileSize); + Logger.d("downloadSize=" + tempFileSize); + Logger.d("targetSize=" + fileSize); if (tempFileSize == fileSize) { - Logger.d("zfy", "size校验通过"); + Logger.d("size校验通过"); if (chunkFile.exists()) { - Logger.d("zfy", "chunk file to download exist, delete"); + Logger.d("chunk file to download exist, delete"); chunkFile.delete(); } tempChunkFile.renameTo(chunkFile); @@ -1031,8 +1031,8 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { callback.onResult(true, null); } } else { - Logger.d("zfy", "size校验失败"); - Logger.d("zfy", "tmp file delete: " + tempChunkFile.delete()); + Logger.d("size校验失败"); + Logger.d("tmp file delete: " + tempChunkFile.delete()); if (callback != null) { callback.onResult(false, "size校验失败"); } @@ -1043,10 +1043,10 @@ public void onResponse(@NotNull Call call, @NotNull Response response) { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - Logger.d("zfy", "https片段下载失败：" + chunkFileName); + Logger.d("https片段下载失败：" + chunkFileName); //通道异常，关闭 LanManager.getInstance().closeHttpsChannel(); - Logger.e("zfy", e.getMessage()); + Logger.e(e.getMessage()); if (callback != null) { callback.onResult(false, "下载失败"); } diff --git a/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartDownloadTask.java b/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartDownloadTask.java index 1ad2a9f..4f2ab60 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartDownloadTask.java +++ b/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartDownloadTask.java @@ -122,7 +122,7 @@ public void downloadFile(ResultCallback listener) { mGatewayCommunicationBase = GatewayUtils.generateGatewayCommunication(mContext); if (mGatewayCommunicationBase == null) { - Logger.d("zfy", "gatewayCommunicationBase is null"); + Logger.d("gatewayCommunicationBase is null"); listener.onResult(false, "gatewayCommunicationBase is null"); return; } @@ -169,7 +169,7 @@ public class DownWorkManager implements Runnable { private ResultCallback mListener; public DownWorkManager(BlockingDeque items, ResultCallback listener) { - Logger.d("zfy", "#create DownWorkManager"); + Logger.d("#create DownWorkManager"); waitingQueue = items; this.mListener = listener; } @@ -178,7 +178,7 @@ public DownWorkManager(BlockingDeque items, ResultCallback list public void run() { while (taskSwitch) { if (!NetUtils.isNetAvailable(mContext) || (NetUtils.isMobileNetWork(mContext) && !ConstantField.sIAllowTransferWithMobileData)) { - Logger.d("zfy", "no network, transfer task waiting"); + Logger.d("no network, transfer task waiting"); try { Thread.sleep(3000); } catch (Exception e) { @@ -191,7 +191,7 @@ public void run() { if ((currentList.size() - (Math.max(p2pChunk.get(), 0)) * MultipartUtil.P2P_COMPENSATION) < MultipartUtil.LIMIT_COUNT_DOWNLOAD) { try { UploadChunkBean item = waitingQueue.take(); -// Logger.d("zfy", "waitingQueue item:" + item.keyName + ";thread:" + Thread.currentThread()); +// Logger.d("waitingQueue item:" + item.keyName + ";thread:" + Thread.currentThread()); mDownloadPrepareList.remove(item); mDownloadDoingList.add(item); currentList.add(item); @@ -213,7 +213,7 @@ public void onResult(boolean result, String extraMsg) { //单片下载成功，判断是否都下载完成 if (waitingQueue.isEmpty() && mDownloadDoingList.isEmpty() && mDownloadFailedList.isEmpty()) { - Logger.d("zfy", "all chunk download success,complete"); + Logger.d("all chunk download success,complete"); p2pChunk.getAndSet(0); logItem.transferEndTime = System.currentTimeMillis(); //全部片段上传完成，调用合并 @@ -227,13 +227,13 @@ public void onResult(boolean result, String extraMsg) { } else { //下载下一片 currentList.remove(item); - Logger.d("zfy", "download next chunk"); + Logger.d("download next chunk"); } } else { if (!mDownloadFailedList.contains(item)) { mDownloadFailedList.add(item); } - Logger.d("zfy", "chunk " + item.start + " failed"); + Logger.d("chunk " + item.start + " failed"); // P2PUpDownloadUtil.addError(mFileUuid, extraMsg); @@ -266,7 +266,7 @@ public void onResult(boolean result, String extraMsg) { thisItemFailedTime = itemFailedTimes.get(item.start + ""); } if (thisItemFailedTime < MultipartUtil.RETRY_TIME) { - Logger.d("zfy", "chunk " + item.start + " failed time is:" + thisItemFailedTime + ",retry!"); + Logger.d("chunk " + item.start + " failed time is:" + thisItemFailedTime + ",retry!"); thisItemFailedTime++; try { Thread.sleep(2000); @@ -280,7 +280,7 @@ public void onResult(boolean result, String extraMsg) { } else { //超过重试次数，停止当前文件传输，返回失败 if (NetUtils.isNetAvailable(mContext)) { - Logger.d("zfy", "item failed too many time,give up " + item.start); + Logger.d("item failed too many time,give up " + item.start); taskSwitch = false; // P2PUpDownloadUtil.finishLoad(mFileUuid, System.currentTimeMillis()); if (downExecutor != null) { @@ -314,7 +314,7 @@ private void downWrap(UploadChunkBean downloadChunkItem, ResultCallback callback final long[] itemTransferredSize = {0L}; mGatewayCommunicationBase = GatewayUtils.generateGatewayCommunication(mContext); if (LanManager.getInstance().isHttpsAvailable()) { - Logger.d("zfy", "download https available"); + Logger.d("download https available"); //局域网Https通道可用 OkHttpClient okHttpClient = LanManager.getInstance().getHttpsClient(); if (okHttpClient == null) { diff --git a/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartUploadTask.java b/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartUploadTask.java index c8e958c..0044624 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartUploadTask.java +++ b/app/src/main/java/xyz/eulix/space/transfer/multipart/task/MultipartUploadTask.java @@ -210,24 +210,24 @@ private void createUpload(ResultCallbackObj listener) { MultipartNetworkManger.createUpload(mContext, mGatewayCommunicationBase, mTargetPath, mFilePath, mBetag, mIsSync, mAlbumId, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { - Logger.d("zfy", "create upload result: " + result); + Logger.d("create upload result: " + result); if (result && extraObj != null) { if (isPause) { return; } logItem.createTaskEndTime = System.currentTimeMillis(); UploadCreateResponseBody createResponseBody = (UploadCreateResponseBody) extraObj; - Logger.d("zfy", "create upload success"); + Logger.d("create upload success"); if (createResponseBody.getResults() != null) { int repType = createResponseBody.getResults().rspType; - Logger.d("zfy", "repType = " + repType); + Logger.d("repType = " + repType); if (repType == 0) { //创建任务成功。获取uploadId，进行分片、传输 - Logger.d("zfy", "create new upload task"); + Logger.d("create new upload task"); UploadCreateResponseBody.Results.SuccInfo succInfo = createResponseBody.getResults().succInfo; if (succInfo != null) { mUploadId = succInfo.uploadId; - Logger.d("zfy", "uploadId=" + mUploadId); + Logger.d("uploadId=" + mUploadId); if (mTaskListener != null) { mTaskListener.onGetUploadId(mUploadId); } @@ -238,22 +238,22 @@ public void onResult(boolean result, Object extraObj) { } } else if (repType == 1) { //秒传完成。直接返回上传成功 - Logger.d("zfy", "秒传成功"); + Logger.d("秒传成功"); FileListItem fileItem = createResponseBody.getResults().completeInfo; if (fileItem != null) { listener.onResult(true, fileItem); } else { - Logger.d("zfy", "response data error"); + Logger.d("response data error"); listener.onResult(false, "-1"); } } else if (repType == 2) { //冲突，任务已存在。获取已上传列表，续传剩余分片 - Logger.d("zfy", "upload task already exist"); + Logger.d("upload task already exist"); UploadCreateResponseBody.Results.ConflictInfo conflictInfo = createResponseBody.getResults().conflictInfo; if (conflictInfo != null) { //获取已完成传输的片段 mUploadId = conflictInfo.uploadId; - Logger.d("zfy", "uploadId=" + mUploadId); + Logger.d("uploadId=" + mUploadId); if (mTaskListener != null) { mTaskListener.onGetUploadId(mUploadId); } @@ -270,7 +270,7 @@ public void onResult(boolean result, Object extraObj) { listener.onResult(false, "params error"); } } else { - Logger.d("zfy", "create upload error"); + Logger.d("create upload error"); listener.onResult(false, "create upload error"); } } @@ -278,7 +278,7 @@ public void onResult(boolean result, Object extraObj) { @Override public void onError(String msg) { - Logger.d("zfy", "create upload error " + msg); + Logger.d("create upload error " + msg); if (!isPause) { listener.onResult(false, msg); } @@ -350,7 +350,7 @@ public UploadWorkManager(BlockingDeque items, ResultCallbackObj public void run() { while (taskSwitch) { if (!NetUtils.isNetAvailable(mContext) || (!mIsSync && NetUtils.isMobileNetWork(mContext) && !ConstantField.sIAllowTransferWithMobileData)) { - Logger.d("zfy", "no network, transfer task waiting"); + Logger.d("no network, transfer task waiting"); try { Thread.sleep(3000); } catch (Exception e) { @@ -366,7 +366,7 @@ public void run() { mUploadDoingList.add(item); currentList.add(item); long startUpTime = System.currentTimeMillis(); - Logger.d("zfy", "startUpTime = " + startUpTime + ", p2p chunk: " + p2pChunk.get()); + Logger.d("startUpTime = " + startUpTime + ", p2p chunk: " + p2pChunk.get()); uploadWrap(item, new ResultCallback() { @Override public void onResult(boolean result, String extraMsg) { @@ -375,9 +375,9 @@ public void onResult(boolean result, String extraMsg) { long endUpTime = System.currentTimeMillis(); if (result) { - Logger.d("zfy", "endUpTime = " + endUpTime); + Logger.d("endUpTime = " + endUpTime); long chunkSpeed = (item.end - item.start) / (endUpTime - startUpTime) * 1000; - Logger.d("zfy", "chunkSpeed=" + chunkSpeed); + Logger.d("chunkSpeed=" + chunkSpeed); TaskSpeed.getInstance().start(); TaskSpeed.getInstance().updateUploadSpeed(uniqueTag, (chunkSpeed * currentList.size())); if (mUploadFailedList.contains(item)) { @@ -388,7 +388,7 @@ public void onResult(boolean result, String extraMsg) { } //单片上传成功，判断是否都上传完成 if (waitingQueue.isEmpty() && mUploadDoingList.isEmpty() && mUploadFailedList.isEmpty()) { - Logger.d("zfy", "all chunk upload success,complete"); + Logger.d("all chunk upload success,complete"); p2pChunk.getAndSet(0); logItem.transferEndTime = System.currentTimeMillis(); //全部片段上传完成，调用合并 @@ -401,12 +401,12 @@ public void onResult(boolean result, String extraMsg) { workThread = null; } else { currentList.remove(item); - Logger.d("zfy", "upload next chunk"); + Logger.d("upload next chunk"); } } else { - Logger.d("zfy", "chunk " + item.start + " failed"); + Logger.d("chunk " + item.start + " failed"); // P2PUpDownloadUtil.addError(uniqueTag, extraMsg); if (!NetUtils.isNetAvailable(mContext)) { @@ -416,7 +416,7 @@ public void onResult(boolean result, String extraMsg) { //单片上传失败 if (!TextUtils.isEmpty(extraMsg) && extraMsg.equals(String.valueOf(FailCodeUtil.ERROR_UPLOAD_LOCAL_SOURCE_DELETE))) { //本地文件被删除 - Logger.d("zfy", "chunk " + item.start + " delete, return"); + Logger.d("chunk " + item.start + " delete, return"); mListener.onResult(false, extraMsg); return; } @@ -435,7 +435,7 @@ public void onResult(boolean result, String extraMsg) { thisItemFailedTime = itemFailedTimes.get(item.start + ""); } if (thisItemFailedTime < MultipartUtil.RETRY_TIME) { - Logger.d("zfy", "chunk " + item.start + " failed time is:" + thisItemFailedTime + ",retry!"); + Logger.d("chunk " + item.start + " failed time is:" + thisItemFailedTime + ",retry!"); thisItemFailedTime++; try { Thread.sleep(2000); @@ -449,7 +449,7 @@ public void onResult(boolean result, String extraMsg) { } else { //超过重试次数，停止当前文件传输，返回失败 if (NetUtils.isNetAvailable(mContext)) { - Logger.d("zfy", "item failed too many time,give up " + item.start); + Logger.d("item failed too many time,give up " + item.start); taskSwitch = false; // P2PUpDownloadUtil.finishLoad(uniqueTag, System.currentTimeMillis()); if (uploadExecutor != null) { @@ -499,7 +499,7 @@ private void uploadWrap(UploadChunkBean uploadChunkItem, ResultCallback callback } UploadChunkBean uploadChunkInfo = MultipartUtil.getPlainChunkInfo(mFilePath, uploadChunkItem.start, uploadChunkItem.end); if (uploadChunkInfo == null) { - Logger.d("zfy", "create chunk file failed"); + Logger.d("create chunk file failed"); callback.onResult(false, "-1"); return; } @@ -540,7 +540,7 @@ public void onProgress(long currentSize, long totalSize, long appendSize, boolea UploadChunkBean uploadChunkInfo = MultipartUtil.createEncryptChunkFile(mFilePath, mCacheDir, uploadChunkItem.start, uploadChunkItem.end, mGatewayCommunicationBase.getTransformation(), mGatewayCommunicationBase.getSecretKey(), mGatewayCommunicationBase.getIvParams()); if (uploadChunkInfo == null) { - Logger.d("zfy", "create chunk file failed"); + Logger.d("create chunk file failed"); callback.onResult(false, "-1"); return; } @@ -571,7 +571,7 @@ public void onProgress(long currentSize, long totalSize, long appendSize, boolea //合并分片 private void completeChunks(ResultCallbackObj listener) { - Logger.d("zfy", "ready complete chunk, is pause: " + isPause); + Logger.d("ready complete chunk, is pause: " + isPause); if (isPause) { return; } @@ -585,24 +585,24 @@ private void completeChunks(ResultCallbackObj listener) { @Override public void onResult(boolean result, Object extraObj) { logItem.completeEndTime = System.currentTimeMillis(); - Logger.d("zfy", "complete chunk, is pause: " + isPause + ", result: " + result); + Logger.d("complete chunk, is pause: " + isPause + ", result: " + result); if (isPause) { return; } if (result && extraObj != null) { - Logger.d("zfy", "complete chunk"); + Logger.d("complete chunk"); mUploadId = null; FileListItem fileListItem = (FileListItem) extraObj; listener.onResult(true, fileListItem); } else { - Logger.d("zfy", "complete chunk fail"); + Logger.d("complete chunk fail"); if (!result && Integer.parseInt((String) extraObj) == 1032) { //合并校验失败，删除已上传分片 - Logger.d("zfy", "complete check error,delete task"); + Logger.d("complete check error,delete task"); MultipartNetworkManger.deleteUpload(mContext, mUploadId, new ResultCallbackObj() { @Override public void onResult(boolean result, Object extraObj) { - Logger.d("zfy", "delete upload task:" + result); + Logger.d("delete upload task:" + result); mUploadId = null; } @@ -618,7 +618,7 @@ public void onError(String msg) { @Override public void onError(String msg) { - Logger.d("zfy", "complete chunk error, is pause: " + isPause + ", msg: " + msg); + Logger.d("complete chunk error, is pause: " + isPause + ", msg: " + msg); if (!isPause) { listener.onResult(false, msg); } @@ -638,7 +638,7 @@ public void onError(String msg) { public void pauseTask() { // P2PUpDownloadUtil.finishLoad(uniqueTag, System.currentTimeMillis()); isPause = true; - Logger.d("zfy", "pause upload task:" + mUploadId + ",path=" + mFilePath); + Logger.d("pause upload task:" + mUploadId + ",path=" + mFilePath); if (TextUtils.isEmpty(mUploadId)) { return; } diff --git a/app/src/main/java/xyz/eulix/space/transfer/net/TransferNetUtil.java b/app/src/main/java/xyz/eulix/space/transfer/net/TransferNetUtil.java index 23959ff..878fffc 100644 --- a/app/src/main/java/xyz/eulix/space/transfer/net/TransferNetUtil.java +++ b/app/src/main/java/xyz/eulix/space/transfer/net/TransferNetUtil.java @@ -148,7 +148,7 @@ public static String postFile(String urlStr, String fileName, File file, String long fixedLength = accessTokenHeader.length() + accessToken.length() + newLine.length() + callRequestHeader.length() + callRequest.length() + newLine.length() + fileHeader.length() + fileLength + newLine.length() + (dash + boundary + dash + newLine).length(); - Logger.d("zfy", "fixedLength = " + fixedLength); + Logger.d("fixedLength = " + fixedLength); connection.setRequestProperty("request-id", requestId); connection.setRequestProperty("User-Agent", "Android Multipart HTTP Client 1.0"); @@ -189,7 +189,7 @@ public static String postFile(String urlStr, String fileName, File file, String // file data outputStream.writeBytes(fileHeader); - Logger.d("zfy", "totalSize=" + fileLength); + Logger.d("totalSize=" + fileLength); long currentSize = 0L; byte[] buffer = new byte[2048]; int count; @@ -206,7 +206,7 @@ public static String postFile(String urlStr, String fileName, File file, String currentPercent = (int) (currentSize * 100 / fileLength); //进度有变化时再回调，减少回调次数 if (currentPercent > oldPercent) { -// Logger.d("zfy", "currentSize = " + currentSize); +// Logger.d("currentSize = " + currentSize); isPercentChange = true; oldPercent = currentPercent; } else { @@ -226,7 +226,7 @@ public static String postFile(String urlStr, String fileName, File file, String int statusCode = connection.getResponseCode(); StringBuilder response = new StringBuilder(); - Logger.d("zfy", "transformNetUtil response=" + statusCode); + Logger.d("transformNetUtil response=" + statusCode); //解析返回数据 if (statusCode >= 200 && statusCode < 300) { BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); @@ -235,7 +235,7 @@ public static String postFile(String urlStr, String fileName, File file, String response.append(line); } String cipherResponseText = response.toString(); - Logger.d("zfy", "cipherResponseText" + cipherResponseText); + Logger.d("cipherResponseText" + cipherResponseText); if (!TextUtils.isEmpty(cipherResponseText)) { RealCallResult realCallResult = null; realCallResult = new Gson().fromJson(cipherResponseText, RealCallResult.class); @@ -245,7 +245,7 @@ public static String postFile(String urlStr, String fileName, File file, String if (body != null) { String decryptBody = EncryptionUtil.decrypt(transformation, null, body, secret, StandardCharsets.UTF_8, ivParams); - Logger.d("zfy", "decryptBody = " + decryptBody); + Logger.d("decryptBody = " + decryptBody); resultResponseStr = decryptBody; } } @@ -257,10 +257,10 @@ public static String postFile(String urlStr, String fileName, File file, String resultResponseStr = new Gson().toJson(responseBodyResult, UploadResponseBodyResult.class); } } catch (IOException e) { - Logger.d("zfy", "transformNetUtil exception"); + Logger.d("transformNetUtil exception"); e.printStackTrace(); } - Logger.d("zfy", "close connect"); + Logger.d("close connect"); connection.disconnect(); Logger.d("GarveyP2P", "http upload file end"); diff --git a/app/src/main/java/xyz/eulix/space/ui/EulixMainActivity.java b/app/src/main/java/xyz/eulix/space/ui/EulixMainActivity.java index 1b7dcda..0ff10f8 100644 --- a/app/src/main/java/xyz/eulix/space/ui/EulixMainActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/EulixMainActivity.java @@ -676,7 +676,7 @@ public void initEvent() { private boolean initDevice() { boolean isActiveExist = true; - Logger.d("zfy", "initDevice()"); + Logger.d(TAG, "[MAIN] initDevice()"); isRequestAvatar = false; deviceNumber = EulixSpaceDBUtil.getDeviceNumber(getApplicationContext(), false); List> boxValues = EulixSpaceDBUtil.queryBox(getApplicationContext() @@ -1033,7 +1033,8 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable @org. return; } String result = data.getExtras().getString(Intents.Scan.RESULT); - Logger.d(TAG, "qr code result: " + result); + Logger.d(TAG, "qr scan result received, isNull=" + (result == null) + + ", length=" + (result == null ? 0 : result.length())); if (result != null) { //解析二维码数据，并兼容旧格式 eg: p=aospace&bt=box-login&v=4e3022fd-156d-459f-8369-bbabe579b2b3 boolean isPlatformQrCode; @@ -1064,6 +1065,8 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable @org. value = paramMap.get("v"); } + Logger.i(TAG, "qr scan parsed, loginType=" + (isPlatformQrCode ? "platform" : "box") + + ", keyAvailable=" + (value != null && value.length() > 0)); Intent intent = new Intent(EulixMainActivity.this, GranterLoginActivity.class); if (!isPlatformQrCode) { intent.putExtra(GranterLoginActivity.KEY_IS_BOX_LOGIN, true); @@ -1641,4 +1644,4 @@ public void onEvent(AppInstallEvent event) { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/xyz/eulix/space/ui/EulixWebViewActivity.java b/app/src/main/java/xyz/eulix/space/ui/EulixWebViewActivity.java index 486b4b8..44a888c 100644 --- a/app/src/main/java/xyz/eulix/space/ui/EulixWebViewActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/EulixWebViewActivity.java @@ -209,7 +209,7 @@ public boolean onShowFileChooser(WebView webView, ValueCallback valueCall mUploadCallbackAboveL = valueCallback; String[] acceptTypes = fileChooserParams.getAcceptTypes(); if (acceptTypes.length > 0) { - Logger.e("zfy", "类型:" + acceptTypes[0]); + Logger.e("类型:" + acceptTypes[0]); showChoosePictureDialog(); } return true; @@ -297,11 +297,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { break; } path = data.getStringExtra("path"); - Logger.d("zfy", "图片地址：" + path); + Logger.d("图片地址：" + path); break; case CameraUtil.REQUEST_CAMERA_CODE: path = CameraUtil.getCameraBack(); - Logger.d("zfy", "照片地址：" + path); + Logger.d("照片地址：" + path); break; default: break; @@ -348,10 +348,10 @@ public void initData() { if (!TextUtils.isEmpty(intent.getStringExtra("jsObjName"))){ jsObjName = intent.getStringExtra("jsObjName"); } - Logger.d("zfy", "webview url=" + url); + Logger.d("webview url=" + url); if (!TextUtils.isEmpty(url)) { - Logger.d("zfy", "webview url=" + url); + Logger.d("webview url=" + url); } else if (imgResId != -1) { //展示本地图片 } else { @@ -419,13 +419,13 @@ public EulixJavascriptInterface(Context context) { */ @JavascriptInterface public void onClickExit() { - Logger.d("zfy", "web click exit"); + Logger.d("web click exit"); finish(); } @JavascriptInterface public void jsCallNativeMethod(String message) { - Logger.d("zfy", "js call native method: " + message); + Logger.d("js call native method: " + message); JSONObject jsonObject = null; JSONObject params = null; String method = null; diff --git a/app/src/main/java/xyz/eulix/space/ui/ExoPlayerActivity.java b/app/src/main/java/xyz/eulix/space/ui/ExoPlayerActivity.java index 9d9e601..9faa400 100644 --- a/app/src/main/java/xyz/eulix/space/ui/ExoPlayerActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/ExoPlayerActivity.java @@ -187,7 +187,7 @@ public void onPlaybackStateChanged(int playbackState) { @Override public void onPlayerError(PlaybackException error) { Player.Listener.super.onPlayerError(error); - Logger.d("zfy", "onPlayerError " + error.errorCode + ",msg:" + error.getMessage()); + Logger.d("onPlayerError " + error.errorCode + ",msg:" + error.getMessage()); // if (!isOnline) { // //非在线播放失败，调用第三方播放器 // SystemMediaUtils.openMediaFile(EulixSpaceApplication.getContext(), mVideoLocalPath); @@ -355,7 +355,7 @@ private MediaSource getLocalMediaSource() { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(LanStatusEvent event) { - Logger.d("zfy", "receive LanStatusEvent " + event.isLanEnable); + Logger.d("receive LanStatusEvent " + event.isLanEnable); if (isOnline) { changeLanSourceStatus(event.isLanEnable); } @@ -363,7 +363,7 @@ public void onEvent(LanStatusEvent event) { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(VideoSegmentLogEvent event) { - Logger.d("zfy", "receive VideoSegmentLogEvent " + event.videoName + ",sourceType=" + event.sourceType); + Logger.d("receive VideoSegmentLogEvent " + event.videoName + ",sourceType=" + event.sourceType); if (event.videoName != null && event.videoName.equals(mVideoName)) { if (event.sourceType == VideoSegmentLogEvent.SOURCE_TYPE_P2P) { mP2PSegmentCount++; @@ -391,7 +391,7 @@ private void changeLanSourceStatus(boolean isLanEnable) { MediaSource mediaSource = getOnlineMediaSource(isLanEnable); if (mediaSource != null) { isUsingLan = isLanEnable; - Logger.d("zfy", "change video source to " + (isLanEnable ? "lan" : "wan")); + Logger.d("change video source to " + (isLanEnable ? "lan" : "wan")); long currentPosition = player.getCurrentPosition(); player.setMediaSource(mediaSource); player.prepare(); diff --git a/app/src/main/java/xyz/eulix/space/ui/FilePreviewActivity.java b/app/src/main/java/xyz/eulix/space/ui/FilePreviewActivity.java index b526fda..f77a6c4 100644 --- a/app/src/main/java/xyz/eulix/space/ui/FilePreviewActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/FilePreviewActivity.java @@ -381,7 +381,7 @@ public File getTemporaryDirectory() { public void openFileFinish() { //加载成功 closeLoading(); - Logger.d("zfy", "openFileFinish"); + Logger.d("openFileFinish"); if (isShowBottomEdit) { fileEditContainer.setVisibility(View.VISIBLE); @@ -406,14 +406,14 @@ public void openFileFinish() { ((APageListView) view).setFitSize(1); int currentPageNumber = ((APageListView) view).getCurrentPageNumber(); int totalPageCount = ((APageListView) view).getPageCount(); - Logger.d("zfy", currentPageNumber + "/" + totalPageCount); + Logger.d(currentPageNumber + "/" + totalPageCount); } } @Override public void error(int errorCode) { //加载失败 - Logger.d("zfy", "load error:" + errorCode); + Logger.d("load error:" + errorCode); closeLoading(); showNotSupportPreview(); } @@ -426,14 +426,14 @@ public boolean isShowProgressBar() { @Override public boolean onEventMethod(View v, MotionEvent e1, MotionEvent e2, float xValue, float yValue, byte eventMethodType) { -// Logger.d("zfy","onEventMethod eventMethodType:"+eventMethodType); +// Logger.d("onEventMethod eventMethodType:"+eventMethodType); if (eventMethodType == IPageListViewListener.ON_FLING) { View view = getOfficeView(); if (view instanceof APageListView) { int currentPageNumber = ((APageListView) view).getCurrentPageNumber(); int totalPageCount = ((APageListView) view).getPageCount(); - Logger.d("zfy", currentPageNumber + "/" + totalPageCount); + Logger.d(currentPageNumber + "/" + totalPageCount); } } return super.onEventMethod(v, e1, e2, xValue, yValue, eventMethodType); @@ -575,13 +575,13 @@ public void onError(String msg) { pdfView.fromFile(pdfFile).onError(new OnErrorListener() { @Override public void onError(Throwable t) { - Logger.d("zfy", "load pdf onError"); + Logger.d("load pdf onError"); showNotSupportPreview(); } }).onLoad(new OnLoadCompleteListener() { @Override public void loadComplete(int nbPages) { - Logger.d("zfy", "load pdf success.pages:" + nbPages); + Logger.d("load pdf success.pages:" + nbPages); closeLoading(); } }).load(); @@ -592,12 +592,12 @@ public void loadComplete(int nbPages) { } } else if (FileUtil.isOfficeFile(mimeType)) { if (iOffice != null) { - Logger.d("zfy", "open office file:" + absolutePath); + Logger.d("open office file:" + absolutePath); showLoading(""); try { iOffice.openFile(absolutePath); } catch (Exception e) { - Logger.d("zfy", "open office exception"); + Logger.d("open office exception"); e.printStackTrace(); closeLoading(); showNotSupportPreview(); @@ -631,7 +631,7 @@ private void showNotSupportPreview() { //调用分享工具进行分享 @Override public void callShareUtil(String fileAbsolutePath) { - Logger.d("zfy", fileAbsolutePath); + Logger.d(fileAbsolutePath); if (shareLoadingDialog != null && shareLoadingDialog.isShowing()) { shareLoadingDialog.dismiss(); } @@ -685,7 +685,7 @@ public void onEvent(TransferSizeEvent event) { } //刷新进度 int progress = (int) (event.currentSize * 100 / fileSize); - 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); @@ -726,7 +726,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); finish(); } @@ -772,7 +772,7 @@ public void onEvent(DeleteFileEvent event) { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(RenameFileEvent event) { - Logger.d("zfy", "#FilePreviewActivity RenameFileEvent"); + Logger.d("#FilePreviewActivity RenameFileEvent"); //成功重命名，刷新文件 if (!event.getUuid().equals(fileUuid)) { return; diff --git a/app/src/main/java/xyz/eulix/space/ui/FileSearchActivity.java b/app/src/main/java/xyz/eulix/space/ui/FileSearchActivity.java index 8e30508..fe74633 100644 --- a/app/src/main/java/xyz/eulix/space/ui/FileSearchActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/FileSearchActivity.java @@ -1285,14 +1285,14 @@ public void onWindowFocusChanged(boolean hasFocus) { //预览页删除文件 @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(DeleteFileEvent event) { - Logger.d("zfy", "receive DeleteEvent"); + Logger.d("receive DeleteEvent"); showImageTextToast(R.drawable.toast_right, R.string.delete_success); refreshEulixSpaceStorage(); } @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(TransferStateEvent event) { - Logger.d("zfy", "receive TransferStateEvent:" + event.state); + Logger.d("receive TransferStateEvent:" + event.state); } @Override diff --git a/app/src/main/java/xyz/eulix/space/ui/LocalMediaSelectActivity.java b/app/src/main/java/xyz/eulix/space/ui/LocalMediaSelectActivity.java index 40685bd..58f4904 100644 --- a/app/src/main/java/xyz/eulix/space/ui/LocalMediaSelectActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/LocalMediaSelectActivity.java @@ -332,7 +332,7 @@ public void initEvent() { } break; case TitleBarWithSelect.CLICK_EVENT_SELECT_NULL: - Logger.d("zfy", "onSelectNone"); + Logger.d("onSelectNone"); presenter.dataSelected.clear(); refreshShowCount(presenter.dataSelected.size()); for (int i = 0; i < adapter.dataList.size(); i++) { @@ -375,7 +375,7 @@ private void callUploadManager() { ArrayList tmpList = new ArrayList<>(); tmpList.addAll(presenter.dataSelected); for (LocalMediaUpItem item : tmpList) { - Logger.d("zfy", "upload file path:" + item.getMediaPath()); + Logger.d("upload file path:" + item.getMediaPath()); int index = item.getMediaPath().lastIndexOf("/"); String fileName = item.getMediaPath().substring(index + 1); String filePath = item.getMediaPath().substring(0, index + 1); diff --git a/app/src/main/java/xyz/eulix/space/ui/TransferListActivity.java b/app/src/main/java/xyz/eulix/space/ui/TransferListActivity.java index d99a236..8536650 100644 --- a/app/src/main/java/xyz/eulix/space/ui/TransferListActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/TransferListActivity.java @@ -90,7 +90,7 @@ public void initView() { @Override public void initData() { - Logger.d("zfy", "initData"); + Logger.d("initData"); } @Override @@ -126,7 +126,7 @@ public void initViewData() { viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - Logger.d("zfy", "onPageScrolled"); + Logger.d("onPageScrolled"); } @Override @@ -140,7 +140,7 @@ public void onPageSelected(int position) { @Override public void onPageScrollStateChanged(int state) { - Logger.d("zfy", "onPageScrollStateChanged"); + Logger.d("onPageScrollStateChanged"); } }); @@ -184,14 +184,14 @@ public void onTabReselected(TabLayout.Tab tab) { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(LanStatusEvent event) { - Logger.d("zfy", "receive LanStatusEvent " + event.isLanEnable); + Logger.d("receive LanStatusEvent " + event.isLanEnable); refreshNetChannelStateView(); super.onEvent(event); } @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(SpaceOnlineCallbackEvent event) { - Logger.d("zfy", "receive SpaceOnlineCallbackEvent " + event.isOnline()); + Logger.d("receive SpaceOnlineCallbackEvent " + event.isOnline()); refreshNetChannelStateView(); } diff --git a/app/src/main/java/xyz/eulix/space/ui/authorization/GranteeLoginActivity.java b/app/src/main/java/xyz/eulix/space/ui/authorization/GranteeLoginActivity.java index 3d29bc3..ffffc1c 100644 --- a/app/src/main/java/xyz/eulix/space/ui/authorization/GranteeLoginActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/authorization/GranteeLoginActivity.java @@ -233,7 +233,7 @@ public void initViewData() { } urlSb.append("&isOpensource=1"); String boxLoginPageUrl = urlSb.toString(); - Logger.d("zfy", "boxLoginPageUrl=" + boxLoginPageUrl); + Logger.d("boxLoginPageUrl=" + boxLoginPageUrl); createWebView(boxLoginPageUrl); } } diff --git a/app/src/main/java/xyz/eulix/space/ui/authorization/GranterLoginActivity.java b/app/src/main/java/xyz/eulix/space/ui/authorization/GranterLoginActivity.java index ba16b04..2f4be3f 100644 --- a/app/src/main/java/xyz/eulix/space/ui/authorization/GranterLoginActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/authorization/GranterLoginActivity.java @@ -283,7 +283,7 @@ public void authCodeCallback(AuthCodeInfo authCodeInfo) { } } } catch (Exception e) { - Logger.e("zfy", e.getMessage()); + Logger.e(e.getMessage()); } } } diff --git a/app/src/main/java/xyz/eulix/space/ui/bind/UnbindDeviceActivity.java b/app/src/main/java/xyz/eulix/space/ui/bind/UnbindDeviceActivity.java index 2a0a3bd..6473c5a 100644 --- a/app/src/main/java/xyz/eulix/space/ui/bind/UnbindDeviceActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/bind/UnbindDeviceActivity.java @@ -416,7 +416,7 @@ private void handlePasswordWrong(List timestampList) { @Override public void onRevokeResult(boolean result, int code, String source, List timestampList) { - Logger.d("zfy", "revoke result:" + result); + Logger.d("revoke result:" + result); if (mHandler != null) { mHandler.post(() -> { closeLoading(); diff --git a/app/src/main/java/xyz/eulix/space/ui/mine/AboutUsActivity.java b/app/src/main/java/xyz/eulix/space/ui/mine/AboutUsActivity.java index f50f5d8..c96dde0 100644 --- a/app/src/main/java/xyz/eulix/space/ui/mine/AboutUsActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/mine/AboutUsActivity.java @@ -366,7 +366,7 @@ public void onEvent(AppInstallEvent event) { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(BoxVersionCheckEvent event) { - Logger.d("zfy", "device manager BoxVersionCheckEvent"); + Logger.d("device manager BoxVersionCheckEvent"); if (ConstantField.boxVersionCheckBody != null) { newSystemVersionReminder.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/java/xyz/eulix/space/ui/mine/BoxSystemDetailActivity.java b/app/src/main/java/xyz/eulix/space/ui/mine/BoxSystemDetailActivity.java index 0696624..a72cabc 100644 --- a/app/src/main/java/xyz/eulix/space/ui/mine/BoxSystemDetailActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/mine/BoxSystemDetailActivity.java @@ -137,7 +137,7 @@ private void refreshViewInfo(DeviceVersionInfoBean deviceVersionInfoBean) { @Override public void initEvent() { btnCheckUpdate.setOnClickListener(v -> { - Logger.d("zfy", "click btnCheckUpdate"); + Logger.d("click btnCheckUpdate"); changeBtnState(true); presenter.checkBoxVersion(); }); diff --git a/app/src/main/java/xyz/eulix/space/ui/mine/DeviceManageActivity.java b/app/src/main/java/xyz/eulix/space/ui/mine/DeviceManageActivity.java index 8db2cff..f59c8c2 100644 --- a/app/src/main/java/xyz/eulix/space/ui/mine/DeviceManageActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/mine/DeviceManageActivity.java @@ -429,7 +429,7 @@ public void initEvent() { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(BoxVersionCheckEvent event) { - Logger.d("zfy", "device manager BoxVersionCheckEvent"); + Logger.d("device manager BoxVersionCheckEvent"); if (ConstantField.boxVersionCheckBody != null) { tvDeviceUpdateFlag.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/java/xyz/eulix/space/ui/mine/SystemUpdateActivity.java b/app/src/main/java/xyz/eulix/space/ui/mine/SystemUpdateActivity.java index 27ac2bd..d58b86c 100644 --- a/app/src/main/java/xyz/eulix/space/ui/mine/SystemUpdateActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/mine/SystemUpdateActivity.java @@ -271,13 +271,13 @@ public void onClick(DialogInterface dialog, int which) { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(BoxSystemRestartEvent event) { //接受到系统重启 - Logger.d("zfy", "receive BoxSystemRestartEvent"); + Logger.d("receive BoxSystemRestartEvent"); if (SystemUpdatePresenter.sUpgradeState > SystemUpdatePresenter.STATE_NORMAL) { - Logger.d("zfy", "system upgrade task is progress"); + Logger.d("system upgrade task is progress"); closeLoading(); showLoading(getResources().getString(R.string.restarting_device)); } else { - Logger.d("zfy", "system upgrade task is finish"); + Logger.d("system upgrade task is finish"); } } diff --git a/app/src/main/java/xyz/eulix/space/ui/mine/UserInfoActivity.java b/app/src/main/java/xyz/eulix/space/ui/mine/UserInfoActivity.java index e23e6a7..bf7cd3d 100644 --- a/app/src/main/java/xyz/eulix/space/ui/mine/UserInfoActivity.java +++ b/app/src/main/java/xyz/eulix/space/ui/mine/UserInfoActivity.java @@ -296,7 +296,7 @@ private void updateAccessInfoPattern(AOSpaceAccessBean aoSpaceAccessBean) { @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(UserInfoEvent event) { - Logger.d("zfy", "receive UserInfoEvent type = " + event.type); + Logger.d("receive UserInfoEvent type = " + event.type); if (event.type == UserInfoEvent.TYPE_NAME) { //更新昵称 String nickName = UserInfoUtil.getNickname(this); @@ -474,12 +474,12 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { return; } path = data.getStringExtra("path"); - Logger.d("zfy", "图片地址：" + path); + Logger.d("图片地址：" + path); callClipImage(path, mOutputPath); break; case CameraUtil.REQUEST_CAMERA_CODE: path = CameraUtil.getCameraBack(); - Logger.d("zfy", "照片地址：" + path); + Logger.d("照片地址：" + path); callClipImage(path, mOutputPath); break; default: @@ -491,7 +491,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { && requestCode == CameraUtil.REQUEST_CLIP_CODE) { //裁剪成功 String pathClip = ClipImageActivity.ClipOptions.createFromBundle(data).getOutputPath(); - Logger.d("zfy", "pathClip=" + pathClip); + Logger.d("pathClip=" + pathClip); showLoading(getString(R.string.uploading_avatar)); presenter.updateHeader(this, pathClip); } diff --git a/app/src/main/java/xyz/eulix/space/util/AlbumNotifyHelper.java b/app/src/main/java/xyz/eulix/space/util/AlbumNotifyHelper.java index e5f6683..5656c5b 100644 --- a/app/src/main/java/xyz/eulix/space/util/AlbumNotifyHelper.java +++ b/app/src/main/java/xyz/eulix/space/util/AlbumNotifyHelper.java @@ -204,7 +204,7 @@ public static void insertFileToMediaStore(Context context, String filePath, long context.getApplicationContext().getContentResolver().insert(MediaStore.Files.getContentUri("external"), values); } catch (Exception e) { e.printStackTrace(); - Logger.d("zfy", "insertFileToMediaStore error"); + Logger.d("insertFileToMediaStore error"); Logger.e(e.getMessage()); } diff --git a/app/src/main/java/xyz/eulix/space/util/ConstantField.java b/app/src/main/java/xyz/eulix/space/util/ConstantField.java index 9d77f93..af5f4a7 100644 --- a/app/src/main/java/xyz/eulix/space/util/ConstantField.java +++ b/app/src/main/java/xyz/eulix/space/util/ConstantField.java @@ -973,18 +973,18 @@ public static class PushExtraKey { } public static class URL { - public static final String BASE_SERVER_URL_RELEASE = "https://services.eulix.xyz/"; + public static final String BASE_SERVER_URL_RELEASE = "https://ao.space/"; @Deprecated public static final String REGISTER_DEVICE_API = "platform/v1/api/register/device/"; public static final String SERVERS_STUN_DETAIL_V2_API = "v2/platform/servers/stun/detail"; - public static final String EULIX_XYZ_URL = "https://eulix.xyz/"; - public static final String EULIX_TOP_URL = "https://eulix.top/"; - public static final String DEV_EULIX_XYZ_URL = "https://dev.eulix.xyz/"; - public static final String TEST_EULIX_XYZ_URL = "https://test.eulix.xyz/"; - public static final String QA_EULIX_XYZ_URL = "https://qa.eulix.xyz/"; - public static final String SIT_EULIX_XYZ_URL = "https://sit.eulix.xyz/"; + public static final String EULIX_XYZ_URL = "https://ao.space/"; + public static final String EULIX_TOP_URL = "https://ao.space/"; + public static final String DEV_EULIX_XYZ_URL = "https://ao.space/"; + public static final String TEST_EULIX_XYZ_URL = "https://ao.space/"; + public static final String QA_EULIX_XYZ_URL = "https://ao.space/"; + public static final String SIT_EULIX_XYZ_URL = "https://ao.space/"; public static final String AO_SPACE_URL = "https://ao.space/"; public static final String LOGIN_API = "login"; public static final String EN_LOGIN_API = "en/login"; @@ -1022,7 +1022,7 @@ public static class URL { public static final String SEND_MESSAGES_API = "space/v1/api/mailbox/sendmessage"; public static final String DELETE_MESSAGES_API = "space/v1/api/mailbox/deletemessage"; - public static final String BASE_GATEWAY_URL_DEBUG = "https://mybox.space.eulix.xyz/"; + public static final String BASE_GATEWAY_URL_DEBUG = "https://ao.space/"; public static final String SPACE_STATUS_API = "space/status"; public static final String SPACE_POLL_API = "space/v1/api/gateway/poll"; public static final String CREATE_AUTH_TOKEN_API = "space/v1/api/gateway/auth/token/create"; @@ -1067,24 +1067,24 @@ public static class URL { public static final String BIND_REVOKE_API = "agent/v1/api/bind/revoke"; public static final String BIND_INTERNET_SERVICE_CONFIG_API = "agent/v1/api/bind/internet/service/config"; public static final String DID_DOCUMENT_API = "agent/v1/api/did/document"; - public static final String TEST_SERVICE_URL = "https://test.eulix.xyz/"; - public static final String SERVICE_URL = "https://eulix.xyz/"; - public static final String SERVICE_TOP_URL = "https://eulix.top/"; - public static final String DEV_SERVICE_URL = "https://dev.eulix.xyz/"; - public static final String QA_SERVICE_URL = "https://qa.eulix.xyz/"; - public static final String SIT_SERVICE_URL = "https://sit.eulix.xyz/"; + public static final String TEST_SERVICE_URL = "https://ao.space/"; + public static final String SERVICE_URL = "https://ao.space/"; + public static final String SERVICE_TOP_URL = "https://ao.space/"; + public static final String DEV_SERVICE_URL = "https://ao.space/"; + public static final String QA_SERVICE_URL = "https://ao.space/"; + public static final String SIT_SERVICE_URL = "https://ao.space/"; public static final String SERVICE_AO_SPACE_URL = "https://ao.space/"; - public static final String RC_WEB_BASE_URL = "https://eulix.xyz"; - public static final String RC_SPACE_API = "eulix.xyz"; - public static final String DEV_WEB_BASE_URL = "https://dev.eulix.xyz"; - public static final String DEV_SPACE_API = "dev-space.eulix.xyz"; - public static final String TEST_WEB_BASE_URL = "https://test.eulix.xyz"; - public static final String TEST_SPACE_API = "test-space.eulix.xyz"; - public static final String QA_WEB_BASE_URL = "https://qa.eulix.xyz"; - public static final String QA_SPACE_API = "qa-space.eulix.xyz"; - public static final String SIT_WEB_BASE_URL = "https://sit.eulix.xyz"; - public static final String SIT_SPACE_API = "sit-space.eulix.xyz"; + public static final String RC_WEB_BASE_URL = "https://ao.space"; + public static final String RC_SPACE_API = "ao.space"; + public static final String DEV_WEB_BASE_URL = "https://ao.space"; + public static final String DEV_SPACE_API = "ao.space"; + public static final String TEST_WEB_BASE_URL = "https://ao.space"; + public static final String TEST_SPACE_API = "ao.space"; + public static final String QA_WEB_BASE_URL = "https://ao.space"; + public static final String QA_SPACE_API = "ao.space"; + public static final String SIT_WEB_BASE_URL = "https://ao.space"; + public static final String SIT_SPACE_API = "ao.space"; public static final String PROD_WEB_BASE_URL = "https://ao.space"; public static final String PROD_SPACE_API = "ao.space"; diff --git a/app/src/main/java/xyz/eulix/space/util/DeploymentModeUtil.java b/app/src/main/java/xyz/eulix/space/util/DeploymentModeUtil.java new file mode 100644 index 0000000..c9e2872 --- /dev/null +++ b/app/src/main/java/xyz/eulix/space/util/DeploymentModeUtil.java @@ -0,0 +1,13 @@ +package xyz.eulix.space.util; + +import xyz.eulix.space.BuildConfig; + +public class DeploymentModeUtil { + private DeploymentModeUtil() { + throw new AssertionError("not allow to be instantiation!"); + } + + public static boolean isNoPlatformMode() { + return BuildConfig.NO_PLATFORM_MODE; + } +} diff --git a/app/src/main/java/xyz/eulix/space/util/EncryptionUtil.java b/app/src/main/java/xyz/eulix/space/util/EncryptionUtil.java index 6270756..e236f0f 100644 --- a/app/src/main/java/xyz/eulix/space/util/EncryptionUtil.java +++ b/app/src/main/java/xyz/eulix/space/util/EncryptionUtil.java @@ -247,7 +247,7 @@ public static File encrypt(String algorithm, String provider, File file, String resFile=new File(resFilePath, "en_"+file.getName()); if (resFile.exists()){ boolean result = resFile.delete(); - Logger.d("zfy", "file delete "+result); + Logger.d("file delete "+result); } try( FileInputStream fis = new FileInputStream(file); FileOutputStream fos=new FileOutputStream(resFile); @@ -321,7 +321,7 @@ public static File decrypt(String algorithm, String provider, InputStream inputS resFile = new File(resFilePath, decryptFileName); if (resFile.exists()) { boolean result = resFile.delete(); - Logger.d("zfy", "file delete "+result); + Logger.d("file delete "+result); } try (InputStream fis = inputStream; FileOutputStream fos = new FileOutputStream(resFile);){ @@ -352,7 +352,7 @@ public static File decrypt(String algorithm, String provider, InputStream inputS progressListener.onProgress(currentSize, fileSize, len, false,false); } } -// Logger.d("zfy", "currentSize = " + currentSize); +// Logger.d("currentSize = " + currentSize); } cos.close(); resultFile = resFile; diff --git a/app/src/main/java/xyz/eulix/space/util/FileUtil.java b/app/src/main/java/xyz/eulix/space/util/FileUtil.java index d08706c..cb1760c 100644 --- a/app/src/main/java/xyz/eulix/space/util/FileUtil.java +++ b/app/src/main/java/xyz/eulix/space/util/FileUtil.java @@ -373,10 +373,10 @@ public static boolean copyFile(String sourceAbsolute, String targetPath) { File targetFolder = new File(targetPath); if (!targetFolder.exists()) { boolean result = targetFolder.mkdir(); - Logger.d("zfy", "target folder mkdir: " + result); + Logger.d("target folder mkdir: " + result); } String targetFileName = targetPath + sourceFile.getName(); - Logger.d("zfy", "targetFileName = " + targetFileName); + Logger.d("targetFileName = " + targetFileName); File targetFile = new File(targetPath, sourceFile.getName()); if (targetFile.exists()) { boolean result = targetFile.delete(); @@ -472,7 +472,7 @@ public static String getFileCharset(File sourceFile) { } catch (Exception e) { e.printStackTrace(); } - Logger.d("zfy", "txt charset:" + charset); + Logger.d("txt charset:" + charset); return charset; } diff --git a/app/src/main/java/xyz/eulix/space/util/LocalMediaUpSelectHelper.java b/app/src/main/java/xyz/eulix/space/util/LocalMediaUpSelectHelper.java index 235bbdf..e1b4db2 100644 --- a/app/src/main/java/xyz/eulix/space/util/LocalMediaUpSelectHelper.java +++ b/app/src/main/java/xyz/eulix/space/util/LocalMediaUpSelectHelper.java @@ -242,7 +242,7 @@ void buildMediaBucketList() { cur.getString(photoPathIndex).lastIndexOf("/") + 1, typeIndex); } catch (Exception e) { - Logger.e("zfy", e.getMessage()); + Logger.e(e.getMessage()); } if (TextUtils.isEmpty(fileName)) { continue; @@ -261,7 +261,7 @@ void buildMediaBucketList() { File file = new File(path); if (!file.exists()) { - Logger.d("zfy", "file not exist." + file.getAbsolutePath()); + Logger.d("file not exist." + file.getAbsolutePath()); continue; } @@ -269,7 +269,7 @@ void buildMediaBucketList() { long fileSize = cur.getLong(fileSizeIndex); if (mLimitSwitch && fileSize > mLimitSize) { //文件大小超过限制 - Logger.d("zfy", fileName + ", file over size: " + fileSize); + Logger.d(fileName + ", file over size: " + fileSize); continue; } long modifiedDate = cur.getLong(dateIndex); @@ -410,7 +410,7 @@ private void buildCameraMediaList(int mediaType) { cur.getString(photoPathIndex).lastIndexOf("/") + 1, typeIndex); } catch (Exception e) { - Logger.e("zfy", e.getMessage()); + Logger.e(e.getMessage()); } if (TextUtils.isEmpty(fileName)) { continue; diff --git a/app/src/main/java/xyz/eulix/space/util/LocalMediaUtil.java b/app/src/main/java/xyz/eulix/space/util/LocalMediaUtil.java index be7bfee..d258fe5 100644 --- a/app/src/main/java/xyz/eulix/space/util/LocalMediaUtil.java +++ b/app/src/main/java/xyz/eulix/space/util/LocalMediaUtil.java @@ -104,7 +104,7 @@ private static LocalMediaUpItem getLocalMediaByUriAndType(Uri uri, ContentResolv } } } catch (Exception e) { - Logger.e("zfy", e.getMessage()); + Logger.e(e.getMessage()); } finally { if (cur != null) { cur.close(); diff --git a/app/src/main/java/xyz/eulix/space/util/Logger.java b/app/src/main/java/xyz/eulix/space/util/Logger.java index c979d7f..8531018 100644 --- a/app/src/main/java/xyz/eulix/space/util/Logger.java +++ b/app/src/main/java/xyz/eulix/space/util/Logger.java @@ -16,6 +16,8 @@ package xyz.eulix.space.util; +import android.net.Uri; +import android.text.TextUtils; import android.util.Log; import xyz.eulix.space.BuildConfig; @@ -124,4 +126,35 @@ public static void e(String tag, String msg, Throwable tr) { } } } + + public static String safeUrl(String rawUrl) { + if (TextUtils.isEmpty(rawUrl)) { + return "null"; + } + try { + Uri uri = Uri.parse(rawUrl); + String scheme = uri.getScheme(); + String host = uri.getHost(); + if (TextUtils.isEmpty(scheme) || TextUtils.isEmpty(host)) { + return rawUrl; + } + String path = uri.getPath(); + return scheme + "://" + host + (path == null ? "" : path); + } catch (Exception e) { + return rawUrl; + } + } + + public static String maskMiddle(String source, int prefixLength, int suffixLength) { + if (source == null) { + return "null"; + } + int sourceLength = source.length(); + if (sourceLength <= prefixLength + suffixLength) { + return source; + } + String prefix = source.substring(0, Math.max(prefixLength, 0)); + String suffix = source.substring(sourceLength - Math.max(suffixLength, 0)); + return prefix + "***" + suffix; + } } diff --git a/app/src/main/java/xyz/eulix/space/util/Urls.java b/app/src/main/java/xyz/eulix/space/util/Urls.java index ed74c5f..00cfd72 100644 --- a/app/src/main/java/xyz/eulix/space/util/Urls.java +++ b/app/src/main/java/xyz/eulix/space/util/Urls.java @@ -28,6 +28,7 @@ * History: 2021/12/24 */ public class Urls { + private static final String TAG = Urls.class.getSimpleName(); /** * @return 只获取ip地址 @@ -58,12 +59,14 @@ public static String generateBaseUrl(String boxDomain) { String baseUrl = boxDomain; if (baseUrl == null) { baseUrl = ConstantField.URL.BASE_GATEWAY_URL_DEBUG; + Logger.w(TAG, "boxDomain is null, fallback baseUrl=" + Logger.safeUrl(baseUrl)); } else { while ((baseUrl.startsWith(":") || baseUrl.startsWith("/")) && baseUrl.length() > 1) { baseUrl = baseUrl.substring(1); } if (TextUtils.isEmpty(baseUrl)) { baseUrl = ConstantField.URL.BASE_GATEWAY_URL_DEBUG; + Logger.w(TAG, "boxDomain is empty after normalize, fallback baseUrl=" + Logger.safeUrl(baseUrl)); } else { if (!(baseUrl.startsWith("http://") || baseUrl.startsWith("https://"))) { baseUrl = "https://" + baseUrl; @@ -73,6 +76,7 @@ public static String generateBaseUrl(String boxDomain) { } } } + Logger.d(TAG, "generateBaseUrl result=" + Logger.safeUrl(baseUrl)); return baseUrl; } } diff --git a/app/src/main/java/xyz/eulix/space/util/Utils.java b/app/src/main/java/xyz/eulix/space/util/Utils.java index 4ddc425..3daea31 100644 --- a/app/src/main/java/xyz/eulix/space/util/Utils.java +++ b/app/src/main/java/xyz/eulix/space/util/Utils.java @@ -110,7 +110,7 @@ public static void forceHideSoftInput(Activity activity) { InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); } catch (Exception e) { - Logger.e("zfy", e.getMessage()); + Logger.e(e.getMessage()); } } diff --git a/app/src/main/java/xyz/eulix/space/util/VideoPlayUtil.java b/app/src/main/java/xyz/eulix/space/util/VideoPlayUtil.java index 5dab3c7..d5a9a36 100644 --- a/app/src/main/java/xyz/eulix/space/util/VideoPlayUtil.java +++ b/app/src/main/java/xyz/eulix/space/util/VideoPlayUtil.java @@ -176,7 +176,7 @@ private static void downloadM3u8File(Context context, String uuid, ResultCallbac private static void parseM3u8(Context context, String uuid, String zipSourcePath, ResultCallback callback) { File zipSourceFile = new File(zipSourcePath); if (!zipSourceFile.exists()) { - Logger.d("zfy", "zipSourceFile not exist!" + zipSourcePath); + Logger.d("zipSourceFile not exist!" + zipSourcePath); if (callback != null) { callback.onResult(false, "zip not exist"); } @@ -190,7 +190,7 @@ private static void parseM3u8(Context context, String uuid, String zipSourcePath } //zip解压 boolean unZipResult = FileUtil.unZipFolder(zipSourcePath, m3u8Path); - Logger.d("zfy", "unZipResult:" + unZipResult); + Logger.d("unZipResult:" + unZipResult); if (callback != null) { callback.onResult(unZipResult, m3u8Path); } diff --git a/app/src/main/java/xyz/eulix/space/view/NormalEditInputView.java b/app/src/main/java/xyz/eulix/space/view/NormalEditInputView.java index dda51ad..416e4a9 100644 --- a/app/src/main/java/xyz/eulix/space/view/NormalEditInputView.java +++ b/app/src/main/java/xyz/eulix/space/view/NormalEditInputView.java @@ -163,7 +163,7 @@ public void afterTextChanged(Editable s) { } } etPassword.setSelection(s.toString().length()); - Logger.d("zfy", "您的输入已超过" + mMaxLength + "位"); + Logger.d("您的输入已超过" + mMaxLength + "位"); } if (mListener != null) { mListener.onInputChange(etPassword.getText().toString()); diff --git a/app/src/main/java/xyz/eulix/space/view/dialog/PrivacyAgreementDialog.java b/app/src/main/java/xyz/eulix/space/view/dialog/PrivacyAgreementDialog.java index 6ff1d4d..b17a412 100644 --- a/app/src/main/java/xyz/eulix/space/view/dialog/PrivacyAgreementDialog.java +++ b/app/src/main/java/xyz/eulix/space/view/dialog/PrivacyAgreementDialog.java @@ -106,7 +106,7 @@ public PrivacyAgreementDialog create() { LinkClickSpan trialSpan = new LinkClickSpan() { @Override public void onClick(View widget) { - Logger.d("zfy","click trial"); + Logger.d("click trial"); String url = FormatUtil.isChinese(FormatUtil.getLocale(mContext) , false) ? ConstantField.URL.AGREEMENT_API : ConstantField.URL.EN_AGREEMENT_API; @@ -117,7 +117,7 @@ public void onClick(View widget) { LinkClickSpan privacySpan = new LinkClickSpan() { @Override public void onClick(View widget) { - Logger.d("zfy","click privacy"); + Logger.d("click privacy"); String url = FormatUtil.isChinese(FormatUtil.getLocale(mContext) , false) ? ConstantField.URL.PRIVACY_API : ConstantField.URL.EN_PRIVACY_API; diff --git a/app/src/main/java/xyz/eulix/space/view/dialog/SecurityPwdVerifyDialog.java b/app/src/main/java/xyz/eulix/space/view/dialog/SecurityPwdVerifyDialog.java index ecaf217..6b5a96e 100644 --- a/app/src/main/java/xyz/eulix/space/view/dialog/SecurityPwdVerifyDialog.java +++ b/app/src/main/java/xyz/eulix/space/view/dialog/SecurityPwdVerifyDialog.java @@ -95,7 +95,7 @@ public void onNull() { @Override public void onFinished(String pwd) { - Logger.d("zfy", "psw:" + pwd); + Logger.d("psw:" + pwd); if (listener != null) { listener.onInputFinish(pwd, new WatchResult() { @Override diff --git a/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditController.java b/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditController.java index 70f9bcc..28874c6 100644 --- a/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditController.java +++ b/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditController.java @@ -628,7 +628,7 @@ public void downloadFile(UUID uuid, String filepath, String filename, long fileS File sourceFile = new File(currentPath, filename); boolean copyResult = FileUtil.copyFile(sourceFile.getAbsolutePath(), targetFilepath); if (copyResult) { - Logger.d("zfy", "copy file success"); + Logger.d("copy file success"); // boolean result = sourceFile.delete(); // Logger.d("source file delete: " + result); } diff --git a/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditView.java b/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditView.java index 3ddca13..7655368 100644 --- a/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditView.java +++ b/app/src/main/java/xyz/eulix/space/view/dialog/file/FileEditView.java @@ -803,7 +803,7 @@ private void setEditTextDialogPattern(int textLength, ImageButton clear, Button } private void callDownload(List customizeFiles, ResultCallback callback) { - Logger.d("zfy", "callDownload method"); + Logger.d("callDownload method"); ThreadPool.getInstance().execute(() -> { for (CustomizeFile customizeFile : customizeFiles) { if (customizeFile != null) { @@ -814,7 +814,7 @@ private void callDownload(List customizeFiles, ResultCallback cal e.printStackTrace(); } if (uuid != null) { - Logger.d("zfy", "selected file:" + customizeFile.getName()); + Logger.d("selected file:" + customizeFile.getName()); downloadFile(uuid, customizeFile.getPath(), customizeFile.getName(), customizeFile.getSize(), customizeFile.getMd5()); } } diff --git a/app/src/main/java/xyz/eulix/space/view/smartrefresh/CustomRefreshHeader.java b/app/src/main/java/xyz/eulix/space/view/smartrefresh/CustomRefreshHeader.java index 011f24b..d85b7cc 100644 --- a/app/src/main/java/xyz/eulix/space/view/smartrefresh/CustomRefreshHeader.java +++ b/app/src/main/java/xyz/eulix/space/view/smartrefresh/CustomRefreshHeader.java @@ -111,7 +111,7 @@ public void onReleased(@NonNull @NotNull RefreshLayout refreshLayout, int height @Override public void onStartAnimator(@NonNull @NotNull RefreshLayout refreshLayout, int height, int maxDragHeight) { - Logger.d("zfy", "onStartAnimator"); + Logger.d("onStartAnimator"); changeViewsVisible(true); mAnimationView.setProgress(0); mAnimationView.setRepeatCount(-1); @@ -120,7 +120,7 @@ public void onStartAnimator(@NonNull @NotNull RefreshLayout refreshLayout, int h @Override public int onFinish(@NonNull @NotNull RefreshLayout refreshLayout, boolean success) { - Logger.d("zfy", "onAnimatorFinish"); + Logger.d("onAnimatorFinish"); mAnimationView.cancelAnimation(); changeViewsVisible(false); //重置动画，恢复位置 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755