合并代码

hxb

2022-11-25 49c135d23c6038a8c456cf1fcf450e5fb649047a

合并代码

 AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java

@@ -1,13 +1,5 @@
package com.callBack;

public interface IAddCamera {
    void success(String deviceId);
    /**
     * 错误回调
     *
     * @param errMsg
     */
    void onError(String errMsg);

    void back();
}

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

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

//        }

    }






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

@@ -75,23 +75,13 @@
        HdlToLcUtils.getInstance().setSubAccessToken("St_00009ed748c2b03f4100b6ea97a37466");

//        HdlToLcUtils.getInstance().openActivity();
//        HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
//            @Override
//            public void success(String deviceId) {
//
//            }
//
//            @Override
//            public void onError(String errMsg) {
//
//            }
//
//            @Override
//            public void back() {
//
//            }
//        });
        HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
        HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
            @Override
            public void back() {

            }
        });
//        HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");

    }


 AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java

@@ -25,8 +25,10 @@
public class DeviceUtils implements IGetDeviceInfoCallBack.ISubAccountDevice< DeviceDetailListData.Response>  {

    private String deviceId;
    public DeviceUtils(String deviceId){
    private String titleString;
    public DeviceUtils(String deviceId,String title){
        this.deviceId=deviceId;
        this.titleString = title;
    }
    private static List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();

@@ -43,6 +45,7 @@
                }
                Bundle bundle = new Bundle();
                bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
                bundle.putString("titleString",titleString);
                Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
                intent.putExtras(bundle);
                HdlToLcUtils.getInstance().getActivity().startActivity(intent);
@@ -79,6 +82,7 @@
                }
                Bundle bundle = new Bundle();
                bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
                bundle.putString("titleString",titleString);
                Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
                intent.putExtras(bundle);
                HdlToLcUtils.getInstance().getActivity().startActivity(intent);

 AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml

@@ -22,6 +22,7 @@
            android:layout_marginRight="@dimen/px_30"

            android:layout_toLeftOf="@id/iv_device_pic"

            android:singleLine="true"

            android:visibility="gone"

            android:textColor="@color/lc_demo_color_2c2c2c"

            android:textSize="@dimen/px_36"></TextView>




 AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_name.xml

@@ -11,6 +11,7 @@
        android:layout_height="@dimen/px_130"

        android:background="@color/lc_demo_color_ffffff"

        android:gravity="center_vertical"

        android:visibility="gone"

        android:paddingLeft="@dimen/px_30"

        android:paddingRight="@dimen/px_30">




 AndroidOpenDemo/app/src/main/res/values/styles.xml

@@ -6,6 +6,7 @@
        <item name="colorPrimary">@color/colorPrimary</item>

        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

        <item name="colorAccent">@color/colorAccent</item>

        <item name="android:windowNoTitle">true</item>

    </style>

    <style name="lc_demo_loading" parent="@android:style/Widget.ProgressBar">

        <item name="android:indeterminateOnly">true</item>