2

wxr

2022-11-25 2ae8111cc2bbd17c2a6b94a4e13fda66e711a205

 AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java

@@ -577,7 +577,7 @@
            mLayoutParams.addRule(RelativeLayout.BELOW, R.id.rl_title);

            frLiveWindow.setLayoutParams(mLayoutParams);

            MediaPlayHelper.quitFullScreen(DeviceOnlineMediaPlayActivity.this);

            llController.setVisibility(View.VISIBLE);

            llController.setVisibility(View.GONE);

            rlTitle.setVisibility(View.VISIBLE);

            llSpeak1.setVisibility(View.GONE);

            llCloudStage1.setVisibility(View.GONE);

@@ -601,10 +601,10 @@
            MediaPlayHelper.setFullScreen(DeviceOnlineMediaPlayActivity.this);

            llController.setVisibility(View.GONE);

            rlTitle.setVisibility(View.GONE);

            llSpeak1.setVisibility(View.VISIBLE);

            llSpeak1.setVisibility(View.GONE);

            llCloudStage1.setVisibility(View.VISIBLE);

            llVideo1.setVisibility(View.VISIBLE);

            llScreenShot1.setVisibility(View.VISIBLE);

            llVideo1.setVisibility(View.GONE);

            llScreenShot1.setVisibility(View.GONE);

            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(frRecord

                    .getLayoutParams());

            layoutParams.removeRule(RelativeLayout.BELOW);

@@ -624,7 +624,8 @@
        deviceListBean = (DeviceDetailListData.ResponseData.DeviceListBean) bundle.getSerializable(MethodConst.ParamConst.deviceDetail);

        switchVideoList(true);

        getDeviceLocalCache();

        tvDeviceName.setText(deviceListBean.channels.get(deviceListBean.checkedChannel).channelName);

//        tvDeviceName.setText(deviceListBean.channels.get(deviceListBean.checkedChannel).channelName);

        tvDeviceName.setText(bundle.getString("titleString"));



        if(deviceListBean.channels.get(deviceListBean.checkedChannel).resolutions!=null&&deviceListBean.channels.get(deviceListBean.checkedChannel).resolutions.size()>0){

            showHD = false;

@@ -1497,11 +1498,11 @@
                finish();

            }

        }

        if (resultCode == 100 && data != null) {

            String name = data.getStringExtra(DeviceConstant.IntentKey.DHDEVICE_NEW_NAME);

            tvDeviceName.setText(name);

            deviceListBean.channels.get(deviceListBean.checkedChannel).channelName = name;

        }

//        if (resultCode == 100 && data != null) {

//            String name = data.getStringExtra(DeviceConstant.IntentKey.DHDEVICE_NEW_NAME);

//            tvDeviceName.setText(name);

//            deviceListBean.channels.get(deviceListBean.checkedChannel).channelName = name;

//        }

    }