Merge pull request #114 from yeliulee/ohos_flutter_3.22

add support for HarmonyOS and implementation for QRCode Auth

.metadata

@@ -21,6 +21,9 @@ migration:
     - platform: ios
       create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
       base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
+    - platform: ohos
+      create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
+      base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
 
   # User provided section
 

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.1.0
+
+* 新增: 对 `HarmonyOS` 的支持, 受限于 SDK, 仅支持部分功能
+* 新增: Server-Side Code 模式登录
+* 新增: 二维码授权登录
+
 ## 6.0.1
 
 * iOS: 优化 ruby 脚本

README.md

@@ -29,7 +29,7 @@ Flutter 版腾讯(QQ)SDK
 
 ### Android
 
-```
+```txt
 # 不需要做任何额外接入工作
 # 配置已集成到脚本里
 # 混淆已打入 Library，随 Library 引用，自动添加到 apk 打包混淆
@@ -39,7 +39,7 @@ Flutter 版腾讯(QQ)SDK
 
 > 暂不支持 SceneDelegate，详见文档 [iOS_SDK环境搭建](https://wiki.connect.qq.com/ios_sdk%e7%8e%af%e5%a2%83%e6%90%ad%e5%bb%ba)
 
-```
+```txt
 # 不需要做任何额外接入工作
 # 配置已集成到脚本里
 ```
@@ -70,6 +70,44 @@ https://${your applinks domain}/universal_link/${example_app}/qq_conn/${appId}
 
 > ⚠️ 很多 SDK 都会用到 universal_link，可为不同 SDK 分配不同的 path 以作区分
 
+### HarmonyOS
+
+> 当前在 `HarmonyOS` 平台, 仅支持 `setIsPermissionGranted/registerApp/isQQInstalled/loginServerSide`
+>
+> 由于 SDK 限制，当前仅支持 Server-Side 模式登录，auth code 在 accessToken 字段，获取后可自行在后端使用
+
+项目中 module.json5 的 "module" 节点下配置 querySchemes
+
+```json5
+"querySchemes": [
+    "https",
+    "qqopenapi"
+]
+```
+
+在 Ability 的 skills 节点中配置 scheme
+
+```json5
+"skills": [
+ {
+    "entities": [
+      "entity.system.browsable"
+    ],
+    "actions": [
+      "ohos.want.action.viewData"
+    ],
+    "uris": [
+      {
+        "scheme": "qqopenapi", // 接收 QQ 回调数据
+        "host": "102061317", // 业务申请的互联 appId
+        "path": "auth",
+        "linkFeature": "Login",
+      }
+    ]
+  }
+]
+```
+
 ### Flutter
 
 |分享类型|说说(图/文/视频)|文本|图片|音乐|视频|网页|
@@ -84,7 +122,8 @@ https://${your applinks domain}/universal_link/${example_app}/qq_conn/${appId}
 * 兼容
 
 flutter 2.5 兼容问题 [issues/54](https://github.com/RxReader/tencent_kit/issues/54)
-```
+
+```ruby
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)

android/src/main/java/io/github/v7lin/tencent_kit/TencentKitPlugin.java

@@ -181,16 +181,18 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
 
     private void login(@NonNull MethodCall call, @NonNull Result result) {
         final String scope = call.argument("scope");
+        final boolean qrcode = call.argument("qrcode");
         if (tencent != null) {
-            tencent.login(activityPluginBinding.getActivity(), scope, loginListener);
+            tencent.login(activityPluginBinding.getActivity(), scope, loginListener, qrcode);
         }
         result.success(null);
     }
 
     private void loginServerSide(@NonNull MethodCall call, @NonNull Result result) {
         final String scope = call.argument("scope");
+        final boolean qrcode = call.argument("qrcode");
         if (tencent != null) {
-            tencent.loginServerSide(activityPluginBinding.getActivity(), scope, loginListener);
+            tencent.loginServerSide(activityPluginBinding.getActivity(), scope, loginListener, qrcode);
         }
         result.success(null);
     }

example/ohos/.gitignore

@@ -0,0 +1,19 @@
+/node_modules
+/oh_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+.cxx
+/.clangd
+/.clang-format
+/.clang-tidy
+**/.test
+*.har
+**/BuildProfile.ets
+**/oh-package-lock.json5
+
+**/src/main/resources/rawfile/flutter_assets/
+**/libs/arm64-v8a/libapp.so
+**/libs/arm64-v8a/libflutter.so
+**/libs/arm64-v8a/libvmservice_snapshot.so

example/ohos/AppScope/app.json5

@@ -0,0 +1,10 @@
+{
+  "app": {
+    "bundleName": "io.github.v7lin.tencent_kit_example",
+    "vendor": "example",
+    "versionCode": 1000000,
+    "versionName": "1.0.0",
+    "icon": "$media:app_icon",
+    "label": "$string:app_name"
+  }
+}

example/ohos/AppScope/resources/base/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "tencent_kit_example"
+    }
+  ]
+}

example/ohos/build-profile.json5

@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+{
+  "app": {
+    "signingConfigs": [],
+    "products": [
+      {
+        "name": "default",
+        "signingConfig": "default",
+        "compatibleSdkVersion": "5.0.0(12)",
+        "runtimeOS": "HarmonyOS",
+      }
+    ]
+  },
+  "modules": [
+    {
+      "name": "entry",
+      "srcPath": "./entry",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
+    },
+    {
+      name: "tencent_kit",
+      srcPath: "../../ohos",
+      targets: [
+        {
+          name: "default",
+          applyToProducts: ["default"],
+        },
+      ],
+    },
+  ]
+}

example/ohos/entry/.gitignore

@@ -0,0 +1,7 @@
+
+/node_modules
+/oh_modules
+/.preview
+/build
+/.cxx
+/.test

example/ohos/entry/build-profile.json5

@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+{
+  "apiType": 'stageMode',
+  "buildOption": {
+  },
+  "targets": [
+    {
+      "name": "default",
+      "runtimeOS": "HarmonyOS"
+    },
+    {
+      "name": "ohosTest",
+    }
+  ]
+}

example/ohos/entry/hvigorfile.ts

@@ -0,0 +1,17 @@
+/*
+* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+export { hapTasks } from '@ohos/hvigor-ohos-plugin';

example/ohos/entry/oh-package.json5

@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+{
+  "name": "entry",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "author": "",
+  "license": "",
+  "dependencies": {
+    "tencent_kit": "../../../ohos"
+  },
+}
+

example/ohos/entry/src/main/ets/entryability/EntryAbility.ets

@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos';
+import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant';
+
+export default class EntryAbility extends FlutterAbility {
+  configureFlutterEngine(flutterEngine: FlutterEngine) {
+    super.configureFlutterEngine(flutterEngine)
+    GeneratedPluginRegistrant.registerWith(flutterEngine)
+  }
+}

example/ohos/entry/src/main/ets/pages/Index.ets

@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+import common from '@ohos.app.ability.common';
+import { FlutterPage } from '@ohos/flutter_ohos'
+
+let storage = LocalStorage.getShared()
+const EVENT_BACK_PRESS = 'EVENT_BACK_PRESS'
+
+@Entry(storage)
+@Component
+struct Index {
+  private context = getContext(this) as common.UIAbilityContext
+  @LocalStorageLink('viewId') viewId: string = "";
+
+  build() {
+    Column() {
+      FlutterPage({ viewId: this.viewId })
+    }
+  }
+
+  onBackPress(): boolean {
+    this.context.eventHub.emit(EVENT_BACK_PRESS)
+    return true
+  }
+}