mirror of
https://github.com/openharmony/notification_notification_cangjie_wrapper.git
synced 2026-07-01 06:41:51 -04:00
!54 merge master into master
fix mock Created-by: guorunzhi Commit-by: guorunzhi Merged-by: openharmony_ci Description: ### 一、内容说明（相关的Issue） [#55](https://gitcode.com/openharmony/ability_ability_cangjie_wrapper/issues/55) ### 二、建议测试周期和提测地址 建议测试完成时间：xxxx.xx.xx 投产上线时间：xxxx.xx.xx 提测地址：CI环境/压测环境 测试账号： ### 三、变更内容 * 3.1 关联PR列表 * 3.2 数据库和部署说明 1. 常规更新 2. 重启unicorn 3. 重启sidekiq 4. 迁移任务：是否有迁移任务，没有写 "无" 5. rake脚本：`bundle exec xxx RAILS_ENV = production`；没有写 "无" * 3.4 其他技术优化内容（做了什么，变更了什么） - 针对mock目录下的cj文件的注解进行了format，使其格式符合规范 * 3.5 废弃通知（什么字段、方法弃用？） 不涉及 * 3.6 后向不兼容变更（是否有无法向后兼容的变更？） 不涉及 ### 四、研发自测点（自测哪些？冒烟用例全部自测？） 自测测试结论： 修改格式，和功能无关无需测试 ### 五、测试关注点（需要提醒QA重点关注的、可能会忽略的地方） 检查点： | 需求名称 | 是否影响xx公共模块 | 是否需要xx功能 | 需求升级是否依赖其他子产品 | |------|------------|----------|---------------| | xxx | 否 | 需要 | 不需要 | | | | | | 接口测试： 性能测试： 并发测试： 其他： See merge request: openharmony/notification_notification_cangjie_wrapper!54
This commit is contained in:
openharmony_ci
@@ -19,21 +19,39 @@ import ohos.labels.APILevel
|
||||
import ohos.value_type.CommonEventValueType
|
||||
import std.collection.HashMap
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public class CommonEventData {
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var event: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var bundleName: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var code: Int32
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var data: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var parameters: HashMap<String, CommonEventValueType>
|
||||
|
||||
public init() {
|
||||
@@ -44,4 +62,4 @@ public class CommonEventData {
|
||||
this.data = String()
|
||||
this.parameters = HashMap<String, CommonEventValueType>()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+692
-172
File diff suppressed because it is too large
Load Diff
@@ -19,30 +19,58 @@ import ohos.labels.APILevel
|
||||
import ohos.value_type.CommonEventValueType
|
||||
import std.collection.HashMap
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public class CommonEventPublishData {
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var bundleName: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var data: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var code: Int32
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var subscriberPermissions: Array<String>
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var isOrdered: Bool
|
||||
|
||||
@!APILevel[since: "22", permission: "ohos.permission.COMMONEVENT_STICKY", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
permission: "ohos.permission.COMMONEVENT_STICKY",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var isSticky: Bool
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var parameters: HashMap<String, CommonEventValueType>
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public init(
|
||||
bundleName!: String = "",
|
||||
data!: String = "",
|
||||
@@ -61,4 +89,4 @@ public class CommonEventPublishData {
|
||||
this.isSticky = true
|
||||
this.parameters = HashMap()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,27 +17,51 @@ package ohos.common_event_subscribe_info
|
||||
|
||||
import ohos.labels.APILevel
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public class CommonEventSubscribeInfo {
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var events: Array<String>
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var priority: Int32
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var userId: Int32
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var publisherPermission: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var publisherDeviceId: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public var publisherBundleName: String
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public init(
|
||||
events: Array<String>,
|
||||
publisherPermission!: String = "",
|
||||
@@ -54,4 +78,4 @@ public class CommonEventSubscribeInfo {
|
||||
this.publisherDeviceId = String()
|
||||
this.publisherBundleName = String()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,10 +17,13 @@ package ohos.common_event_subscriber
|
||||
|
||||
import ohos.labels.APILevel
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public class CommonEventSubscriber {
|
||||
|
||||
public init() {
|
||||
super()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+70
-13
@@ -17,18 +17,75 @@ package ohos.value_type
|
||||
|
||||
import ohos.labels.APILevel
|
||||
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"]
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
public enum CommonEventValueType {
|
||||
@!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] Int32Value(Int32)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] Float64Value(Float64)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] StringValue(String)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] BoolValue(Bool)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] FD(Int32)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] ArrayString(Array<String>)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] ArrayInt32(Array<Int32>)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] ArrayInt64(Array<Int64>)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] ArrayBool(Array<Bool>)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] ArrayFloat64(Array<Float64>)
|
||||
| @!APILevel[since: "22", syscap: "SystemCapability.Notification.CommonEvent"] ArrayFD(Array<Int32>)
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
Int32Value(Int32)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
Float64Value(Float64)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
StringValue(String)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
BoolValue(Bool)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
FD(Int32)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
ArrayString(Array<String>)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
ArrayInt32(Array<Int32>)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
ArrayInt64(Array<Int64>)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
ArrayBool(Array<Bool>)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
ArrayFloat64(Array<Float64>)
|
||||
|
|
||||
@!APILevel[
|
||||
since: "22",
|
||||
syscap: "SystemCapability.Notification.CommonEvent"
|
||||
]
|
||||
ArrayFD(Array<Int32>)
|
||||
| ...
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user