Skip to content

fix(harmonyos): detect direct remote task completion #2650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wgqqqqq merged 9 commits into from
Aug 29, 2026
+934 −310
Merged

fix(harmonyos): detect direct remote task completion #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c302a63
fix(harmonyos): detect direct remote task completion
wgqqqqq Aug 29, 2026
608e610
fix(harmonyos): top-align short file previews
wgqqqqq Aug 29, 2026
8d20dae
fix(harmonyos): render markdown frontmatter semantically
wgqqqqq Aug 29, 2026
7147ce7
fix(harmonyos): scope workspace tree to selected device
wgqqqqq Aug 29, 2026
5fb1a77
fix(harmonyos): keep device catalog loading state accurate
wgqqqqq Aug 29, 2026
143141d
refactor(harmonyos): unify login and back navigation styling
wgqqqqq Aug 29, 2026
6089953
refactor(harmonyos): distinguish sheet close controls
wgqqqqq Aug 29, 2026
61876e4
fix(harmonyos): refine sheet close control proportions
wgqqqqq Aug 29, 2026
63771ed
refactor(harmonyos): unify scan sheet layout
wgqqqqq Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions src/apps/mobile/harmonyos/entry/src/main/ets/pages/components/AccountProfilePanel.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { CloudAccountDevice } from '../../services/CloudAccountClient';
import { AccountDeviceSelectionPolicy } from '../policy/AccountDeviceSelectionPolicy';
import { CARD, GREEN, INK, LINE, MUTED, PAGE_BG, RED, SOFT } from './Theme';
import { DefaultAccountAvatar } from './DefaultAccountAvatar';
import { NavigationBackButton } from './NavigationBackButton';

