~wjc/HDLPhotovoltaicDebugAPP.git

parent: 6e59290d | 补丁 | 提交 | ignore whitespace

2025年07月31日14:48:56

wjc

1 天以前 32af30cdbb9e750a1bd059cacf2d8c8c37776dad

2025年07月31日14:48:56

7个文件已修改

	app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values-en/strings.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values-zh/strings.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values/strings.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java

@@ -39,6 +39,8 @@
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity;
import com.hdl.photovoltaic.ui.newC.PowerStationsMoveActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
@@ -534,8 +536,10 @@
                            }
                        } catch (Exception e) {
                        }
                        //通知电站列表更新
                        HdlCommonLogic.getInstance().postEventBus(ConstantManage.REFRESH_HOME_LIST, ConstantManage.REFRESH_HOME_LIST);
                        if (AppManagerUtils.getAppManager().existsTopActivity(PowerStationsListActivity.class, PowerStationsMoveActivity.class)) {
                            //存在栈里再通知更新
                            HdlCommonLogic.getInstance().postEventBus(ConstantManage.REFRESH_HOME_LIST, ConstantManage.REFRESH_HOME_LIST);
                        }
                        HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
                    }


 app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java

@@ -246,16 +246,16 @@

    private void initView() {

        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.event_details);
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);


        viewBinding.messageInfoEventTitleIn.leftTitleTv.setText(R.string.event_title);
        viewBinding.messageInfoEventContentIn.leftTitleTv.setText(R.string.event_content);
        viewBinding.messageInfoRemarkIn.leftTitleTv.setText(R.string.remark);
        viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
        viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.event_device);
        viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location);
        viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.message_alarm_details_time);
        viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.event_time);
        viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options);

        viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());

 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java

