diff --git a/live/src/main/AndroidManifest.xml b/live/src/main/AndroidManifest.xml index 65847c0d8..263ecc166 100644 --- a/live/src/main/AndroidManifest.xml +++ b/live/src/main/AndroidManifest.xml @@ -85,7 +85,6 @@ android:name=".activity.PDLiveConversationActivity" android:hardwareAccelerated="true" android:screenOrientation="portrait" - android:theme="@style/DialogNotTitleActivity" android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/> mSelectImages = new ArrayList<>(); private String targetId = ""; - private LinearLayout mRootLayout; - private boolean isDialogWindow=true; @Override @@ -88,11 +81,6 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl EventBus.getDefault().register(this); mContext = this; getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); - Intent intent = getIntent(); - if(intent!=null){ - isDialogWindow=intent.getBooleanExtra("dialogWindow",false); - } - configWindow(); initView(); initData(); WindowSoftModeAdjustResizeExecutor.assistActivity(this); @@ -100,41 +88,6 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl MessageIMManager.get(this).addConversationClickListener(); } - /** - * 配置窗口参数 - */ - public void configWindow() { - - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(getResources().getColor(R.color.transparent)); - - getWindow().setGravity(Gravity.BOTTOM);//设置显示在底部 默认在中间 - WindowManager.LayoutParams lp = getWindow().getAttributes(); - lp.width = WindowManager.LayoutParams.MATCH_PARENT;//设置宽度满屏 - if(isDialogWindow) { - lp.height = WindowManager.LayoutParams.WRAP_CONTENT; - }else{ - lp.height = WindowManager.LayoutParams.MATCH_PARENT; - } - getWindow().setAttributes(lp); - setFinishOnTouchOutside(true);//允许点击空白处关闭 - - } - - /** - * ui展示后再调整大小 - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if(hasFocus&&isDialogWindow){ - ViewGroup.LayoutParams params = mRootLayout.getLayoutParams(); - params.height= DpUtil.dp2px(500); - mRootLayout.setLayoutParams(params); - } - } - /** * 数据的设置 @@ -199,10 +152,6 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl titleView = findViewById(R.id.titleView); imgMore = findViewById(R.id.img_more); imBack = findViewById(R.id.btn_back); - mRootLayout = findViewById(R.id.root_layout); - //来个底部弹出的动画,不然太突兀了 - mRootLayout.startAnimation(AnimationUtils.loadAnimation(mContext,R.anim.bottomview_anim_enter)); - imgMore.setOnClickListener(this); imBack.setOnClickListener(this);