diff --git a/app/build.gradle b/app/build.gradle index bcf74cefd..7f4911d25 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,10 +90,10 @@ android { } release { - storeFile file('../app_debug.jks') - storePassword "debug2023" - keyAlias "debug" - keyPassword "debug2023" + storeFile file('../hiyoo.jks') + storePassword "hiyoo2023" + keyAlias "hiyoo" + keyPassword "hiyoo2023" v2SigningEnabled true v1SigningEnabled true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d12d558ac..49a988edd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -84,7 +84,7 @@ @Subscribe(threadMode = ThreadMode.MAIN) public void onImPushMsgPmLimitTimeEvent(ImPushMsgPmLimitTimeEvent event) { //先判断Avroom存不存在，存在的话则不处理，avroom会处理 - Activity reference = XChatApplication.gStack.getAvRoomActivity(); + Activity reference = App.gStack.getAvRoomActivity(); if (reference != null) { return; } diff --git a/app/src/main/java/com/chwl/app/application/XChatApplication.java b/app/src/main/java/com/chwl/app/application/App.java similarity index 99% rename from app/src/main/java/com/chwl/app/application/XChatApplication.java rename to app/src/main/java/com/chwl/app/application/App.java index 352f714ab..74795faf0 100644 --- a/app/src/main/java/com/chwl/app/application/XChatApplication.java +++ b/app/src/main/java/com/chwl/app/application/App.java @@ -107,7 +107,7 @@ import io.realm.RealmConfiguration; * @date 2017/2/11 */ -public class XChatApplication extends BaseApp { +public class App extends BaseApp { public static final String TAG = "XChatApplication"; public static Application gContext; private static final MessageNotifierCustomization messageNotifierCustomization = new MessageNotifierCustomization() { @@ -165,7 +165,7 @@ public class XChatApplication extends BaseApp { return null; } }; - private static XChatApplication instance; + private static App instance; //生命周期监听 private static AppLifeCycleHelper lifeCycleHelper; public static ActivityStack gStack = new ActivityStack(); @@ -184,7 +184,7 @@ public class XChatApplication extends BaseApp { (context, layout) -> new ClassicsFooter(context).setDrawableSize(20)); } - public static XChatApplication instance() { + public static App instance() { return instance; } diff --git a/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java b/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java index a0de30f38..db1a8d613 100644 --- a/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java +++ b/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java @@ -50,7 +50,7 @@ public class GlobalHandleManager { } public Activity getActivity() { - return XChatApplication.gStack.getTopActivity(); + return App.gStack.getTopActivity(); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java b/app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java index 1ab4eb028..2a82c6194 100644 --- a/app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java +++ b/app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java @@ -28,7 +28,7 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.opensource.svgaplayer.SVGADynamicEntity; import com.chwl.app.R; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; public class AnimHelper { @@ -88,7 +88,7 @@ public class AnimHelper { LogUtils.e("addDynamicImage: url or forKey is null or empty"); return; } - GlideApp.with(XChatApplication.instance()) + GlideApp.with(App.instance()) .asBitmap() .circleCrop() .load(url) diff --git a/app/src/main/java/com/chwl/app/avroom/widget/GalleryLayoutManager.java b/app/src/main/java/com/chwl/app/avroom/widget/GalleryLayoutManager.java index 9c9016d6f..290241609 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/GalleryLayoutManager.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/GalleryLayoutManager.java @@ -17,7 +17,7 @@ import androidx.recyclerview.widget.OrientationHelper; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; /** * A custom LayoutManager to build a {@link android.widget.Gallery} or a {@link ViewPager}like {@link RecyclerView} and @@ -107,7 +107,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements @Override public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "onLayoutChildren() called with: state = [" + state + "]"); } if (getItemCount() == 0) { @@ -119,7 +119,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements return; } if (state.getItemCount() != 0 && !state.didStructureChange()) { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "onLayoutChildren: ignore extra layout step"); } return; @@ -137,7 +137,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements private void reset() { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "reset: "); } if (mState != null) { @@ -165,7 +165,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements firstFillWithVertical(recycler, state); } - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "firstFillCover finish:first: " + mFirstVisiblePosition + ",last:" + mLastVisiblePos); } @@ -420,7 +420,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements int distance = calculateDistanceCenter(child, pendingOffset); int childLength = mOrientation == GalleryLayoutManager.HORIZONTAL ? child.getWidth() : child.getHeight(); - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "calculateToCenterFraction: distance:" + distance + ",childLength:" + childLength); } return Math.max(-1.f, Math.min(1.f, distance * 1.f / childLength)); @@ -448,7 +448,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements * @param dy */ private void fillWithVertical(RecyclerView.Recycler recycler, RecyclerView.State state, int dy) { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "fillWithVertical: dy:" + dy); } int topEdge = getOrientationHelper().getStartAfterPadding(); @@ -463,14 +463,14 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements for (int i = 0; i < getChildCount(); i++) { child = getChildAt(i + fixIndex); if (getDecoratedBottom(child) - dy < topEdge) { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "fillWithVertical: removeAndRecycleView:" + getPosition(child) + ",bottom:" + getDecoratedBottom(child)); } removeAndRecycleView(child, recycler); mFirstVisiblePosition++; fixIndex--; } else { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "fillWithVertical: break:" + getPosition(child) + ",bottom:" + getDecoratedBottom(child)); } break; @@ -481,7 +481,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements for (int i = getChildCount() - 1; i >= 0; i--) { child = getChildAt(i); if (getDecoratedTop(child) - dy > bottomEdge) { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "fillWithVertical: removeAndRecycleView:" + getPosition(child)); } removeAndRecycleView(child, recycler); @@ -529,7 +529,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements layoutDecorated(scrap, scrapRect.left, scrapRect.top, scrapRect.right, scrapRect.bottom); startOffset = scrapRect.bottom; mLastVisiblePos = i; - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "fillWithVertical: add view:" + i + ",startOffset:" + startOffset + ",mLastVisiblePos:" + mLastVisiblePos + ",bottomEdge" + bottomEdge); } } @@ -568,7 +568,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements private void fillWithHorizontal(RecyclerView.Recycler recycler, RecyclerView.State state, int dx) { int leftEdge = getOrientationHelper().getStartAfterPadding(); int rightEdge = getOrientationHelper().getEndAfterPadding(); - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "fillWithHorizontal() called with: dx = [" + dx + "],leftEdge:" + leftEdge + ",rightEdge:" + rightEdge); } //1.remove and recycle the view that disappear in screen @@ -583,7 +583,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements removeAndRecycleView(child, recycler); mFirstVisiblePosition++; fixIndex--; - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "fillWithHorizontal:removeAndRecycleView:" + getPosition(child) + " mFirstVisiblePosition change to:" + mFirstVisiblePosition); } } else { @@ -597,7 +597,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements if (getDecoratedLeft(child) - dx > rightEdge) { removeAndRecycleView(child, recycler); mLastVisiblePos--; - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "fillWithHorizontal:removeAndRecycleView:" + getPosition(child) + "mLastVisiblePos change to:" + mLastVisiblePos); } } @@ -618,7 +618,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements View lastView = getChildAt(getChildCount() - 1); startPosition = getPosition(lastView) + 1; //start layout from next position item startOffset = getDecoratedRight(lastView); - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "fillWithHorizontal:to right startPosition:" + startPosition + ",startOffset:" + startOffset + ",rightEdge:" + rightEdge); } } @@ -644,7 +644,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements layoutDecorated(scrap, scrapRect.left, scrapRect.top, scrapRect.right, scrapRect.bottom); startOffset = scrapRect.right; mLastVisiblePos = i; - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "fillWithHorizontal,layout:mLastVisiblePos: " + mLastVisiblePos); } } @@ -654,7 +654,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements View firstView = getChildAt(0); startPosition = getPosition(firstView) - 1; //start layout from previous position item startOffset = getDecoratedLeft(firstView); - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "fillWithHorizontal:to left startPosition:" + startPosition + ",startOffset:" + startOffset + ",leftEdge:" + leftEdge + ",child count:" + getChildCount()); } } @@ -773,7 +773,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements delta = -Math.min(0, Math.max(dx, ((child.getRight() - child.getLeft()) / 2 + child.getLeft()) - parentCenter)); } } - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "scrollHorizontallyBy: dx:" + dx + ",fixed:" + delta); } getState().mScrollDelta = -delta; @@ -803,7 +803,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements delta = -Math.min(0, Math.max(dy, (getDecoratedBottom(child) - getDecoratedTop(child)) / 2 + getDecoratedTop(child) - parentCenter)); } } - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.d(TAG, "scrollVerticallyBy: dy:" + dy + ",fixed:" + delta); } getState().mScrollDelta = -delta; @@ -948,7 +948,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements mCurSelectedView.setSelected(true); mCurSelectedPosition = selectedPosition; if (!mCallbackInFling && mState != SCROLL_STATE_IDLE) { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "ignore selection change callback when fling "); } mCallbackOnIdle = true; @@ -959,7 +959,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements } } } - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "onScrolled: dx:" + dx + ",dy:" + dy); } } @@ -968,7 +968,7 @@ public class GalleryLayoutManager extends RecyclerView.LayoutManager implements public void onScrollStateChanged(RecyclerView recyclerView, int newState) { super.onScrollStateChanged(recyclerView, newState); mState = newState; - if (XChatApplication.isDebug()) { + if (App.isDebug()) { Log.v(TAG, "onScrollStateChanged: " + newState); } if (mState == SCROLL_STATE_IDLE) { diff --git a/app/src/main/java/com/chwl/app/base/BaseActivity.java b/app/src/main/java/com/chwl/app/base/BaseActivity.java index e178fb183..c1464fac2 100644 --- a/app/src/main/java/com/chwl/app/base/BaseActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseActivity.java @@ -65,7 +65,7 @@ import com.chwl.app.NimMiddleActivity; import com.chwl.app.R; import com.chwl.app.application.IReportConstants; import com.chwl.app.application.ReportManager; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; import com.chwl.app.avroom.activity.AVRoomActivity; import com.chwl.app.avroom.firstcharge.FirstChargeDialog; import com.chwl.app.avroom.redpackage.RedPackageGoRoomDialog; @@ -899,7 +899,7 @@ public abstract class BaseActivity extends RxAppCompatActivity if (second == CUSTOM_MESS_SUB_OPENNOBLE || second == CUSTOM_MESS_SUB_RENEWNOBLE) { NobleProtocol.DataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), NobleProtocol.DataBean.class); NobleInfo nobleInfo; - if (data == null || (nobleInfo = data.getNobleInfo()) == null || (data.getUid() < DEBUG_MAX_UID && !XChatApplication.isDebug())) + if (data == null || (nobleInfo = data.getNobleInfo()) == null || (data.getUid() < DEBUG_MAX_UID && !App.isDebug())) return; int type = data.getType(); diff --git a/app/src/main/java/com/chwl/app/common/app/ActivityStack.java b/app/src/main/java/com/chwl/app/common/app/ActivityStack.java index cb768328b..705345d24 100644 --- a/app/src/main/java/com/chwl/app/common/app/ActivityStack.java +++ b/app/src/main/java/com/chwl/app/common/app/ActivityStack.java @@ -3,7 +3,7 @@ package com.chwl.app.common.app; import android.app.Activity; import android.content.Context; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; import com.chwl.app.avroom.activity.AVRoomActivity; import com.chwl.app.utils.ActWhiteListMrg; import com.chwl.core.utils.Logger; @@ -57,7 +57,7 @@ public class ActivityStack { context = mActivity.get(mActivity.size() - 1).get(); } if (context == null) { - context = XChatApplication.gContext; + context = App.gContext; } } return context; diff --git a/app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt b/app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt index 12f0cac66..f651f69ea 100644 --- a/app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt +++ b/app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt @@ -12,7 +12,7 @@ import android.view.Window import android.view.WindowManager import com.hjq.toast.ToastUtils import com.chwl.app.R -import com.chwl.app.application.XChatApplication +import com.chwl.app.application.App import com.chwl.app.databinding.PhotoDialogBinding import com.chwl.app.ui.widget.dialog.CommonTipDialog import com.chwl.library.common.base.BaseDialogFragment @@ -74,7 +74,7 @@ class PhotoDialog : BaseDialogFragment(), EasyPermissions.Pe private fun checkStoragePermission1() { if (!EasyPermissions.hasPermissions( - XChatApplication.gContext, if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES else Manifest.permission.READ_EXTERNAL_STORAGE + App.gContext, if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES else Manifest.permission.READ_EXTERNAL_STORAGE ) ) { EasyPermissions.requestPermissions( @@ -90,7 +90,7 @@ class PhotoDialog : BaseDialogFragment(), EasyPermissions.Pe private fun checkCameraPermission() { if (!EasyPermissions.hasPermissions( - XChatApplication.gContext, + App.gContext, Manifest.permission.CAMERA ) ) { @@ -107,7 +107,7 @@ class PhotoDialog : BaseDialogFragment(), EasyPermissions.Pe private fun checkStoragePermission2() { if (!EasyPermissions.hasPermissions( - XChatApplication.gContext, if (Build.VERSION.SDK_INT >= 33) + App.gContext, if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES else Manifest.permission.READ_EXTERNAL_STORAGE ) ) { @@ -212,7 +212,7 @@ class PhotoDialog : BaseDialogFragment(), EasyPermissions.Pe if (!TextUtils.isEmpty(path)) { mJob?.cancel() mJob = PhotoCompressUtil.compress( - XChatApplication.gContext, + App.gContext, path, PhotoCompressUtil.getCompressCachePath(), object : PhotoCompressCallback { @@ -239,7 +239,7 @@ class PhotoDialog : BaseDialogFragment(), EasyPermissions.Pe } else { mJob?.cancel() mJob = PhotoCompressUtil.compress( - XChatApplication.gContext, + App.gContext, paths, PhotoCompressUtil.getCompressCachePath(), object : PhotosCompressCallback { diff --git a/app/src/main/java/com/chwl/app/common/util/AppLifeCycleHelper.java b/app/src/main/java/com/chwl/app/common/util/AppLifeCycleHelper.java index b05ccef77..8b3f80571 100644 --- a/app/src/main/java/com/chwl/app/common/util/AppLifeCycleHelper.java +++ b/app/src/main/java/com/chwl/app/common/util/AppLifeCycleHelper.java @@ -6,7 +6,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; import com.chwl.core.auth.AuthModel; import com.chwl.library.common.util.CoreUtils; @@ -22,7 +22,7 @@ public class AppLifeCycleHelper implements Application.ActivityLifecycleCallback @Override public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) { - XChatApplication.gStack.onActivityCreated(activity); + App.gStack.onActivityCreated(activity); } @Override @@ -39,7 +39,7 @@ public class AppLifeCycleHelper implements Application.ActivityLifecycleCallback @Override public void onActivityResumed(@NonNull Activity activity) { - XChatApplication.gStack.onActivityResumed(activity); + App.gStack.onActivityResumed(activity); // Adjust.onResume(); } @@ -63,7 +63,7 @@ public class AppLifeCycleHelper implements Application.ActivityLifecycleCallback @Override public void onActivityDestroyed(@NonNull Activity activity) { - XChatApplication.gStack.onActivityDestroyed(activity); + App.gStack.onActivityDestroyed(activity); } private static void onForeground() { diff --git a/app/src/main/java/com/chwl/app/common/util/BitmapUtil.java b/app/src/main/java/com/chwl/app/common/util/BitmapUtil.java index 64931d1c7..eccb6106d 100644 --- a/app/src/main/java/com/chwl/app/common/util/BitmapUtil.java +++ b/app/src/main/java/com/chwl/app/common/util/BitmapUtil.java @@ -6,7 +6,7 @@ import android.graphics.Matrix; import android.graphics.Point; import android.net.Uri; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; import java.io.ByteArrayOutputStream; import java.io.FileDescriptor; @@ -108,7 +108,7 @@ public class BitmapUtil { options.inPreferredConfig = inPreferredConfig; } try { - InputStream stream = XChatApplication.gContext.getContentResolver().openInputStream(imageUri); + InputStream stream = App.gContext.getContentResolver().openInputStream(imageUri); BitmapFactory.decodeStream(stream, null, options); switch (options.inPreferredConfig) { case ALPHA_8: @@ -133,7 +133,7 @@ public class BitmapUtil { if (bitmap == null) { return null; } - float density = XChatApplication.gContext.getResources().getDisplayMetrics().density; + float density = App.gContext.getResources().getDisplayMetrics().density; return BitmapUtil.setImgSize(bitmap, bitmap.getWidth() * density / 3.0f, bitmap.getHeight() * density / 3.0f); } diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt index 826f06f6a..70d9cb677 100644 --- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt @@ -28,7 +28,7 @@ import com.trello.rxlifecycle3.android.ActivityEvent import com.yalantis.ucrop.UCrop import com.chwl.app.R import com.chwl.app.UIHelper -import com.chwl.app.application.XChatApplication +import com.chwl.app.application.App import com.chwl.app.audio.SoundSignatureActivity import com.chwl.app.base.BaseViewBindingActivity import com.chwl.app.common.util.BitmapUtil @@ -632,13 +632,13 @@ class UserInfoModifyActivity : BaseViewBindingActivity { WebJsBeanInfo webJsBeanInfo = shareH5Event.getWebJsBeanInfo(); if (webJsBeanInfo != null) { - if (XChatApplication.isDebug()) { + if (App.isDebug()) { toast("WebJsBeanInfo->" + new Gson().toJson(webJsBeanInfo)); } mWebJsBeanInfo = webJsBeanInfo; diff --git a/app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java b/app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java index c11a0a2ef..e8fb46fe1 100644 --- a/app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java +++ b/app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java @@ -9,7 +9,7 @@ import android.webkit.JavascriptInterface; import com.alibaba.fastjson.JSONObject; import com.orhanobut.logger.Logger; import com.tencent.vasdolly.helper.ChannelReaderUtil; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; import com.chwl.core.XConstants; import com.chwl.core.Constants; import com.chwl.library.utils.AppUtils; @@ -89,7 +89,7 @@ public class SimpleJSInterface { @JavascriptInterface public String getChannel() { String channel; - channel = ChannelReaderUtil.getChannel(XChatApplication.instance()); + channel = ChannelReaderUtil.getChannel(App.instance()); if (TextUtils.isEmpty(channel)) { channel = Constants.GOOGLE; } diff --git a/app/src/main/java/com/chwl/app/utils/ClipboardUtils.java b/app/src/main/java/com/chwl/app/utils/ClipboardUtils.java index 77926f026..dc6b79698 100644 --- a/app/src/main/java/com/chwl/app/utils/ClipboardUtils.java +++ b/app/src/main/java/com/chwl/app/utils/ClipboardUtils.java @@ -14,7 +14,7 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.chwl.app.application.XChatApplication; +import com.chwl.app.application.App; /** * 
@@ -33,7 +33,7 @@ public class ClipboardUtils {
      */
     public static void copyText(final CharSequence text) {
         try {
-            ClipboardManager cm = (ClipboardManager) XChatApplication.getApplication().getSystemService(Context.CLIPBOARD_SERVICE);
+            ClipboardManager cm = (ClipboardManager) App.getApplication().getSystemService(Context.CLIPBOARD_SERVICE);
             cm.setPrimaryClip(ClipData.newPlainText("text", text));
         } catch (Exception e) {
             Log.e(TAG, "copyText", e);
@@ -102,7 +102,7 @@ public class ClipboardUtils {
      */
     private static String getTextFromClip() {
         try {
-            ClipboardManager clipboardManager = (ClipboardManager) XChatApplication.getApplication().getSystemService(Context.CLIPBOARD_SERVICE);
+            ClipboardManager clipboardManager = (ClipboardManager) App.getApplication().getSystemService(Context.CLIPBOARD_SERVICE);
             if (null == clipboardManager || !clipboardManager.hasPrimaryClip()) {
                 return "";
             }
diff --git a/app/src/main/java/com/chwl/app/utils/FloatManager.java b/app/src/main/java/com/chwl/app/utils/FloatManager.java
index df6021114..43a8fb8d7 100644
--- a/app/src/main/java/com/chwl/app/utils/FloatManager.java
+++ b/app/src/main/java/com/chwl/app/utils/FloatManager.java
@@ -7,7 +7,7 @@ import android.view.Gravity;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
-import com.chwl.app.application.XChatApplication;
+import com.chwl.app.application.App;
 import com.chwl.app.ui.widget.MarqueeLayout;
 import com.chwl.library.utils.SizeUtils;
 
@@ -31,7 +31,7 @@ public class FloatManager {
     }
 
     private FloatManager() {
-        mWindowManager = (WindowManager) XChatApplication.instance().getSystemService(Context.WINDOW_SERVICE);
+        mWindowManager = (WindowManager) App.instance().getSystemService(Context.WINDOW_SERVICE);
     }
 
     /**
diff --git a/hiyoo.jks b/hiyoo.jks
new file mode 100644
index 000000000..1e3211f34
Binary files /dev/null and b/hiyoo.jks differ