@@ -32,6 +32,7 @@
import com.hdl.photovoltaic.ui.device.ScanActivity;
import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
@@ -181,7 +182,6 @@
        viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                // 未授权 如果应用程序没有所需的权限，则显示解释说明
                PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
                PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {

 app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java

@@ -115,6 +115,26 @@
    }

    /**
     * Activity是否在顶部
     */
    public boolean existsTopActivity(Class<?>... args) {
        try {
            if (activityStack == null || activityStack.size() == 0) {
                return false;
            }
            final int index = activityStack.size() - 1;
            for (Class<?> cls : args) {
                if (activityStack.get(index).getClass().equals(cls)) {
                    return true;
                }
            }
        } catch (Exception e) {
            return false;
        }
        return false;
    }

    /**
     * 指定一个类名,从指定类名开始移除后面所有Activity
     *
     * @param className   Activity-类名(activity.getClass().getName())
@@ -154,7 +174,7 @@
    }


    public  boolean existsActivity(Context activity,String className){
    public boolean existsActivity(Context activity, String className) {
        boolean isLoginActivity = false;
        // 获取当前Activity的列表
        ActivityManager activityManager = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
@@ -168,8 +188,9 @@
                break;
            }
        }
        return  isLoginActivity;
        return isLoginActivity;
    }


    /**
     * 结束所有Activity
@@ -208,8 +229,6 @@
        }
        return null;
    }




    /**

 app/src/main/res/values-en/strings.xml

@@ -369,8 +369,11 @@
    <string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
    <string name="simple_debugging">Simple debugging</string>
    <string name="general_debugging">General debugging</string>
    <string name="event_details">Event details</string>
    <string name="event_title">Event title</string>
    <string name="event_content">Event content</string>
    <string name="event_device">Event device</string>
    <string name="event_time">Event time</string>
    <string name="remark">remark</string>
    <string name="treatment_options">Treatment options</string>
    <string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string>

 app/src/main/res/values-zh/strings.xml

@@ -365,8 +365,11 @@
    <string name="no_permission_delete_home">无权限删除，请联系管理员进行操作</string>
    <string name="simple_debugging">简易调试</string>
    <string name="general_debugging">常规调试</string>
    <string name="event_details">事件详情</string>
    <string name="event_title">事件标题</string>
    <string name="event_content">事件内容</string>
    <string name="event_device">事件设备</string>
    <string name="event_time">事件时间</string>
    <string name="remark">备注</string>
    <string name="treatment_options">处理方案</string>是否将电站的调试状态回退到调试中
    <string name="debug_status_rollback">是否将%s电站的调试状态回退到调试中？</string>

 app/src/main/res/values/strings.xml

@@ -371,8 +371,11 @@
    <string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
    <string name="simple_debugging">Simple debugging</string>
    <string name="general_debugging">General debugging</string>
    <string name="event_details">Event details</string>
    <string name="event_title">Event title</string>
    <string name="event_content">Event content</string>
    <string name="event_device">Event device</string>
    <string name="event_time">Event time</string>
    <string name="remark">remark</string>
    <string name="treatment_options">Treatment options</string>
    <string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string>

			@@ -39,6 +39,8 @@
			import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
			import com.hdl.photovoltaic.ui.bean.HouseIdBean;
			import com.hdl.photovoltaic.ui.bean.OidBean;
			import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity;
			import com.hdl.photovoltaic.ui.newC.PowerStationsMoveActivity;
			import com.hdl.photovoltaic.uni.HDLUniMP;
			import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
			import com.hdl.photovoltaic.utils.AppManagerUtils;
			@@ -534,8 +536,10 @@
			}
			} catch (Exception e) {
			}
			//通知电站列表更新
			HdlCommonLogic.getInstance().postEventBus(ConstantManage.REFRESH_HOME_LIST, ConstantManage.REFRESH_HOME_LIST);
			if (AppManagerUtils.getAppManager().existsTopActivity(PowerStationsListActivity.class, PowerStationsMoveActivity.class)) {
			//存在栈里再通知更新
			HdlCommonLogic.getInstance().postEventBus(ConstantManage.REFRESH_HOME_LIST, ConstantManage.REFRESH_HOME_LIST);
			}
			HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
			}

			@@ -246,16 +246,16 @@

			private void initView() {

			viewBinding.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
			viewBinding.toolbarTopRl.topTitleTv.setText(R.string.event_details);
			viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);


			viewBinding.messageInfoEventTitleIn.leftTitleTv.setText(R.string.event_title);
			viewBinding.messageInfoEventContentIn.leftTitleTv.setText(R.string.event_content);
			viewBinding.messageInfoRemarkIn.leftTitleTv.setText(R.string.remark);
			viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
			viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.event_device);
			viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location);
			viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.message_alarm_details_time);
			viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.event_time);
			viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options);

			viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());

			@@ -32,6 +32,7 @@
			import com.hdl.photovoltaic.ui.device.ScanActivity;
			import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
			import com.hdl.photovoltaic.uni.HDLUniMP;
			import com.hdl.photovoltaic.utils.AppManagerUtils;
			import com.hdl.photovoltaic.utils.PermissionUtils;
			import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
			import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
			@@ -181,7 +182,6 @@
			viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {

			// 未授权如果应用程序没有所需的权限，则显示解释说明
			PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
			PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {

			@@ -115,6 +115,26 @@
			}

			/**
			* Activity是否在顶部
			*/
			public boolean existsTopActivity(Class<?>... args) {
			try {
			if (activityStack == null \|\| activityStack.size() == 0) {
			return false;
			}
			final int index = activityStack.size() - 1;
			for (Class<?> cls : args) {
			if (activityStack.get(index).getClass().equals(cls)) {
			return true;
			}
			}
			} catch (Exception e) {
			return false;
			}
			return false;
			}

			/**
			* 指定一个类名,从指定类名开始移除后面所有Activity
			*
			* @param className Activity-类名(activity.getClass().getName())
			@@ -154,7 +174,7 @@
			}


			public boolean existsActivity(Context activity,String className){
			public boolean existsActivity(Context activity, String className) {
			boolean isLoginActivity = false;
			// 获取当前Activity的列表
			ActivityManager activityManager = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
			@@ -168,8 +188,9 @@
			break;
			}
			}
			return isLoginActivity;
			return isLoginActivity;
			}


			/**
			* 结束所有Activity
			@@ -208,8 +229,6 @@
			}
			return null;
			}




			/**

			@@ -369,8 +369,11 @@
			<string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
			<string name="simple_debugging">Simple debugging</string>
			<string name="general_debugging">General debugging</string>
			<string name="event_details">Event details</string>
			<string name="event_title">Event title</string>
			<string name="event_content">Event content</string>
			<string name="event_device">Event device</string>
			<string name="event_time">Event time</string>
			<string name="remark">remark</string>
			<string name="treatment_options">Treatment options</string>
			<string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string>

			@@ -365,8 +365,11 @@
			<string name="no_permission_delete_home">无权限删除，请联系管理员进行操作</string>
			<string name="simple_debugging">简易调试</string>
			<string name="general_debugging">常规调试</string>
			<string name="event_details">事件详情</string>
			<string name="event_title">事件标题</string>
			<string name="event_content">事件内容</string>
			<string name="event_device">事件设备</string>
			<string name="event_time">事件时间</string>
			<string name="remark">备注</string>
			<string name="treatment_options">处理方案</string>是否将电站的调试状态回退到调试中
			<string name="debug_status_rollback">是否将%s电站的调试状态回退到调试中？</string>

			@@ -371,8 +371,11 @@
			<string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
			<string name="simple_debugging">Simple debugging</string>
			<string name="general_debugging">General debugging</string>
			<string name="event_details">Event details</string>
			<string name="event_title">Event title</string>
			<string name="event_content">Event content</string>
			<string name="event_device">Event device</string>
			<string name="event_time">Event time</string>
			<string name="remark">remark</string>
			<string name="treatment_options">Treatment options</string>
			<string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string>