From 25e52cdb88e3f30e2e67025f314ad464dc9413a0 Mon Sep 17 00:00:00 2001 From: cjand <1747143535@qq.com> Date: Tue, 7 May 2024 16:43:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BD=91=E7=BB=9C=E6=96=AD=E7=BD=91=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cjand <1747143535@qq.com> --- .../connectivity_plus/ohos/.clang-format | 62 +++++++++++++++++++ .../plus/connectivity/Connectivity.ets | 7 ++- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 packages/connectivity_plus/connectivity_plus/ohos/.clang-format diff --git a/packages/connectivity_plus/connectivity_plus/ohos/.clang-format b/packages/connectivity_plus/connectivity_plus/ohos/.clang-format new file mode 100644 index 00000000..98da4e26 --- /dev/null +++ b/packages/connectivity_plus/connectivity_plus/ohos/.clang-format @@ -0,0 +1,62 @@ +Language: Cpp +# BasedOnStyle: LLVM +ColumnLimit: 120 +SortIncludes: false +TabWidth: 4 +IndentWidth: 4 +UseTab: Never +AccessModifierOffset: -4 +ContinuationIndentWidth: 4 +IndentCaseBlocks: false +IndentCaseLabels: false +IndentGotoLabels: true +IndentWrappedFunctionNames: false +SortUsingDeclarations: false +NamespaceIndentation: All +SpaceAfterCStyleCast: false +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeCaseColon: false +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeRangeBasedForLoopColon: true +SpaceBeforeSquareBrackets: false +SpaceInEmptyBlock: false +SpaceInEmptyParentheses: false +SpacesInAngles: false +SpacesInCStyleCastParentheses: false +SpacesInConditionalStatement: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortEnumsOnASingleLine: true +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: Never +AllowShortLambdasOnASingleLine: All +AllowShortLoopsOnASingleLine: false +AlwaysBreakTemplateDeclarations: MultiLine +BinPackArguments: true +BinPackParameters: true +BreakBeforeTernaryOperators: true +BreakConstructorInitializers: BeforeColon +BreakInheritanceList: BeforeColon +BreakStringLiterals: true +InsertBraces: false +IndentExternBlock: NoIndent +BreakBeforeBraces: Custom +BraceWrapping: + AfterCaseLabel: false + AfterClass: false + AfterControlStatement: Never + AfterEnum: false + AfterFunction: false + AfterNamespace: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false +ReflowComments: true +MaxEmptyLinesToKeep: 2 \ No newline at end of file diff --git a/packages/connectivity_plus/connectivity_plus/ohos/connectivity_plus/src/main/ets/dev/fluttercommunity/plus/connectivity/Connectivity.ets b/packages/connectivity_plus/connectivity_plus/ohos/connectivity_plus/src/main/ets/dev/fluttercommunity/plus/connectivity/Connectivity.ets index b42fbb84..734e61da 100644 --- a/packages/connectivity_plus/connectivity_plus/ohos/connectivity_plus/src/main/ets/dev/fluttercommunity/plus/connectivity/Connectivity.ets +++ b/packages/connectivity_plus/connectivity_plus/ohos/connectivity_plus/src/main/ets/dev/fluttercommunity/plus/connectivity/Connectivity.ets @@ -32,8 +32,11 @@ export class Connectivity { async getNetworkType(): Promise { //通过异步方式获取网络信息 - const netHandle = await connection.getDefaultNet() - const capabilities = await connection.getNetCapabilities(netHandle) + const netHandle = await connection.getDefaultNet(); + if (netHandle.netId == 0) { + return Connectivity.CONNECTIVITY_NONE; + } + const capabilities = await connection.getNetCapabilities(netHandle); this.networkType = this.hasTransport(capabilities.bearerTypes); return this.networkType; } -- Gitee From 53b33c8bd7347c9010ead63622a9bf748dc8903e Mon Sep 17 00:00:00 2001 From: cjand <1747143535@qq.com> Date: Tue, 7 May 2024 16:49:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BD=91=E7=BB=9C=E6=96=AD=E7=BD=91=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cjand <1747143535@qq.com> --- .../connectivity_plus/ohos/.clang-format | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 packages/connectivity_plus/connectivity_plus/ohos/.clang-format diff --git a/packages/connectivity_plus/connectivity_plus/ohos/.clang-format b/packages/connectivity_plus/connectivity_plus/ohos/.clang-format deleted file mode 100644 index 98da4e26..00000000 --- a/packages/connectivity_plus/connectivity_plus/ohos/.clang-format +++ /dev/null @@ -1,62 +0,0 @@ -Language: Cpp -# BasedOnStyle: LLVM -ColumnLimit: 120 -SortIncludes: false -TabWidth: 4 -IndentWidth: 4 -UseTab: Never -AccessModifierOffset: -4 -ContinuationIndentWidth: 4 -IndentCaseBlocks: false -IndentCaseLabels: false -IndentGotoLabels: true -IndentWrappedFunctionNames: false -SortUsingDeclarations: false -NamespaceIndentation: All -SpaceAfterCStyleCast: false -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: true -SpaceBeforeAssignmentOperators: true -SpaceBeforeCaseColon: false -SpaceBeforeCpp11BracedList: false -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: true -SpaceBeforeRangeBasedForLoopColon: true -SpaceBeforeSquareBrackets: false -SpaceInEmptyBlock: false -SpaceInEmptyParentheses: false -SpacesInAngles: false -SpacesInCStyleCastParentheses: false -SpacesInConditionalStatement: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -AllowShortCaseLabelsOnASingleLine: false -AllowShortEnumsOnASingleLine: true -AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: Never -AllowShortLambdasOnASingleLine: All -AllowShortLoopsOnASingleLine: false -AlwaysBreakTemplateDeclarations: MultiLine -BinPackArguments: true -BinPackParameters: true -BreakBeforeTernaryOperators: true -BreakConstructorInitializers: BeforeColon -BreakInheritanceList: BeforeColon -BreakStringLiterals: true -InsertBraces: false -IndentExternBlock: NoIndent -BreakBeforeBraces: Custom -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: Never - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: false - BeforeElse: false -ReflowComments: true -MaxEmptyLinesToKeep: 2 \ No newline at end of file -- Gitee