2

wxr

2022-11-25 2ae8111cc2bbd17c2a6b94a4e13fda66e711a205

2

 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

@@ -625,7 +625,7 @@
        switchVideoList(true);

        getDeviceLocalCache();

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

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

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



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

            showHD = false;

@@ -1500,7 +1500,7 @@
        }

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

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

//            tvDeviceName.setText(bundle.getString("titleText"));

//            tvDeviceName.setText(name);

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

//        }

    }


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

@@ -77,16 +77,6 @@
//        HdlToLcUtils.getInstance().openActivity();
        HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
            @Override
            public void success(String deviceId) {
                
            }

            @Override
            public void onError(String errMsg) {

            }

            @Override
            public void back() {

            }

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

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

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

@@ -45,7 +45,7 @@
                }
                Bundle bundle = new Bundle();
                bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
                bundle.putString("titleText",mTitleString);
                bundle.putString("titleString",titleString);
                Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
                intent.putExtras(bundle);
                HdlToLcUtils.getInstance().getActivity().startActivity(intent);
@@ -82,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/values/styles.xml

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

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

        <item name="background_color">#FFF2F3F7</item>

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

    </style>

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

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