save

wxr

9 天以前 85672663b8253555f28759f8670727e2c391af8b

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

@@ -178,6 +178,7 @@
        initView();

        initData();

        operatePTZ();



    }



    protected void requestedOrientation(int requestedOrientation, boolean isForce) {

@@ -624,7 +625,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;

@@ -1212,7 +1214,7 @@
        llSound.setClickable(false);//声音按钮不允许点击

        LCOpenSDK_Talk.setListener(audioTalkerListener);//对讲前先设备监听

        int channelId = -1;



        Log.d("wxr", "startTalk: "+deviceListBean.channelNum);

        if(  Integer.parseInt(deviceListBean.channelNum)> 1) {

           /* if(null != deviceListBean.channels.get(deviceListBean.checkedChannel).channelId && !"".equals(deviceListBean.channels.get(deviceListBean.checkedChannel).channelId)) {

                channelId = Integer.parseInt(deviceListBean.channels.get(deviceListBean.checkedChannel).channelId);

@@ -1497,11 +1499,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;

//        }

    }