moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除autosize(各种莫名的问题)

Browse Source
This commit is contained in:
huangjian
2021-11-12 10:46:59 +08:00
parent 2e49955e7d
commit 1bfc5a5790
7 changed files with 8 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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')
}

7
app/src/main/AndroidManifest.xml
View File

@@ -91,13 +91,6 @@
android:usesCleartextTraffic="true"
tools:replace="android:name, android:allowBackup">
<meta-data
android:name="design_width_in_dp"
android:value="375" />
<meta-data
android:name="design_height_in_dp"
android:value="667" />
<meta-data
android:name="CHANNEL"
android:value="official" />

13
app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
View File

@@ -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");
}

4
app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
View File

@@ -141,7 +141,7 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
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<IAvRoomView> {
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);
}

26
app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java
View File

@@ -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;
}
};
}
}

3
app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
View File

@@ -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;

10
nim_uikit/src/com/netease/nim/uikit/common/util/sys/ScreenUtil.java
View File

@@ -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;