From 6c106dda6cab1cc1a8d7cb53f362792751dc2e3b Mon Sep 17 00:00:00 2001 From: xinhu Date: Tue, 23 Apr 2024 14:37:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?tangram=EF=BC=9AOpenSource=E7=9A=84json?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xinhu --- tangram/README.OpenSource | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tangram/README.OpenSource b/tangram/README.OpenSource index 8bcfa587..68d40a3d 100644 --- a/tangram/README.OpenSource +++ b/tangram/README.OpenSource @@ -4,8 +4,8 @@ "License": "MIT License", "License File": "https://github.com/alibaba/Tangram-Android/blob/master/LICENSE", "Version Number": "3.3.6", - "Owner" : "alibaba", + "Owner" : "xiafeng@huawei.com", "Upstream URL": "https://github.com/alibaba/Tangram-Android", "Description": "Tangram is a modular UI solution for building native page dynamically including Tangram for Android, Tangram for iOS and even backend CMS. This project provides the sdk on Android." - }, + } ] \ No newline at end of file -- Gitee From bcda7cea400a3ec429b707bbbf913f75b1379372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=AC=A2?= Date: Fri, 26 Apr 2024 15:10:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?tangram=EF=BC=9AOpenSource=E7=9A=84json?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张欢 --- .../Tangram/src/main/ets/components/porterties/CardProperty.ets | 2 +- tangram/entry/src/main/ets/Application/MyAbilityStage.ts | 2 +- tangram/entry/src/main/ets/MainAbility/MainAbility.ts | 2 +- tangram/entry/src/main/ets/pages/index.ets | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tangram/Tangram/src/main/ets/components/porterties/CardProperty.ets b/tangram/Tangram/src/main/ets/components/porterties/CardProperty.ets index 1e087a2f..262a8b77 100644 --- a/tangram/Tangram/src/main/ets/components/porterties/CardProperty.ets +++ b/tangram/Tangram/src/main/ets/components/porterties/CardProperty.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Style } from './style/style' +import { Style } from './style/Style' @Observed export class CardProperty { diff --git a/tangram/entry/src/main/ets/Application/MyAbilityStage.ts b/tangram/entry/src/main/ets/Application/MyAbilityStage.ts index e57bff58..44741972 100644 --- a/tangram/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/tangram/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import hilog from '@ohos.hilog'; -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/tangram/entry/src/main/ets/MainAbility/MainAbility.ts b/tangram/entry/src/main/ets/MainAbility/MainAbility.ts index cd335064..05ab890d 100644 --- a/tangram/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/tangram/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import hilog from '@ohos.hilog'; -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility'; import Window from '@ohos.window' export default class MainAbility extends Ability { diff --git a/tangram/entry/src/main/ets/pages/index.ets b/tangram/entry/src/main/ets/pages/index.ets index 08e8a463..c1e1a5eb 100644 --- a/tangram/entry/src/main/ets/pages/index.ets +++ b/tangram/entry/src/main/ets/pages/index.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import {DataUtil} from './datautil' +import {DataUtil} from './Datautil' import { CardProperty, Tangram, TangramLayout, CardLoadSupport, Style} from '@ohos/tangram' @Entry -- Gitee