/** Account identity and device management shared by Settings and account entry. */
@ComponentV2
Expand Down Expand Up @@ -115,18 +116,10 @@ export struct AccountProfilePanel {
@Builder
private NavigationHeader() {
Row() {
Button() {
SymbolGlyph($r('sys.symbol.chevron_left'))
.fontSize(23)
.fontColor([INK])
}
.width(44)
.height(44)
.padding(0)
.type(ButtonType.Circle)
.backgroundColor(CARD)
.accessibilityText(RemoteI18n.t('common.back'))
.onClick(() => this.onBack())
NavigationBackButton({
controlSize: 44,
onBack: (): void => this.onBack()
})
Text(RemoteI18n.t('remote.settings.profile'))
.fontSize(MobileDesignTypography.headlineMedium.size)
.fontWeight(FontWeight.Bold)
Expand Down
320 changes: 194 additions & 126 deletions src/apps/mobile/harmonyos/entry/src/main/ets/pages/components/BitFunAccountLoginPage.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
import { MobileDesignTypography } from '../../generated/MobileDesignTokens';
import { RemoteI18n } from '../../i18n/RemoteI18n';
import { DEFAULT_CLOUD_RELAY_URL } from '../../services/CloudAccountClient';
import { CARD, INK, MUTED, PRIMARY_ACTION, PRIMARY_ACTION_TEXT, RED, SUBTLE } from './Theme';
import { TemplateIcon } from './TemplateIcon';
import {
CARD,
INK,
LINE,
MUTED,
PAGE_BG_FADE,
RED,
SUBTLE
} from './Theme';
import { SheetActionFooter } from './SheetActionFooter';
import { SheetCloseHeader } from './SheetCloseHeader';
import {
SHEET_CONTENT_BOTTOM_PADDING,
SHEET_CONTENT_MAX_WIDTH,
SHEET_HORIZONTAL_PADDING
} from './SheetLayout';

const CREDENTIAL_ROW_HEIGHT: number = 60;

@ComponentV2
export struct BitFunAccountLoginPage {
@Event cloudLogin: (relayUrl: string, username: string, password: string) => Promise<string> =
async (_relayUrl: string, _username: string, _password: string): Promise<string> => '';
@Event onBack: () => void = () => {};
@Event onClose: () => void = () => {};
@Event onLoginSuccess: () => void = () => {};
@Local relayUrl: string = DEFAULT_CLOUD_RELAY_URL;
@Local username: string = '';
Expand All @@ -19,152 +35,204 @@ export struct BitFunAccountLoginPage {

build() {
Column({ space: 0 }) {
this.NavigationHeader()
SheetCloseHeader({ onClose: this.onClose })

Scroll() {
Column({ space: 0 }) {
Text(RemoteI18n.t('remote.settings.accountLoginBody'))
.fontSize(MobileDesignTypography.bodyLarge.size)
.lineHeight(MobileDesignTypography.bodyLarge.lineHeight)
.fontColor(MUTED)
.width('100%')
.margin({ top: 12, bottom: 42 })

TextInput({ placeholder: RemoteI18n.t('connect.accountUsernamePlaceholder'), text: this.username })
.height(58)
.fontSize(MobileDesignTypography.bodyLarge.size)
.fontColor(INK)
.placeholderColor(SUBTLE)
.backgroundColor(CARD)
.borderRadius(18)
.padding({ left: 20, right: 20 })
.onChange((value: string) => { this.username = value; })

TextInput({ placeholder: RemoteI18n.t('connect.accountPasswordPlaceholder'), text: this.password })
.height(58)
.fontSize(MobileDesignTypography.bodyLarge.size)
.fontColor(INK)
.placeholderColor(SUBTLE)
.backgroundColor(CARD)
.borderRadius(18)
.padding({ left: 20, right: 20 })
.margin({ top: 14 })
.type(InputType.Password)
.onChange((value: string) => { this.password = value; })

Row() {
Text(RemoteI18n.t('sheet.advancedOptions'))
.fontSize(MobileDesignTypography.bodySmall.size)
.fontColor(MUTED)
Blank()
if (this.showAdvanced) {
SymbolGlyph($r('sys.symbol.chevron_up'))
.fontSize(12)
.fontColor([MUTED])
} else {
SymbolGlyph($r('sys.symbol.chevron_down'))
.fontSize(12)
.fontColor([MUTED])
}
}
.width('100%')
.height(44)
.padding({ left: 4, right: 4 })
.margin({ top: 12 })
.alignItems(VerticalAlign.Center)
.onClick(() => {
this.showAdvanced = !this.showAdvanced;
})

if (this.showAdvanced) {
Text(RemoteI18n.t('remote.settings.loginServer'))
.fontSize(MobileDesignTypography.bodySmall.size)
.fontColor(MUTED)
.width('100%')
.margin({ left: 4, top: 8, bottom: 8 })

TextInput({ placeholder: RemoteI18n.t('remote.settings.relayUrlPlaceholder'), text: this.relayUrl })
.height(52)
.fontSize(MobileDesignTypography.bodyMedium.size)
.fontColor(INK)
.placeholderColor(SUBTLE)
.backgroundColor(CARD)
.borderRadius(16)
.padding({ left: 18, right: 18 })
.onChange((value: string) => { this.relayUrl = value; })
}

if (this.errorText.length > 0) {
Text(this.errorText)
.fontSize(MobileDesignTypography.bodySmall.size)
.lineHeight(MobileDesignTypography.bodySmall.lineHeight)
.fontColor(RED)
.width('100%')
.margin({ top: 12 })
}
Column() {
this.LoginForm()
}
.width('100%')
.padding({ left: 28, right: 28, top: 24, bottom: 18 })
.alignItems(HorizontalAlign.Start)
.padding({
left: SHEET_HORIZONTAL_PADDING,
right: SHEET_HORIZONTAL_PADDING,
top: 0,
bottom: SHEET_CONTENT_BOTTOM_PADDING
})
.alignItems(HorizontalAlign.Center)
}
.width('100%')
.layoutWeight(1)
.scrollBar(BarState.Off)

Row() {
Button(this.isBusy ? RemoteI18n.t('remote.settings.accountSigningIn') :
RemoteI18n.t('remote.settings.accountSignIn'))
.height(56)
SheetActionFooter({
label: this.isBusy ? RemoteI18n.t('remote.settings.accountSigningIn') :
RemoteI18n.t('remote.settings.accountSignIn'),
primary: true,
isEnabled: this.canSubmit(),
onAction: (): void => {
void this.submit();
}
})
}
.width('100%')
.height('100%')
}

@Builder
private LoginForm() {
Column({ space: 0 }) {
Text(RemoteI18n.t('remote.settings.accountLoginTitle'))
.fontSize(MobileDesignTypography.displayMedium.size)
.lineHeight(MobileDesignTypography.displayMedium.lineHeight)
.fontWeight(FontWeight.Bold)
.fontColor(INK)
.width('100%')
.textAlign(TextAlign.Center)

Text(RemoteI18n.t('remote.settings.accountLoginBody'))
.fontSize(MobileDesignTypography.bodyMedium.size)
.lineHeight(MobileDesignTypography.bodyMedium.lineHeight)
.fontColor(MUTED)
.width('100%')
.textAlign(TextAlign.Center)
.margin({ top: 8, bottom: 24 })

this.CredentialCard()
this.AdvancedCard()

if (this.errorText.length > 0) {
Text(this.errorText)
.fontSize(MobileDesignTypography.bodySmall.size)
.lineHeight(MobileDesignTypography.bodySmall.lineHeight)
.fontColor(RED)
.width('100%')
.margin({ top: 12, left: 4, right: 4 })
}
}
.width('100%')
.constraintSize({ maxWidth: SHEET_CONTENT_MAX_WIDTH })
.alignItems(HorizontalAlign.Center)
}

@Builder
private CredentialCard() {
Column() {
Row({ space: 12 }) {
SymbolGlyph($r('sys.symbol.person'))
.fontSize(21)
.fontColor([MUTED])
.width(24)
.height(24)
TextInput({
placeholder: RemoteI18n.t('connect.accountUsernamePlaceholder'),
text: this.username
})
.height(CREDENTIAL_ROW_HEIGHT)
.layoutWeight(1)
.fontSize(MobileDesignTypography.labelLarge.size)
.fontWeight(FontWeight.Bold)
.fontColor(PRIMARY_ACTION_TEXT)
.backgroundColor(PRIMARY_ACTION)
.borderRadius(18)
.opacity(this.canSubmit() ? 1 : 0.28)
.enabled(this.canSubmit())
.onClick(async () => {
await this.submit();
})
.fontSize(MobileDesignTypography.bodyLarge.size)
.fontColor(INK)
.placeholderColor(SUBTLE)
.backgroundColor(PAGE_BG_FADE)
.padding({ left: 0, right: 4 })
.onChange((value: string) => { this.username = value; })
}
.width('100%')
.height(CREDENTIAL_ROW_HEIGHT)
.padding({ left: 18, right: 12 })
.alignItems(VerticalAlign.Center)

Divider()
.strokeWidth(1)
.color(LINE)
.margin({ left: 54, right: 16 })

Row({ space: 12 }) {
SymbolGlyph($r('sys.symbol.lock'))
.fontSize(20)
.fontColor([MUTED])
.width(24)
.height(24)
TextInput({
placeholder: RemoteI18n.t('connect.accountPasswordPlaceholder'),
text: this.password
})
.height(CREDENTIAL_ROW_HEIGHT)
.layoutWeight(1)
.fontSize(MobileDesignTypography.bodyLarge.size)
.fontColor(INK)
.placeholderColor(SUBTLE)
.backgroundColor(PAGE_BG_FADE)
.padding({ left: 0, right: 4 })
.type(InputType.Password)
.showPasswordIcon(true)
.onChange((value: string) => { this.password = value; })
}
.width('100%')
.padding({ left: 28, right: 28, top: 12, bottom: 28 })
.height(CREDENTIAL_ROW_HEIGHT)
.padding({ left: 18, right: 12 })
.alignItems(VerticalAlign.Center)
}
.width('100%')
.height('100%')
.backgroundColor(CARD)
.border({ width: 1, color: LINE })
.borderRadius(24)
.clip(true)
}

@Builder
private NavigationHeader() {
Row() {
Button() {
TemplateIcon({
src: $r('app.media.remote_ref_back'),
iconWidth: 15,
iconHeight: 23
})
private AdvancedCard() {
Column() {
Row({ space: 14 }) {
SymbolGlyph($r('sys.symbol.gearshape'))
.fontSize(21)
.fontColor([MUTED])
.width(24)
.height(24)
Text(RemoteI18n.t('sheet.advancedOptions'))
.fontSize(MobileDesignTypography.titleSmall.size)
.fontWeight(FontWeight.Medium)
.fontColor(INK)
.layoutWeight(1)
SymbolGlyph(this.showAdvanced ?
$r('sys.symbol.chevron_up') : $r('sys.symbol.chevron_down'))
.fontSize(13)
.fontColor([MUTED])
}
.width(44)
.height(44)
.padding(0)
.type(ButtonType.Circle)
.backgroundColor('#00000000')
.accessibilityText(RemoteI18n.t('common.back'))
.width('100%')
.height(58)
.padding({ left: 18, right: 18 })
.alignItems(VerticalAlign.Center)
.onClick(() => {
this.onBack();
this.showAdvanced = !this.showAdvanced;
})

Text(RemoteI18n.t('remote.settings.accountLoginTitle'))
.fontSize(MobileDesignTypography.headlineMedium.size)
.fontWeight(FontWeight.Bold)
.fontColor(INK)
.layoutWeight(1)
.margin({ left: 10 })
if (this.showAdvanced) {
Divider()
.strokeWidth(1)
.color(LINE)
.margin({ left: 18, right: 18 })

Column({ space: 8 }) {
Text(RemoteI18n.t('remote.settings.loginServer'))
.fontSize(MobileDesignTypography.labelSmall.size)
.fontColor(MUTED)
.width('100%')

TextInput({
placeholder: RemoteI18n.t('remote.settings.relayUrlPlaceholder'),
text: this.relayUrl
})
.height(48)
.fontSize(MobileDesignTypography.bodyMedium.size)
.fontColor(INK)
.placeholderColor(SUBTLE)
.backgroundColor(PAGE_BG_FADE)
.border({ width: 1, color: LINE })
.borderRadius(14)
.padding({ left: 14, right: 14 })
.onChange((value: string) => { this.relayUrl = value; })
}
.width('100%')
.padding({ left: 18, right: 18, top: 14, bottom: 18 })
.alignItems(HorizontalAlign.Start)
}
}
.width('100%')
.height(72)
.padding({ left: 18, right: 18 })
.alignItems(VerticalAlign.Center)
.backgroundColor(CARD)
.border({ width: 1, color: LINE })
.borderRadius(20)
.clip(true)
.margin({ top: 14 })
}

private canSubmit(): boolean {
Expand Down
Loading