fix: merge conflicts

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,11 +1,9 @@
 name: Bug report / 报告问题
 description: Create a report to help us improve. / 报告问题以帮助我们改进
-title: "[Bug]: "
-labels: ["bug"]
 body:
   - type: input
     attributes:
-      label: Describe the bug / 描述问题
+      label: Describe the Bug / 描述问题
       description: |
         > A clear and concise description of what the bug is.
         > 清晰且简明地描述问题。
@@ -14,7 +12,7 @@ body:
 
   - type: textarea
     attributes:
-      label: To Reproduce / 复现步骤
+      label: How to Reproduce / 复现步骤
       description: |
         > If applicable, add screenshots to help explain your problem. You can attach images by clicking this area to highlight it and then dragging files in. Steps to reproduce the behavior:
         > 如有需要，可添加截图以帮助解释问题。点击此区域以高亮显示并拖动截图文件以上传。请详细描述复现步骤：
@@ -28,7 +26,7 @@ body:
 
   - type: input
     attributes:
-      label: Expected behavior / 预期结果
+      label: Expected Behavior / 预期结果
       description: |
         > A clear and concise description of what you expected to happen.
         > 描述预期结果。
@@ -44,7 +42,7 @@ body:
 
   - type: input
     attributes:
-      label: Home Assistant Core version / Home Assistant Core 版本
+      label: Home Assistant Core Version / Home Assistant Core 版本
       description: |
         > [Settings > About](https://my.home-assistant.io/redirect/info)
         > [设置 > 关于 Home Assistant](https://my.home-assistant.io/redirect/info)
@@ -54,7 +52,7 @@ body:
 
   - type: input
     attributes:
-      label: Home Assistant Operation System version / Home Assistant Operation System 版本
+      label: Home Assistant Operation System Version / Home Assistant Operation System 版本
       description: |
         > [Settings > About](https://my.home-assistant.io/redirect/info)
         > [设置 > 关于 Home Assistant](https://my.home-assistant.io/redirect/info)
@@ -64,7 +62,7 @@ body:
 
   - type: input
     attributes:
-      label: Xiaomi Home integration version / 米家集成版本
+      label: Xiaomi Home Integration Version / 米家集成版本
       description: |
         > [Settings > Devices & services > Configured > `Xiaomi Home`](https://my.home-assistant.io/redirect/integration/?domain=xiaomi_home)
         > [设置 > 设备与服务 > 已配置 > `Xiaomi Home`](https://my.home-assistant.io/redirect/integration/?domain=xiaomi_home)
@@ -74,4 +72,4 @@ body:
 
   - type: textarea
     attributes:
-      label: Additional context / 其他说明
+      label: Additional Context / 其他说明

CHANGELOG.md

@@ -0,0 +1,43 @@
+# CHANGELOG
+
+## v0.1.4b0
+### Added
+### Changed
+### Fixed
+- Fix miot cloud token refresh logic. [#307](https://github.com/XiaoMi/ha_xiaomi_home/pull/307)
+- Fix lan ctrl filter logic. [#303](https://github.com/XiaoMi/ha_xiaomi_home/pull/303)
+
+## v0.1.3
+### Added
+### Changed
+- Remove default bug label. [#276](https://github.com/XiaoMi/ha_xiaomi_home/pull/276)
+- Improve multi-language translation actions. [#256](https://github.com/XiaoMi/ha_xiaomi_home/pull/256)
+- Use aiohttp instead of waiting for blocking calls. [#227](https://github.com/XiaoMi/ha_xiaomi_home/pull/227)
+- Language supports dt. [#237](https://github.com/XiaoMi/ha_xiaomi_home/pull/237)
+### Fixed
+- Fix local control error. [#271](https://github.com/XiaoMi/ha_xiaomi_home/pull/271)
+- Fix README_zh and miot_storage. [#270](https://github.com/XiaoMi/ha_xiaomi_home/pull/270)
+
+## v0.1.2
+### Added
+- Support Xiaomi Heater devices. https://github.com/XiaoMi/ha_xiaomi_home/issues/124 https://github.com/XiaoMi/ha_xiaomi_home/issues/117
+- Language supports pt, pt-BR.
+### Changed
+- Adjust the minimum version of HASS core to 2024.4.4 and above versions.
+### Fixed
+
+## v0.1.1
+### Added
+### Changed
+### Fixed
+- Fix humidifier trans rule. https://github.com/XiaoMi/ha_xiaomi_home/issues/59
+- Fix get homeinfo error.  https://github.com/XiaoMi/ha_xiaomi_home/issues/22 
+- Fix air-conditioner switch on. https://github.com/XiaoMi/ha_xiaomi_home/issues/37 https://github.com/XiaoMi/ha_xiaomi_home/issues/16
+- Fix invalid cover status. https://github.com/XiaoMi/ha_xiaomi_home/issues/11  https://github.com/XiaoMi/ha_xiaomi_home/issues/85 
+- Water heater entity add STATE_OFF. https://github.com/XiaoMi/ha_xiaomi_home/issues/105 https://github.com/XiaoMi/ha_xiaomi_home/issues/17 
+
+## v0.1.0
+### Added
+- First version
+### Changed
+### Fixed

doc/CONTRIBUTING.md → CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contribution Guidelines
 
-[English](./CONTRIBUTING.md) | [简体中文](./CONTRIBUTING_zh.md)
+[English](./CONTRIBUTING.md) | [简体中文](./doc/CONTRIBUTING_zh.md)
 
 Thank you for considering contributing to our project! We appreciate your efforts to make our project better.
 

README.md

@@ -8,7 +8,7 @@ Xiaomi Home Integration is an integrated component of Home Assistant supported b
 
 > Home Assistant version requirement:
 >
-> - Core $\geq$ 2024.11.0
+> - Core $\geq$ 2024.4.4
 > - Operating System $\geq$ 13.0
 
 ### Method 1: Git clone from GitHub
@@ -32,7 +32,7 @@ git checkout v1.0.0
 
 ### Method 2: [HACS](https://hacs.xyz/)
 
-HACS > Overflow Menu > Custom repositories > Repository: https://github.com/XiaoMi/ha_xiaomi_home.git & Category: Integration > ADD
+HACS > Overflow Menu > Custom repositories > Repository: https://github.com/XiaoMi/ha_xiaomi_home.git & Category: Integration > ADD > Xiaomi Home in New or Available for download section of HACS > DOWNLOAD
 
 > Xiaomi Home has not been added to the HACS store as a default yet. It's coming soon.
 
@@ -76,6 +76,8 @@ Method: [Settings > Devices & services > Configured > Xiaomi Home](https://my.ho
 
 Xiaomi Home Integration and the affiliated cloud interface is provided by Xiaomi officially. You need to use your Xiaomi account to login to get your device list. Xiaomi Home Integration implements OAuth 2.0 login process, which does not keep your account password in the Home Assistant application. However, due to the limitation of the Home Assistant platform, the user information (including device information, certificates, tokens, etc.) of your Xiaomi account will be saved in the Home Assistant configuration file in clear text after successful login. You need to ensure that your Home Assistant configuration file is properly stored. The exposure of your configuration file may result in others logging in with your identity.
 
+> If you suspect that your OAuth 2.0 token has been leaked, you can revoke the login authorization of your Xiaomi account by the following steps: Xiaomi Home APP -> Profile -> Click your username and get into Xiaomi Account management page -> Basic info: Apps -> Xiaomi Home (Home Assistant Integration) -> Remove
+
 ## FAQ
 
 - Does Xiaomi Home Integration support all Xiaomi Home devices?
@@ -323,7 +325,7 @@ Device information service (urn:miot-spec-v2:service:device-information:00007801
 
 ## Multiple Language Support
 
-There are 8 languages available for selection in the config flow language option of Xiaomi Home, including Simplified Chinese, Traditional Chinese, English, Spanish, Russian, French, German, and Japanese. The config flow page in Simplified Chinese and English has been manually reviewed by the developer. Other languages are translated by machine translation. If you want to modify the words and sentences in the config flow page, you need to modify the json file of the certain language in `custom_components/xiaomi_home/translations/` directory.
+There are 8 languages available for selection in the config flow language option of Xiaomi Home, including Simplified Chinese, Traditional Chinese, English, Spanish, Russian, French, German, and Japanese. The config flow page in Simplified Chinese and English has been manually reviewed by the developer. Other languages are translated by machine translation. If you want to modify the words and sentences in the config flow page, you need to modify the json file of the certain language in `custom_components/xiaomi_home/translations/` and `custom_components/xiaomi_home/miot/i18n/` directory.
 
 When displaying Home Assistant entity name, Xiaomi Home downloads the multiple language file configured by the device vendor from MIoT Cloud, which contains translations for MIoT-Spec-V2 instances of the device. `multi_lang.json` is a locally maintained multiple language dictionary, which has a higher priority than the multiple language file obtained from the cloud and can be used to supplement or modify the multiple language translation of devices.
 
@@ -376,8 +378,8 @@ Example:
 ## Documents
 
 - [License](./LICENSE.md)
-- Contribution Guidelines: [English](./doc/CONTRIBUTING.md) | [简体中文](./doc/CONTRIBUTING_zh.md)
-- [ChangeLog](./doc/CHANGELOG.md)
+- Contribution Guidelines: [English](./CONTRIBUTING.md) | [简体中文](./doc/CONTRIBUTING_zh.md)
+- [ChangeLog](./CHANGELOG.md)
 - Development Documents: https://developers.home-assistant.io/docs/creating_component_index
 
 ## Directory Structure