flutter_package / flutter_wakelock

Go to a project
Toggle navigation Toggle navigation pinning
hezhengyi
d14cfcf2 1 parent 1b1de0b6

更新模版代码相关改动 

Signed-off-by: hezhengyi <ssyzesb@qq.com>
Inline Side-by-side
Showing 3 changed files with 26 additions and 31 deletions
... ... @@ -14,17 +14,12 @@
*/
import { FlutterAbility } from '@ohos/flutter_ohos'
import { FlutterPlugin } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin';
import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant';
import List from '@ohos.util.List';
import FlutterEngine from '@ohos/flutter_ohos/src/main/ets/embedding/engine/FlutterEngine';
export default class EntryAbility extends FlutterAbility {
configureFlutterEngine(flutterEngine: FlutterEngine) {
super.configureFlutterEngine(flutterEngine)
let plugins = GeneratedPluginRegistrant.getPlugins() as List<FlutterPlugin>;
plugins.forEach((plugin) => {
this.addPlugin(plugin);
})
GeneratedPluginRegistrant.registerWith(flutterEngine)
}
}
... ...
... ... @@ -13,7 +13,7 @@
* limitations under the License.
*/
import { BasicMessageChannel, BinaryMessenger, ByteBuffer, Log, MessageCodec } from '@ohos/flutter_ohos';
import { BasicMessageChannel, BinaryMessenger, ByteBuffer, Log, MessageCodec, Any } from '@ohos/flutter_ohos';
import { Reply } from '@ohos/flutter_ohos/src/main/ets/plugin/common/BasicMessageChannel';
import StandardMessageCodec from '@ohos/flutter_ohos/src/main/ets/plugin/common/StandardMessageCodec';
import ArrayList from '@ohos.util.ArrayList';
... ... @@ -24,13 +24,13 @@ const TAG = "wakelock.Messages";
export class ToggleMessage {
enable: Boolean = false;
toMap(): Map<String, ESObject> {
let toMapResult: Map<String, ESObject> = new Map<String, ESObject>();
toMap(): Map<String, Any> {
let toMapResult: Map<String, Any> = new Map<String, Any>();
toMapResult.set("enable", this.enable);
return toMapResult;
}
static fromMap(map: Map<String, ESObject>): ToggleMessage {
static fromMap(map: Map<String, Any>): ToggleMessage {
let fromMapResult = new ToggleMessage();
let enable: Boolean = map.get("enable") ?? false;
fromMapResult.enable = enable;
... ... @@ -41,13 +41,13 @@ export class ToggleMessage {
export class IsEnabledMessage {
enabled: Boolean = false;
toMap(): Map<String, ESObject> {
let toMapResult: Map<String, ESObject> = new Map<String, ESObject>();
toMap(): Map<String, Any> {
let toMapResult: Map<String, Any> = new Map<String, Any>();
toMapResult.set("enabled", this.enabled);
return toMapResult;
}
static fromMap(map: Map<String, ESObject>): IsEnabledMessage {
static fromMap(map: Map<String, Any>): IsEnabledMessage {
let fromMapResult = new IsEnabledMessage();
let enabled: Boolean = map.get("enabled") ?? false;
fromMapResult.enabled = enabled;
... ... @@ -62,21 +62,21 @@ class WakelockApiCodec extends StandardMessageCodec {
super();
}
readValueOfType(type: number, buffer: ByteBuffer): ESObject {
readValueOfType(type: number, buffer: ByteBuffer): Any {
// Log.i(TAG, "readValueOfType type=" + type + ", buffer=" + buffer);
switch (type) {
case 128:
return IsEnabledMessage.fromMap(this.readValue(buffer) as Map<String, ESObject>);
return IsEnabledMessage.fromMap(this.readValue(buffer) as Map<String, Any>);
case 129:
return ToggleMessage.fromMap(this.readValue(buffer) as Map<String, ESObject>);
return ToggleMessage.fromMap(this.readValue(buffer) as Map<String, Any>);
default:
return super.readValueOfType(type, buffer);
}
}
writeValue(stream: ByteBuffer, value: ESObject): ESObject {
writeValue(stream: ByteBuffer, value: Any): Any {
if (value instanceof IsEnabledMessage) {
stream.writeUint8(128);
this.writeValue(stream, value.toMap());
... ... @@ -90,21 +90,21 @@ class WakelockApiCodec extends StandardMessageCodec {
}
export class Messages {
static getCodec(): MessageCodec<ESObject> {
static getCodec(): MessageCodec<Any> {
return WakelockApiCodec.INSTANCE;
}
static setup(binaryMessenger: BinaryMessenger, api: WakelockApi): void {
{
const channel: BasicMessageChannel<ESObject> = new BasicMessageChannel<ESObject>(
const channel: BasicMessageChannel<Any> = new BasicMessageChannel<Any>(
binaryMessenger, "dev.flutter.pigeon.WakelockApi.toggle", Messages.getCodec());
if (api != null) {
channel.setMessageHandler({
onMessage(message: ESObject, reply: Reply<ESObject>): void {
onMessage(message: Any, reply: Reply<Any>): void {
// Log.d(TAG, 'onMessage reply:' + reply)
let wrapped: Map<String, ESObject> = new Map<String, ESObject>();
let wrapped: Map<String, Any> = new Map<String, Any>();
try {
let args: ArrayList<ESObject> = message as ArrayList<ESObject>;
let args: ArrayList<Any> = message as ArrayList<Any>;
let msgArg: ToggleMessage = args[0] as ToggleMessage;
Log.i(TAG, "received msgArg=" + JSON.stringify(msgArg));
... ... @@ -115,7 +115,7 @@ export class Messages {
Log.i(TAG, "toggle success");
wrapped.set("result", null);
reply.reply(wrapped);
}).catch((err: ESObject) => {
}).catch((err: Any) => {
Log.i(TAG, "toggle failed: " + JSON.stringify(err));
wrapped.set("error", Messages.wrapError(err));
reply.reply(wrapped);
... ... @@ -132,13 +132,13 @@ export class Messages {
}
}
{
const channel: BasicMessageChannel<ESObject> = new BasicMessageChannel<ESObject>(
const channel: BasicMessageChannel<Any> = new BasicMessageChannel<Any>(
binaryMessenger, "dev.flutter.pigeon.WakelockApi.isEnabled", Messages.getCodec());
if (api != null) {
channel.setMessageHandler({
onMessage(message: ESObject, reply: Reply<ESObject>): void {
onMessage(message: Any, reply: Reply<Any>): void {
// Log.d(TAG, 'onMessage reply:' + reply)
let wrapped: Map<String, ESObject> = new Map<String, ESObject>();
let wrapped: Map<String, Any> = new Map<String, Any>();
try {
let output: IsEnabledMessage = api.isEnabled();
wrapped.set("result", output);
... ... @@ -154,8 +154,8 @@ export class Messages {
}
}
static wrapError(error: Error): Map<String, ESObject> {
let errorMap: Map<String, ESObject> = new Map();
static wrapError(error: Error): Map<String, Any> {
let errorMap: Map<String, Any> = new Map();
errorMap.set("message", error.message);
errorMap.set("code", error.name);
errorMap.set("details", null);
... ...
... ... @@ -13,7 +13,7 @@
* limitations under the License.
*/
import { Log } from '@ohos/flutter_ohos';
import { Log, Any } from '@ohos/flutter_ohos';
import { IsEnabledMessage, ToggleMessage } from './Messages';
import common from '@ohos.app.ability.common';
import window from '@ohos.window';
... ... @@ -50,12 +50,12 @@ export class Wakelock implements WakelockApi {
Log.i(TAG, "setWindowKeepScreenOn success");
this.enabled = isKeepScreenOn;
resolve();
}).catch((err: ESObject) => {
}).catch((err: Any) => {
this.enabled = false;
reject(err);
Log.e(TAG, "setWindowKeepScreenOn error: " + JSON.stringify(err));
})
}).catch((err: ESObject) => {
}).catch((err: Any) => {
this.enabled = false;
reject(err);
Log.i(TAG, "setWindowKeepScreenOn other error: " + JSON.stringify(err));
... ...