fix: restroe huawei config

Author: CutebreadCat

config/config.example.yaml

@@ -98,6 +98,9 @@ vendors:
     teaching:
       channel_id: '133203'
       template_id: 'P12325'
+  huawei:
+    channel_importance: ''  # 华为通道重要性，例如 NORMAL/LOW
+    channel_category: ''    # 华为消息分类，需在华为后台申请自分类权益后配置，例如 SERVICE
   harmony:
     channel_category: 'SUBSCRIPTION'  # 鸿蒙消息分类，需在友盟/华为后台申请自分类后配置，例如 SERVICE
 

config/types.go

@@ -158,6 +158,11 @@ type oppo struct {
 	} `mapstructure:"private_msg_template"`
 }
 
+type huawei struct {
+	ChannelImportance string `mapstructure:"channel_importance"`
+	ChannelCategory   string `mapstructure:"channel_category"`
+}
+
 type harmonyVendor struct {
 	ChannelCategory string `mapstructure:"channel_category"`
 }
@@ -180,6 +185,7 @@ type vendors struct {
 	XiaomiNotice    XiaomiNotice    `mapstructure:"xiaomi_notice"`
 	VivoCategory    string          `mapstructure:"vivo_category"`
 	Oppo            oppo            `mapstructure:"oppo"`
+	Huawei          huawei          `mapstructure:"huawei"`
 	Harmony         harmonyVendor   `mapstructure:"harmony"`
 	LocalProperties localProperties `mapstructure:"local_properties"`
 }

k8s/config/configmap.yaml.example

@@ -202,5 +202,8 @@ data:
           channel_id: ""
           template_id: ""
       huawei:
+        channel_importance: ""
+        channel_category: ""
+      harmony:
         channel_category: ""
 ---

pkg/umeng/groupcast.go

@@ -35,11 +35,13 @@ import (
 
 func getChannelProperties(title, content string) AndroidChannelProperties {
 	return AndroidChannelProperties{
-		ChannelActivity: config.Vendors.ChannelActivity,
-		VivoCategory:    config.Vendors.VivoCategory,
-		OppoChannelID:   config.Vendors.Oppo.ChannelID,
-		OppoCategory:    config.Vendors.Oppo.Category,
-		OppoNotifyLevel: config.Vendors.Oppo.NotifyLevel,
+		ChannelActivity:         config.Vendors.ChannelActivity,
+		VivoCategory:            config.Vendors.VivoCategory,
+		OppoChannelID:           config.Vendors.Oppo.ChannelID,
+		OppoCategory:            config.Vendors.Oppo.Category,
+		OppoNotifyLevel:         config.Vendors.Oppo.NotifyLevel,
+		HuaweiChannelImportance: config.Vendors.Huawei.ChannelImportance,
+		HuaweiChannelCategory:   config.Vendors.Huawei.ChannelCategory,
 		OppoPrivateMsgTemplate: OppoPrivateMsgTemplate{
 			PrivateMsgTemplateID: config.Vendors.Oppo.PrivateMsgTemplate.PrivateMsgTemplateID,
 			PrivateTitleParameters: OppoPrivateTitleParameters{

pkg/umeng/model.go

@@ -59,15 +59,17 @@ type AndroidBody struct {
 }
 
 type AndroidChannelProperties struct {
-	ChannelActivity        string                 `json:"channel_activity"`
-	XiaoMiChannelID        string                 `json:"xiaomi_channel_id"`
-	XiaoMiExtraProperties  *XiaomiExtraProperties `json:"xiaomi_extra_properties,omitempty"`
-	VivoCategory           string                 `json:"vivo_category"`
-	OppoChannelID          string                 `json:"oppo_channel_id"`
-	OppoCategory           string                 `json:"oppo_category"`
-	OppoNotifyLevel        string                 `json:"oppo_notify_level"`
-	OppoPrivateMsgTemplate OppoPrivateMsgTemplate `json:"oppo_private_msg_template"`
-	LocalProperties        LocalProperties        `json:"local_properties"`
+	ChannelActivity         string                 `json:"channel_activity"`
+	XiaoMiChannelID         string                 `json:"xiaomi_channel_id"`
+	XiaoMiExtraProperties   *XiaomiExtraProperties `json:"xiaomi_extra_properties,omitempty"`
+	VivoCategory            string                 `json:"vivo_category"`
+	OppoChannelID           string                 `json:"oppo_channel_id"`
+	OppoCategory            string                 `json:"oppo_category"`
+	OppoNotifyLevel         string                 `json:"oppo_notify_level"`
+	HuaweiChannelImportance string                 `json:"huawei_channel_importance"`
+	HuaweiChannelCategory   string                 `json:"huawei_channel_category"`
+	OppoPrivateMsgTemplate  OppoPrivateMsgTemplate `json:"oppo_private_msg_template"`
+	LocalProperties         LocalProperties        `json:"local_properties"`
 }
 
 // HarmonyGroupcastMessage 鸿蒙广播消息结构