From 1bfc5a5790fff3d5d18ba222ecfc70e73e97c373 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 12 Nov 2021 10:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4autosize(=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E8=8E=AB=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 -- app/src/main/AndroidManifest.xml | 7 ----- .../erban/application/XChatApplication.java | 13 ---------- .../avroom/presenter/AvRoomPresenter.java | 4 +-- .../widget/dialog/BaseAlertDialogBuilder.java | 26 ++----------------- .../ui/webview/CommonWebViewActivity.java | 3 +-- .../nim/uikit/common/util/sys/ScreenUtil.java | 10 +++---- 7 files changed, 8 insertions(+), 57 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4deaab877..3c4a0fa07 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -294,8 +294,6 @@ dependencies { implementation project(path: ':flutter') implementation project(path: ':flutter_boost') - implementation 'me.jessyan:autosize:1.2.1' - implementation files('libs/humesdk-1.0.0.aar') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ed5f47ffe..03d0690a8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -91,13 +91,6 @@ android:usesCleartextTraffic="true" tools:replace="android:name, android:allowBackup"> - - - diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 3ba630029..fd8e9b227 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -121,7 +121,6 @@ import java.util.Map; import io.reactivex.plugins.RxJavaPlugins; import io.realm.Realm; import io.realm.RealmConfiguration; -import me.jessyan.autosize.AutoSizeConfig; import static com.yizhuan.xchat_android_constants.XChatConstants.HW_APP_ID; import static com.yizhuan.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; @@ -269,18 +268,6 @@ public class XChatApplication extends Application { if (BuildConfig.APPLICATION_ID.equals(getProcessName(this))) { FlutterBoost.instance().setup(this, new XplanFlutterBoostDelegate(), new XplanFlutterBoostCallback()); } - AutoSizeConfig.getInstance() - .setLog(BuildConfig.DEBUG) - .getExternalAdaptManager() - .addCancelAdaptOfActivity(ProtocolDetailActivity.class) - .addCancelAdaptOfActivity(MatisseActivity.class) - .addCancelAdaptOfActivity(CropImageActivity.class) - .addCancelAdaptOfActivity(com.netease.nim.uikit.common.media.picker.activity.CropImageActivity.class) - .addCancelAdaptOfActivity(YDQuickLoginActivity.class) - .addCancelAdaptOfActivity(RPTakePhotoActivity.class) - .addCancelAdaptOfActivity(ALBiometricsActivity.class) - .addCancelAdaptOfActivity(ALBiometricsDialogActivity.class) - .addCancelAdaptOfActivity(RPWebViewActivity.class); LogUtils.d("init time = " + (System.currentTimeMillis() - startTime) + "ms"); } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java index fe6fe1cf4..7ae3be9a6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java @@ -141,7 +141,7 @@ public class AvRoomPresenter extends BaseMvpPresenter { AvRoomDataManager.get().setRedEnvelopeOpen(roomInfo.isRedEnvelopeOpen()); StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_ROOM_LIST_TYPE, "区分房间类型:" + roomInfo.getRoomTypeLable()); - + initAnotherPKData(); mAvRoomModel.enterRoom(roomInfo.getRoomId(), 3, fromType, fromNick, fromUid) .flatMap(this::dealServerMicInfo) .map(this::dealMicMemberFromIMNet) @@ -154,14 +154,12 @@ public class AvRoomPresenter extends BaseMvpPresenter { if (getMvpView() != null) { getMvpView().enterRoomSuccess(); } - mAvRoomModel.userRoomIn( String.valueOf(uid), roomInfo.getUid(), fromType == AVRoomActivity.FROM_TYPE_GAME_RECOMMEND ? 1 : 0 , fromUid) .subscribe((stringServiceResult) -> EventBus.getDefault().post(new AudioPartyOpenEvent())); - initAnotherPKData(); }, this::dealEnterRoomError); } diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java index c8fc174cd..126e61942 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java @@ -1,40 +1,18 @@ package com.yizhuan.erban.common.widget.dialog; import android.content.Context; -import android.content.ContextWrapper; -import android.content.res.Resources; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; -import me.jessyan.autosize.AutoSizeCompat; - public class BaseAlertDialogBuilder extends AlertDialog.Builder { - private static final float ALERT_BASE_WIDTH = 375f; - public BaseAlertDialogBuilder(@NonNull Context context) { - super(adjustAutoSize(context)); + super(context); } public BaseAlertDialogBuilder(@NonNull Context context, int themeResId) { - super(adjustAutoSize(context), themeResId); + super(context, themeResId); } - private static Context adjustAutoSize(Context context) { - return new ContextWrapper(context) { - private final Resources mResources; - - { - Resources oldResources = super.getResources(); - mResources = new Resources(oldResources.getAssets(), oldResources.getDisplayMetrics(), oldResources.getConfiguration()); - } - - @Override - public Resources getResources() { - AutoSizeCompat.autoConvertDensityBaseOnWidth(mResources, ALERT_BASE_WIDTH); - return mResources; - } - }; - } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java index 9c7b53922..2f5d26b74 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java @@ -62,13 +62,12 @@ import java.util.Map; import cn.sharesdk.framework.Platform; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; -import me.jessyan.autosize.internal.CancelAdapt; /** * @author Administrator */ -public class CommonWebViewActivity extends BaseActivity implements ShareDialog.OnShareDialogItemClick, CancelAdapt { +public class CommonWebViewActivity extends BaseActivity implements ShareDialog.OnShareDialogItemClick { protected FrameLayout layoutTitleBar; protected WebView webView; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/util/sys/ScreenUtil.java b/nim_uikit/src/com/netease/nim/uikit/common/util/sys/ScreenUtil.java index 6f9c6668d..6b97daf08 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/util/sys/ScreenUtil.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/util/sys/ScreenUtil.java @@ -11,23 +11,20 @@ import java.lang.reflect.Field; public class ScreenUtil { private static final String TAG = "Demo.ScreenUtil"; - - private static double RATIO = 0.85; - public static int screenWidth; public static int screenHeight; public static int screenMin;// 宽高中，小的一边 public static int screenMax;// 宽高中，较大的值 - public static float density; public static float scaleDensity; public static float xdpi; public static float ydpi; public static int densityDpi; - public static int dialogWidth; public static int statusbarheight; public static int navbarheight; + private static double RATIO = 0.85; + private static boolean isInit; static { init(NimUIKit.getContext()); @@ -55,9 +52,10 @@ public class ScreenUtil { } public static void init(Context context) { - if (null == context) { + if (null == context || isInit) { return; } + isInit = true; DisplayMetrics dm = context.getApplicationContext().getResources().getDisplayMetrics(); screenWidth = dm.widthPixels; screenHeight = dm.heightPixels;