diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/main/ets/pages/Index.ets index 69adff517fa5183f9d3c20de1e2d380861f3e1f8..9841b4ca2a36cfd0d1adf3a46acdeb10c2e16a67 100755 --- a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/main/ets/pages/Index.ets @@ -23,10 +23,11 @@ struct Index { private items: string[] = [ 'Reset Result Message', '1.napiCreateBuffer', - '2.napiCreateExternalBuffer', - '3.napiGetBufferInfo', - '4.napiIsBuffer', - '5.napiCreateExternalArraybuffer' + '2.napiCreateBufferCopy', + '3.napiCreateExternalBuffer', + '4.napiGetBufferInfo', + '5.napiIsBuffer', + '6.napiCreateExternalArraybuffer' ] build() { @@ -59,7 +60,16 @@ struct Index { hilog.error(0x0000, 'testTag', 'Test Node-API napi_create_buffer error'); this.result = 'napiCreateBufferFail'; } - } else if (item === '2.napiCreateExternalBuffer') { + } else if (item === '2.napiCreateBufferCopy') { + try { + hilog.info(0x0000, 'testTag', 'Test Node-API napi_create_buffer_copy: %{public}s', + testNapi.createBufferCopy().toString()); + this.result = 'napiCreateBufferCopySuccess'; + } catch (error) { + hilog.error(0x0000, 'testTag', 'Test Node-API napi_create_buffer_copy error'); + this.result = 'napiCreateBufferCopyFail'; + } + } else if (item === '3.napiCreateExternalBuffer') { // napi_create_external_buffer try { hilog.info(0x0000, 'testTag', 'Test Node-API napi_create_external_buffer: %{public}s', @@ -70,7 +80,7 @@ struct Index { hilog.error(0x0000, 'testTag', 'Test Node-API napi_create_external_buffer error'); this.result = 'napiCreateExternalBufferFail'; } - } else if (item === '3.napiGetBufferInfo') { + } else if (item === '4.napiGetBufferInfo') { // napi_get_buffer_info try { hilog.info(0x0000, 'testTag', 'Test Node-API napi_get_buffer_info: %{public}s', @@ -80,7 +90,7 @@ struct Index { hilog.error(0x0000, 'testTag', 'Test Node-API napi_get_buffer_info error'); this.result = 'napiGetBufferInfoFail'; } - } else if (item === '4.napiIsBuffer') { + } else if (item === '5.napiIsBuffer') { // napi_is_buffer try { hilog.info(0x0000, 'testTag', 'Test Node-API napi_is_buffer: %{public}s', @@ -90,7 +100,7 @@ struct Index { hilog.info(0x0000, 'testTag', 'Test Node-API napi_is_buffer error'); this.result = 'napiIsBufferFail'; } - } else if (item === '5.napiCreateExternalArraybuffer') { + } else if (item === '6.napiCreateExternalArraybuffer') { // napi_create_external_arraybuffer hilog.info(0x0000, 'testTag', 'Node-API createExternalArraybuffer: %{public}s', JSON.stringify(testNapi.createExternalArraybuffer())); diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/ohosTest/ets/test/NodeAPIBuffer.test.ets b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/ohosTest/ets/test/NodeAPIBuffer.test.ets index 3d5f29f2bee7c4019528577f80747f75b6a67a69..e25baf1c960bd495730daf6f12893e54858f9777 100755 --- a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/ohosTest/ets/test/NodeAPIBuffer.test.ets +++ b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/entry/src/ohosTest/ets/test/NodeAPIBuffer.test.ets @@ -58,67 +58,83 @@ export default function nodeAPIBufferTest() { }) /** - * 点击按钮，调用napiCreateExternalBuffer相关函数 + * 点击按钮，调用napiCreateBufferCopy相关函数 */ it('testNodeAPIBuffer002', 0, async (done: Function) => { console.info('uitest: testNodeAPIBuffer002 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('2.napiCreateExternalBuffer')); + const text = await driver.findComponent(ON.text('2.napiCreateBufferCopy')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateExternalBufferSuccess')); + await driver.assertComponentExist(ON.text('Result: napiCreateBufferCopySuccess')); console.info('uitest: testNodeAPIBuffer002 end'); done(); }) /** - * 点击按钮，调用napiGetBufferInfo相关函数 + * 点击按钮，调用napiCreateExternalBuffer相关函数 */ it('testNodeAPIBuffer003', 0, async (done: Function) => { console.info('uitest: testNodeAPIBuffer003 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('3.napiGetBufferInfo')); + const text = await driver.findComponent(ON.text('3.napiCreateExternalBuffer')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiGetBufferInfoSuccess')); + await driver.assertComponentExist(ON.text('Result: napiCreateExternalBufferSuccess')); console.info('uitest: testNodeAPIBuffer003 end'); done(); }) /** - * 点击按钮，调用napiIsBuffer相关函数 + * 点击按钮，调用napiGetBufferInfo相关函数 */ it('testNodeAPIBuffer004', 0, async (done: Function) => { console.info('uitest: testNodeAPIBuffer004 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('4.napiIsBuffer')); + const text = await driver.findComponent(ON.text('4.napiGetBufferInfo')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiIsBufferSuccess')); + await driver.assertComponentExist(ON.text('Result: napiGetBufferInfoSuccess')); console.info('uitest: testNodeAPIBuffer004 end'); done(); }) /** - * 点击按钮，调用napiCreateExternalArraybuffer相关函数 + * 点击按钮，调用napiIsBuffer相关函数 */ it('testNodeAPIBuffer005', 0, async (done: Function) => { console.info('uitest: testNodeAPIBuffer005 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('5.napiCreateExternalArraybuffer')); + const text = await driver.findComponent(ON.text('5.napiIsBuffer')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateExternalArraybufferSuccess')); + await driver.assertComponentExist(ON.text('Result: napiIsBufferSuccess')); console.info('uitest: testNodeAPIBuffer005 end'); done(); }) + + /** + * 点击按钮，调用napiCreateExternalArraybuffer相关函数 + */ + it('testNodeAPIBuffer006', 0, async (done: Function) => { + console.info('uitest: testNodeAPIBuffer006 begin'); + const driver = Driver.create(); + await driver.delayMs(1000); + const text = await driver.findComponent(ON.text('6.napiCreateExternalArraybuffer')); + await driver.delayMs(1000); + await text.click(); + await driver.delayMs(1000); + await driver.assertComponentExist(ON.text('Result: napiCreateExternalArraybufferSuccess')); + console.info('uitest: testNodeAPIBuffer006 end'); + done(); + }) }) } \ No newline at end of file diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer1.png b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer1.png index 51e7ac600c4592512e1c411a1e6d727db59eb395..078d9cadec756c7441d2a532476adc82ffd5ae35 100755 Binary files a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer1.png and b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer1.png differ diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer2.png b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer2.png index f127743b3d15d9b9dc81f1a3455a8584fdef8cd8..f7d7a95aecfc885378884d46e615530f92e93bc1 100755 Binary files a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer2.png and b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIBuffer/screenshots/NodeAPIBuffer2.png differ diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/main/ets/pages/Index.ets index e7fc944a05082ea29a5b4c670a99f2c8b209c7fc..8e0af9761ba8dd5f70fe5a7b148f32445fb45f5c 100755 --- a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/main/ets/pages/Index.ets @@ -85,22 +85,23 @@ struct Index { @State result: string = '' private items: string[] = [ 'Reset Result Message', - '1.napiCreateObjectWithProperties', - '2.napiCreateObjectWithNamedProperties', - '3.napiRunScriptPath', - '4.napiCoerceToNativeBindingObject', - '5.napiAboutSerialize', - '6.napiIsSendable', - '7.napiDefineSendableClass', - '8.napiCreateSendableObjectWithProperties', - '9.napiCreateSendableArray', - '10.napiCreateSendableArrayWithLength', - '11.napiCreateSendableArraybuffer', - '12.napiCreateSendableTypedArray', - '13.napiWrapSendable', - '14.napiWrapSendableWithSize', - '15.napiUnwrapSendable', - '16.napiRemoveWrapSendable' + '1.napiLoadModule', + '2.napiCreateObjectWithProperties', + '3.napiCreateObjectWithNamedProperties', + '4.napiRunScriptPath', + '5.napiCoerceToNativeBindingObject', + '6.napiAboutSerialize', + '7.napiIsSendable', + '8.napiDefineSendableClass', + '9.napiCreateSendableObjectWithProperties', + '10.napiCreateSendableArray', + '11.napiCreateSendableArrayWithLength', + '12.napiCreateSendableArraybuffer', + '13.napiCreateSendableTypedArray', + '14.napiWrapSendable', + '15.napiWrapSendableWithSize', + '16.napiUnwrapSendable', + '17.napiRemoveWrapSendable' ] build() { @@ -123,19 +124,22 @@ struct Index { .onClick(() => { if (item === 'Reset Result Message') { this.result = ''; - } else if (item === '1.napiCreateObjectWithProperties') { + } else if (item === '1.napiLoadModule') { + hilog.info(0x0000, 'testTag', 'Test Node-API 2 + 3 = %{public}d', testNapi.add(2, 3)); + this.result = 'napiLoadModuleSuccess'; + } else if (item === '2.napiCreateObjectWithProperties') { // ArkTS Object相关 napi_create_object_with_properties let value1 = testNapi.createObjectWithProperties('createObject'); hilog.info(0x0000, 'testTag', 'Node-API napi_create_object_with_properties:%{public}s', JSON.stringify(value1)); this.result = 'napiCreateObjectWithPropertiesSuccess'; - } else if (item === '2.napiCreateObjectWithNamedProperties') { + } else if (item === '3.napiCreateObjectWithNamedProperties') { // ArkTS Object相关 napi_create_object_with_named_properties let value2 = testNapi.createObjectWithNameProperties('ls'); hilog.info(0x0000, 'testTag', 'Node-API napi_create_object_with_named_properties:%{public}s', JSON.stringify(value2)); this.result = 'napiCreateObjectWithNamedPropertiesSuccess'; - } else if (item === '3.napiRunScriptPath') { + } else if (item === '4.napiRunScriptPath') { // 运行指定abc文件 napi_run_script_path try { // 在此处执行错误返回false，成功就返回true hilog.info(0x0000, 'testTag', 'Test Node-API napi_run_script_path: %{public}s', @@ -146,64 +150,64 @@ struct Index { error.message); this.result = 'napiRunScriptPathFail'; } - } else if (item === '4.napiCoerceToNativeBindingObject') { + } else if (item === '5.napiCoerceToNativeBindingObject') { // 给ArkTS对象绑定回调和回调所需的参数 napi_coerce_to_native_binding_object test01(); this.result = 'napiCoerceToNativeBindingObjectSuccess'; - } else if (item === '5.napiAboutSerialize') { + } else if (item === '6.napiAboutSerialize') { // 序列化和反序列化 let obj: Obj = { numKey: 500 }; hilog.info(0x0000, 'testTag', ' Node-API aboutSerialize: %{public}d', testNapi.aboutSerialize(obj)); this.result = 'napiAboutSerializeSuccess'; - } else if (item === '6.napiIsSendable') { + } else if (item === '7.napiIsSendable') { // Sendable相关 napi_is_sendable let value = testNapi.isSendable('createObject'); hilog.info(0x0000, 'testTag', 'Node-API napi_is_sendable: %{public}s', JSON.stringify(value)); this.result = 'napiIsSendableSuccess'; - } else if (item === '7.napiDefineSendableClass') { + } else if (item === '8.napiDefineSendableClass') { // Sendable相关 napi_define_sendable_class let value = new testNapi.SendableClass(); hilog.info(0x0000, 'testTag', 'Node-API napi_define_sendable_class: %{public}s', value.str); this.result = 'napiDefineSendableClassSuccess'; - } else if (item === '8.napiCreateSendableObjectWithProperties') { + } else if (item === '9.napiCreateSendableObjectWithProperties') { // Sendable相关 napi_create_sendable_object_with_properties let value = testNapi.getSendableObject(); hilog.info(0x0000, 'testTag', 'Node-API napi_create_sendable_object_with_properties: %{public}s', JSON.stringify(value)); this.result = 'napiCreateSendableObjectWithPropertiesSuccess'; - } else if (item === '9.napiCreateSendableArray') { + } else if (item === '10.napiCreateSendableArray') { // Sendable相关 napi_create_sendable_array let value = testNapi.getSendableArray(); hilog.info(0x0000, 'testTag', 'Node-API napi_create_sendable_array: %{public}s', JSON.stringify(value)); this.result = 'napiCreateSendableArraySuccess'; - } else if (item === '10.napiCreateSendableArrayWithLength') { + } else if (item === '11.napiCreateSendableArrayWithLength') { // Sendable相关 napi_create_sendable_array_with_length let value = testNapi.getSendableArrayWithLength(); hilog.info(0x0000, 'testTag', 'Node-API napi_create_sendable_array_with_length: %{public}s', JSON.stringify(value.length)); this.result = 'napiCreateSendableArrayWithLengthSuccess'; - } else if (item === '11.napiCreateSendableArraybuffer') { + } else if (item === '12.napiCreateSendableArraybuffer') { // Sendable相关 napi_create_sendable_arraybuffer testNapi.getSendableArrayBuffer(); this.result = 'napiCreateSendableArraybufferSuccess'; - } else if (item === '12.napiCreateSendableTypedArray') { + } else if (item === '13.napiCreateSendableTypedArray') { // Sendable相关 napi_create_sendable_typedarray testNapi.getSendableTypedArray(); this.result = 'napiCreateSendableTypedArraySuccess'; - } else if (item === '13.napiWrapSendable') { + } else if (item === '14.napiWrapSendable') { // Sendable相关 napi_wrap_sendable testNapi.wrapSendable(); this.result = 'napiWrapSendableSuccess'; - } else if (item === '14.napiWrapSendableWithSize') { + } else if (item === '15.napiWrapSendableWithSize') { // Sendable相关 napi_wrap_sendable_with_size testNapi.wrapSendableWithSize(); this.result = 'napiWrapSendableWithSizeSuccess'; - } else if (item === '15.napiUnwrapSendable') { + } else if (item === '16.napiUnwrapSendable') { // Sendable相关 napi_unwrap_sendable testNapi.unwrapSendable(); this.result = 'napiUnwrapSendableSuccess'; - } else if (item === '16.napiRemoveWrapSendable') { + } else if (item === '17.napiRemoveWrapSendable') { // Sendable相关 napi_remove_wrap_sendable testNapi.removeWrapSendable(); this.result = 'napiRemoveWrapSendableSuccess'; diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/ohosTest/ets/test/NodeAPIExtendCapabilities.test.ets b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/ohosTest/ets/test/NodeAPIExtendCapabilities.test.ets index b2e49059fa889809842b8f707694349cce0da8b7..77950eed60e49232e683083245fcd38e3014c82f 100755 --- a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/ohosTest/ets/test/NodeAPIExtendCapabilities.test.ets +++ b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/entry/src/ohosTest/ets/test/NodeAPIExtendCapabilities.test.ets @@ -42,261 +42,277 @@ export default function nodeAPIExtendCapabilitiesTest() { }) /** - * 点击，调用napiCreateObjectWithProperties相关函数 + * 点击，调用napiLoadModule相关函数 */ it('testNodeAPIExtendCapabilities001', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities001 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('1.napiCreateObjectWithProperties')); + const text = await driver.findComponent(ON.text('1.napiLoadModule')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateObjectWithPropertiesSuccess')); + await driver.assertComponentExist(ON.text('Result: napiLoadModuleSuccess')); console.info('uitest: testNodeAPIExtendCapabilities001 end'); done(); }) /** - * 点击，调用napiCreateObjectWithNamedProperties相关函数 + * 点击，调用napiCreateObjectWithProperties相关函数 */ it('testNodeAPIExtendCapabilities002', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities002 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('2.napiCreateObjectWithNamedProperties')); + const text = await driver.findComponent(ON.text('2.napiCreateObjectWithProperties')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateObjectWithNamedPropertiesSuccess')); + await driver.assertComponentExist(ON.text('Result: napiCreateObjectWithPropertiesSuccess')); console.info('uitest: testNodeAPIExtendCapabilities002 end'); done(); }) /** - * 点击，调用napiRunScriptPath相关函数 + * 点击，调用napiCreateObjectWithNamedProperties相关函数 */ it('testNodeAPIExtendCapabilities003', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities003 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('3.napiRunScriptPath')); + const text = await driver.findComponent(ON.text('3.napiCreateObjectWithNamedProperties')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiRunScriptPathSuccess')); + await driver.assertComponentExist(ON.text('Result: napiCreateObjectWithNamedPropertiesSuccess')); console.info('uitest: testNodeAPIExtendCapabilities003 end'); done(); }) /** - * 点击，调用napiCoerceToNativeBindingObject相关函数 + * 点击，调用napiRunScriptPath相关函数 */ it('testNodeAPIExtendCapabilities004', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities004 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('4.napiCoerceToNativeBindingObject')); + const text = await driver.findComponent(ON.text('4.napiRunScriptPath')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCoerceToNativeBindingObjectSuccess')); + await driver.assertComponentExist(ON.text('Result: napiRunScriptPathSuccess')); console.info('uitest: testNodeAPIExtendCapabilities004 end'); done(); }) /** - * 点击，调用napiAboutSerialize相关函数 + * 点击，调用napiCoerceToNativeBindingObject相关函数 */ it('testNodeAPIExtendCapabilities005', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities005 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('5.napiAboutSerialize')); + const text = await driver.findComponent(ON.text('5.napiCoerceToNativeBindingObject')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiAboutSerializeSuccess')); + await driver.assertComponentExist(ON.text('Result: napiCoerceToNativeBindingObjectSuccess')); console.info('uitest: testNodeAPIExtendCapabilities005 end'); done(); }) /** - * 点击，调用napiIsSendable相关函数 + * 点击，调用napiAboutSerialize相关函数 */ it('testNodeAPIExtendCapabilities006', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities006 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('6.napiIsSendable')); + const text = await driver.findComponent(ON.text('6.napiAboutSerialize')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiIsSendableSuccess')); + await driver.assertComponentExist(ON.text('Result: napiAboutSerializeSuccess')); console.info('uitest: testNodeAPIExtendCapabilities006 end'); done(); }) /** - * 点击，调用napiDefineSendableClass相关函数 + * 点击，调用napiIsSendable相关函数 */ it('testNodeAPIExtendCapabilities007', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities007 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('7.napiDefineSendableClass')); + const text = await driver.findComponent(ON.text('7.napiIsSendable')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiDefineSendableClassSuccess')); + await driver.assertComponentExist(ON.text('Result: napiIsSendableSuccess')); console.info('uitest: testNodeAPIExtendCapabilities007 end'); done(); }) /** - * 点击，调用napiCreateSendableObjectWithProperties相关函数 + * 点击，调用napiDefineSendableClass相关函数 */ it('testNodeAPIExtendCapabilities008', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities008 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('8.napiCreateSendableObjectWithProperties')); + const text = await driver.findComponent(ON.text('8.napiDefineSendableClass')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateSendableObjectWithPropertiesSuccess')); + await driver.assertComponentExist(ON.text('Result: napiDefineSendableClassSuccess')); console.info('uitest: testNodeAPIExtendCapabilities008 end'); done(); }) /** - * 点击，调用napiCreateSendableArray相关函数 + * 点击，调用napiCreateSendableObjectWithProperties相关函数 */ it('testNodeAPIExtendCapabilities009', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities009 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('9.napiCreateSendableArray')); + const text = await driver.findComponent(ON.text('9.napiCreateSendableObjectWithProperties')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateSendableArraySuccess')); + await driver.assertComponentExist(ON.text('Result: napiCreateSendableObjectWithPropertiesSuccess')); console.info('uitest: testNodeAPIExtendCapabilities009 end'); done(); }) /** - * 点击，调用napiCreateSendableArrayWithLength相关函数 + * 点击，调用napiCreateSendableArray相关函数 */ it('testNodeAPIExtendCapabilities010', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities010 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const list = await driver.findComponent(ON.id('List')) - await list.scrollToBottom(); - const text = await driver.findComponent(ON.text('10.napiCreateSendableArrayWithLength')); + const text = await driver.findComponent(ON.text('10.napiCreateSendableArray')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateSendableArrayWithLengthSuccess')); + await driver.assertComponentExist(ON.text('Result: napiCreateSendableArraySuccess')); console.info('uitest: testNodeAPIExtendCapabilities010 end'); done(); }) /** - * 点击，调用napiCreateSendableArraybuffer相关函数 + * 点击，调用napiCreateSendableArrayWithLength相关函数 */ it('testNodeAPIExtendCapabilities011', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities011 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('11.napiCreateSendableArraybuffer')); + const list = await driver.findComponent(ON.id('List')) + await list.scrollToBottom(); + const text = await driver.findComponent(ON.text('11.napiCreateSendableArrayWithLength')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateSendableArraybufferSuccess')); + await driver.assertComponentExist(ON.text('Result: napiCreateSendableArrayWithLengthSuccess')); console.info('uitest: testNodeAPIExtendCapabilities011 end'); done(); }) /** - * 点击，调用napiCreateSendableTypedArray相关函数 + * 点击，调用napiCreateSendableArraybuffer相关函数 */ it('testNodeAPIExtendCapabilities012', 0, async (done: Function) => { - console.info('uitest: testNodeAPIArray012 begin'); + console.info('uitest: testNodeAPIExtendCapabilities012 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('12.napiCreateSendableTypedArray')); + const text = await driver.findComponent(ON.text('12.napiCreateSendableArraybuffer')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiCreateSendableTypedArraySuccess')); - console.info('uitest: testNodeAPIArray012 end'); + await driver.assertComponentExist(ON.text('Result: napiCreateSendableArraybufferSuccess')); + console.info('uitest: testNodeAPIExtendCapabilities012 end'); done(); }) /** - * 点击，调用napiWrapSendable相关函数 + * 点击，调用napiCreateSendableTypedArray相关函数 */ it('testNodeAPIExtendCapabilities013', 0, async (done: Function) => { - console.info('uitest: testNodeAPIExtendCapabilities013 begin'); + console.info('uitest: testNodeAPIArray013 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('13.napiWrapSendable')); + const text = await driver.findComponent(ON.text('13.napiCreateSendableTypedArray')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiWrapSendableSuccess')); - console.info('uitest: testNodeAPIExtendCapabilities013 end'); + await driver.assertComponentExist(ON.text('Result: napiCreateSendableTypedArraySuccess')); + console.info('uitest: testNodeAPIArray013 end'); done(); }) /** - * 点击，调用napiWrapSendableWithSize相关函数 + * 点击，调用napiWrapSendable相关函数 */ it('testNodeAPIExtendCapabilities014', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities014 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('14.napiWrapSendableWithSize')); + const text = await driver.findComponent(ON.text('14.napiWrapSendable')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiWrapSendableWithSizeSuccess')); + await driver.assertComponentExist(ON.text('Result: napiWrapSendableSuccess')); console.info('uitest: testNodeAPIExtendCapabilities014 end'); done(); }) /** - * 点击，调用napiUnwrapSendable相关函数 + * 点击，调用napiWrapSendableWithSize相关函数 */ it('testNodeAPIExtendCapabilities015', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities015 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('15.napiUnwrapSendable')); + const text = await driver.findComponent(ON.text('15.napiWrapSendableWithSize')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiUnwrapSendableSuccess')); + await driver.assertComponentExist(ON.text('Result: napiWrapSendableWithSizeSuccess')); console.info('uitest: testNodeAPIExtendCapabilities015 end'); done(); }) /** - * 点击，调用napiRemoveWrapSendable相关函数 + * 点击，调用napiUnwrapSendable相关函数 */ it('testNodeAPIExtendCapabilities016', 0, async (done: Function) => { console.info('uitest: testNodeAPIExtendCapabilities016 begin'); const driver = Driver.create(); await driver.delayMs(1000); - const text = await driver.findComponent(ON.text('16.napiRemoveWrapSendable')); + const text = await driver.findComponent(ON.text('16.napiUnwrapSendable')); await driver.delayMs(1000); await text.click(); await driver.delayMs(1000); - await driver.assertComponentExist(ON.text('Result: napiRemoveWrapSendableSuccess')); + await driver.assertComponentExist(ON.text('Result: napiUnwrapSendableSuccess')); console.info('uitest: testNodeAPIExtendCapabilities016 end'); done(); }) + + /** + * 点击，调用napiRemoveWrapSendable相关函数 + */ + it('testNodeAPIExtendCapabilities017', 0, async (done: Function) => { + console.info('uitest: testNodeAPIExtendCapabilities017 begin'); + const driver = Driver.create(); + await driver.delayMs(1000); + const text = await driver.findComponent(ON.text('17.napiRemoveWrapSendable')); + await driver.delayMs(1000); + await text.click(); + await driver.delayMs(1000); + await driver.assertComponentExist(ON.text('Result: napiRemoveWrapSendableSuccess')); + console.info('uitest: testNodeAPIExtendCapabilities017 end'); + done(); + }) }) } \ No newline at end of file diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities1.png b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities1.png index 1d913e2e0de9bd3a361b728cb899707958e462f2..eb5e09ed509b6b98d7196f5b77b82a4b8f5036c7 100755 Binary files a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities1.png and b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities1.png differ diff --git a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities2.png b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities2.png index bb9366eb9a8394539ff052bff9b5c2344d871342..2427744265d3b9c9a0df961e2a815646b9c282cf 100755 Binary files a/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities2.png and b/code/DocsSample/ArkTs/NodeAPI/NodeApiUse/NodeAPIExtendCapabilities/screenshots/NodeAPIExtendCapabilities2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/Index.ets index 205b01dbc8beedb2077d63dadc7aad34052447fc..f378466840aae49d88c369e3a36dc4dbfc628b4d 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) - utton($r('app.string.key_deletion')) - .width('70%') + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) + Button($r('app.string.key_deletion')) + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/KeyDeletion') }) Button($r('app.string.call_cpp_delete_key')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.deleteKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/KeyDeletion.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/KeyDeletion.ets index 3b1e901ad5c38057219e62a6beaf93d2b4d1a015..c1cf436a8d997d824d72756758d010ea48b57086 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/KeyDeletion.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/entry/src/main/ets/pages/KeyDeletion.ets @@ -146,9 +146,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_key_deletion')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { let ret = await testDerive(); this.message = 'KeyDeletion Result: ' + ret; diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_1.png index 16e54d89d9d2549ebd3b0f51bacaf721e3108eff..ed5cfeb2c5d199ea2d00d25bc9ba5e674e271b14 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_2.png index 24a345157dd59e396da3db5786b36b9198b8c017..7d7524d80efa657d41a5d15bf82bbde2f5bfd1e6 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletionCpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_1.png index 61c344f006ec73c883af071eea106f4e54e21134..338157108702c6c6920a4bbba9b39a71786fccd3 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_2.png index 16d9301f168ca9d0f8b58aaf8e77b72c10388501..56abc90490ba44a49476e3c8dbecbc6952d7ada7 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyDeletion/screenshots/KeyDeletion_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/entry/src/main/ets/pages/Index.ets index 151a4f0aea117d542cde7133d1f68f6d562081aa..31f5a8fd31166f8400dcdb2536ab7268ff71c3e6 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/entry/src/main/ets/pages/Index.ets @@ -86,16 +86,30 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_cpp')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.generateKey(); this.message = 'C/C++ Call Result: ' + ret.toString(); }) Button($r('app.string.call_arkts')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { let ret = await testGenKey(); this.message = 'ArkTS Call Result: ' + ret; diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_1.png index ebf2fff466956807e0dfdb33b9a8d6085002d478..504a5c10f6a9402a1b25348c5021d3a830c4dcc9 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_2.png index 4e59387a46803748114487b126874b5f02a1933d..d37a9524bc0b474eb583a0dd085e1d7080370bae 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/ArkTS_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_1.png index ebf2fff466956807e0dfdb33b9a8d6085002d478..504a5c10f6a9402a1b25348c5021d3a830c4dcc9 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_2.png index 5d3e091010ae078e3af728e345fdff2f3fbedd77..3fbc46b8d142e5de7e56f044eeb845e2d70ce08c 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyGeneration/DevelopmentGuidelines/GenerateKey/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/entry/src/main/ets/pages/Index.ets index bf486dcab70cf60b236e064ac90c861d42a4931a..8273f6d9f2c139c8df53c0b1a89e715eda5e7dae 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/entry/src/main/ets/pages/Index.ets @@ -24,10 +24,19 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_arkts')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await ImportWrappedKey(); @@ -38,7 +47,12 @@ struct Index { } }) Button($r('app.string.call_cpp')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.importWrappedKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); @@ -47,4 +61,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_1.png index f3e0e9845d214b268bf63dd722a43de79fb26074..bf654c1fc053f18e6e1fa5f271fb802d9f42491c 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_2.png index 58a6045c67d367e4a216603c92d154683310ca51..fe05bccea064ef4594bbbb2a759ee09b344c92fd 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKeyCpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_1.png index f3e0e9845d214b268bf63dd722a43de79fb26074..bf654c1fc053f18e6e1fa5f271fb802d9f42491c 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_2.png index c5a9bc2eda9aba028a4b55e96f74c63050df1311..e60de243a18e4c8bd2876f853b116f858dc0b8b8 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportEncryptedKey/screenshots/ImportEncryptedKey_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/AES256.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/AES256.ets index 102ea7fc10dfd9e85145f50f5daa8fa90319c62e..9812e5e9091e2f9c331737e59680e856a65b6b4b 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/AES256.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/AES256.ets @@ -109,10 +109,19 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_aes_256')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { try { importAES256(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/Index.ets index f36dd29a96ac01b6fe60e623f2f73a41d7714063..e8b9b829ef91210efede2faa03081450b0ed23c1 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/Index.ets @@ -36,25 +36,49 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.aes_256')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/AES256'); }) Button($r('app.string.rsa_2048')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/RSA2048'); }) Button($r('app.string.x25519')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/X25519'); }) Button($r('app.string.call_cpp_import_key')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.importKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/RSA2048.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/RSA2048.ets index 4dbab0e6b26338d1d3d43f2863144825ebeee406..17ba4592ca1c73cac97c28f64e7c98c1aed3a03d 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/RSA2048.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/RSA2048.ets @@ -158,10 +158,19 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_rsa_2048')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { try { importRSA2048(); @@ -175,4 +184,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/X25519.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/X25519.ets index dbe06c0d07706a2344f23e0ebb8da1882d948b59..69abc5a7d26b3b0db12b565398a08facaae26ed7 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/X25519.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/entry/src/main/ets/pages/X25519.ets @@ -120,10 +120,19 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_x25519')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { try { importX25519(); @@ -137,4 +146,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_1.png index 7259ba6b2f62379dbe72fd884d6686b0d1c6ddfa..282e89ee89255c5d8f2133f102cec0fa9aaf0af9 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_2.png index 8da0476687ea135c1f9960474ff72b409ff22d27..c94a17bebadccb55edf8fe3c93af8bca0b2bed3d 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/AES256_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_1.png index 405dd07f8f5efe704976b45b875c02b57a7293df..37c4ff2f782869fca305eaa18bdadf98e4afea59 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_2.png index c4553a3b78f6e58095bf56f3df68cde29014c447..d8cd073ccdfa9c00372d49fca3b796a9641667f1 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_1.png index 3668719463bd9f66064af524b889a64b8e5771a1..4f0687b1167cdfb9ca72ee8794bd49138f257170 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_2.png index ff983d2decad579a7e3826b341e68b23e956820f..dfad5e1ef8e1eecbf8795ca5c124353a43d86d1f 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/RSA2048_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_1.png index e4f838af29e00a28d411fdf057754ccb913bf266..b9dcee267bdda62a17806eab8739e7c96d7a771f 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_2.png index 6825e47fd4bdb1a0e427fc3addb1fe3ebf4f6630..9e1bd879c518b65a62b35e6c3e7d3348ce07ed2c 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyGenerationImport/KeyImport/DevelopmentGuidelines/ImportKeyPlainText/screenshots/X25519_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/AnonymousKeyProof.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/AnonymousKeyProof.ets index 0606c7679fc8bd3417a39928d7a8125ac802da34..b72cdb9c30f7e8d120ade7617c0978e4256ee1ce 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/AnonymousKeyProof.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/AnonymousKeyProof.ets @@ -192,9 +192,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_anonymous_key_proof')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { let ret = await anonAttestKeyTest(); this.message = 'AnonymousKeyProof Result: ' + ret; diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/Index.ets index d909d2137798acd65b2209f3af0cc17c9e477d7c..70437411aeef4984b956870d262b0f7be5520419 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.anonymous_key_proof')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/AnonymousKeyProof') }) Button($r('app.string.call_cpp_anon_attest_key')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.anonAttestKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_1.png index 5fddaccd8e6f2268f91021afc6370214c037984c..e782125081697ff08d270b31736b742e3f76b3e6 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_2.png index e57ee5160e4e8bbdf5eaefa2e806fbd5169b70bf..38485363de00ef59082a6886a5d366045d48c0f7 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/AnonymousKeyProof_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_1.png index 795410506699a7bb64446c479eb3c4ae47dadb34..25341232498a60fce3c9d3fbdbf4341c2efa2c6b 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_2.png index 1053c08f8b507d3a4778b38083637d5dd46233e7..d1b0c6af51b40d2fea489f1e63d3a3eca9e73062 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/AnonymousKeyProof/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/Index.ets index d349591ed27fc31f77e8dbcb718008f1362aa1fe..0cbd9cc8dee35874e15f0357f8ceba6807d6a44c 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.non_anonymous_key_proof')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/NonAnonymousKeyProof') }) Button($r('app.string.call_cpp_attest_key')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.attestKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/NonAnonymousKeyProof.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/NonAnonymousKeyProof.ets index 8a015d29396851641d1bc46250fa185c64134143..270c401018d80fc74cff019954dfce43b67bbac9 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/NonAnonymousKeyProof.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/entry/src/main/ets/pages/NonAnonymousKeyProof.ets @@ -192,9 +192,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_non_anonymous_key_proof')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { let ret = await attestKeyTest(); this.message = 'NonAnonymousKeyProof Result: ' + ret; diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_1.png index 62c0a614dddf3e08406491aeec8e14b269d29d26..136eafeb0e95ebf65e7c78e7f705fb7fd97dc885 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_2.png index 4cfeb617f8e78bd4f27c8f410f95637e8fecace1..5e694a72bc6de17f4fdb72de5c00233c34afd80e 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_1.png index 8fd711407723aadcca7614c5a2aba6fb50f569cf..2556fd94144b1c790d1a7541dbbb983231ea0769 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_2.png index 7e9473c39d4ffdec5c8eba80ddc7558074f03b6d..91f50aaf8599f18eb2601aee13294ab44a1da911 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyProving/DevelopmentGuidelines/NonanonymousKeyProof/screenshots/NonAnonymousKeyProof_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/FineGrainedUserIdentityAuthentication.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/FineGrainedUserIdentityAuthentication.ets index fd11a342da9906e593940076f3511ccc9f259b61..3dd91e3bdb6f71d1219fffbd51cf409a0dbf62e1 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/FineGrainedUserIdentityAuthentication.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/FineGrainedUserIdentityAuthentication.ets @@ -414,9 +414,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.fine_grained_user_identity_authentication_call')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await main(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/Index.ets index e69bfa50d3439baf9df4d3f6885aa926fd985509..1031014e5a1035961792727e6a4d83378421b3c6 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/Index.ets @@ -35,15 +35,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button('UserIdentityAuthentication') - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/UserIdentityAuthentication'); }) Button('FineGrainedUserIdentityAuthentication') - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/FineGrainedUserIdentityAuthentication'); }) @@ -51,4 +65,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/UserIdentityAuthentication.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/UserIdentityAuthentication.ets index 6fe505c946625a2b2374e417a89e8d06d3abeb80..5f6e680cec59890e1fcebaaa87adb8973d2f1e48 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/UserIdentityAuthentication.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/entry/src/main/ets/pages/UserIdentityAuthentication.ets @@ -387,9 +387,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message).fontSize(20) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.user_identity_authentication')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await main(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_1.png index 6364d2218b20ec393232206b654dc0fceb8a1486..9d4191509b5ebb1f3a3608d9e5dc9743686029c3 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_2.png index a872b736cb9c8b2b2b6c3a4f05681af9a7a776d4..ef7b57701e0bcc3d9349fe37ffe6289b3607d2b4 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/FineGrainedUserIdentityAuthentication_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_1.png index 67427edc1d83f8a0c75b999ed088358ead93ae8a..dc49a06c134a735065183555d2e42a1198de6968 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_2.png index 4dcfb25ff99a65e91a7bd1a01aa106fdc7d18c23..822396a2128a8f3e682ecb7e75785840946fe3d7 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/AccessControl/screenshots/UserIdentityAuthentication_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESCBCPKCS7.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESCBCPKCS7.ets index 0fdb70c3dc0b9c3025f1c6e1b1588ed95fe1db41..9968ef06e529bafd5b0b3f0934073703afaf2779 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESCBCPKCS7.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESCBCPKCS7.ets @@ -229,9 +229,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.aes_cbc_pkcs7')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await generateAesKey(); @@ -247,4 +258,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESGCMNoPadding.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESGCMNoPadding.ets index 705739526683a09b84517e5298503f799bde767c..a647e4d395734453fbce6390a2bc3c94af55af0d 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESGCMNoPadding.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/AESGCMNoPadding.ets @@ -240,9 +240,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.aes_gcm_nopadding')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await generateAesKey(); @@ -258,4 +269,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/Index.ets index 18fa0389c3d951ef2692caea28fe74a7e0b48a3d..2e5bd370f9eecd91383bb908ad784f1bf9da3795 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.enc_aes_cbc_pkcs7')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/AESCBCPKCS7') }) Button($r('app.string.enc_aes_gcm_nopadding')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/AESGCMNoPadding') }) @@ -54,17 +68,32 @@ struct Index { this.goToSample('pages/RSAECBPKCS1_V1_5') }) Button($r('app.string.enc_rsa_ecb_oaep_sha256')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/RSAECBOAEPSHA256') }) Button($r('app.string.enc_sm2')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/SM2') }) Button($r('app.string.call_cpp_enc_dec')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.encDecKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBOAEPSHA256.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBOAEPSHA256.ets index 60246341b6fe06358f85440a870ae0452304101a..e49377bebe7905415d7c9a0f069781fc12f618e2 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBOAEPSHA256.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBOAEPSHA256.ets @@ -228,9 +228,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message).fontSize(20) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.rsa_ecb_oaep_sha256')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await generateRsaKey(); @@ -246,4 +257,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBPKCS1_V1_5.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBPKCS1_V1_5.ets index 9fc4112f8185acdcab3a0def97e41c580569bf4a..8698f707e324d45a72cc6a2ce5ee0226833bdabd 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBPKCS1_V1_5.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/RSAECBPKCS1_V1_5.ets @@ -228,9 +228,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.rsa_ecb_pkcs1_v1_5')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await generateRsaKey(); @@ -246,4 +257,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/SM2.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/SM2.ets index 15d27ba5a7ad410c5b5661476cea0ec66845bf77..7c640aafa5281a46535797697a41230afb40081e 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/SM2.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/entry/src/main/ets/pages/SM2.ets @@ -216,9 +216,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.sm2')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await generateSm2Key(); @@ -234,4 +245,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_1.png index 0bf8a4afacd8ef87b2fe353153ad8970dc88a205..246c5b8f16be0e6d97dfee2d384f24e3143bd5be 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_2.png index 2e17c283be361fbaaf2b06a84791c139d09281c3..3640f34e6f4373080601b02ba3eb2dc35866d4be 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESCBCPKCS7_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_1.png index 7b88041653ff191140c8974d9405c9b2e56c331f..152f860d96646936ca22ebaf4d4f9986278f2336 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_2.png index 34b035fa32410902609e1d62840cbf7344f35b68..d3f6a60adef2dd3caafd319ffebdec6659727f27 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/AESGCMNoPadding_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_1.png index b4bf52b88b30e4a00b1640d72df644f58f02bd71..19b0ad040ca40700788b4447ff3e981932ca31f6 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_2.png index f7892684b42f81f2bee4a7601c370866973cb65e..638ef2fe573d2e0ccd63dba647f6bfc9431c5784 100644 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_1.png index 5e6765b795364110cdfd6a3e0cf509e8c5de1897..a68b26374dc631b6bab85fd6a823a1994d334b91 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_2.png index 555bf987a7094774cfe9fe8b68cbf19efd11283c..845c38cba5fbb00a26576a156714491e14c605de 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBOAEPSHA256_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_1.png index a0d7b2b1dbdfd0e1b4680baec4808eb1ec2decc4..caebc665383bf9dc1c235481776738d9d92440e3 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_2.png index fd6d0185574a5cf40f015523535b5bbd52d397f8..c943250700a8ca4541272d00ad60d548c8f408dd 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/RSAECBPKCS1_V1_5_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_1.png index 23dd8c0bba5c13c1a06bba4b1974d8dabfe6c3c6..cdfbfb8501ccb925d34c0ccf19bfc7a6986ea202 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_2.png index 9bc92dee159756a364cc82b8c1effb826b0af9c4..365f3085a7e53b22fc2368af8f4633914d2d4ffe 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/EncryptionDecryption/screenshots/SM2_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/HMAC.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/HMAC.ets index 008110853630011bf40479d0d0e9c9eb220ccce2..970ed831fe0c305c05c97ceb5ba04255c5722d02 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/HMAC.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/HMAC.ets @@ -126,9 +126,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_hmac')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await generateHMACKey(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/Index.ets index 2ac2507616cdf145aba367b4579457e0f3c387f4..36b06d1c45c12901d73601a6e8eb1ab926c46116 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.hmac')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/HMAC') }) Button($r('app.string.call_cpp_hmac_key')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.hmacKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_1.png index 22e941f6c63ac850d2d4776d314df9ee3d4d3e68..b99219740bd854a79df551a579ef4158131439a1 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_2.png index 43a1d7c284149d8fe0cec965caef95254bcdf7ec..dc35b3f4d45c7b607dc0c6909ad1b172d37846a6 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/HMAC_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_1.png index 5b059d38c8e2ac076a2c3f4760e108d4de02e24b..02946ae8e5a6994f7b7aef32b4604e96b8eac905 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_2.png index 8459f6a547a40fe50f2011c011efc1c707ed6478..d969cfd0c3f0cc56a028e56d31243cb30bb0a47c 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/HMAC/screenshots/cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/HKDF.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/HKDF.ets index fd32c05a19abd72dc2a74dd7129a096777825f51..ee0e1307022884ce96cdf26e5fcaa7ad57d542e9 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/HKDF.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/HKDF.ets @@ -331,9 +331,21 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message).fontSize(20) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_hkdf')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { let ret = await testDerive(); @@ -346,4 +358,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/Index.ets index 3fab97d7bee7622a40562ccb4c90673276ede1b6..8d6b22f88038b6f84d02144a89a7e2c5221b9714 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/Index.ets @@ -36,20 +36,40 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.hkdf')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/HKDF') }) Button($r('app.string.pbkdf2')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/PBKDF2') }) Button($r('app.string.call_cpp_derive_key')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.deriveKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/PBKDF2.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/PBKDF2.ets index a9c362d52ce3930586507d9133c565869962b02c..612e9df2da61085eea94d617be95dc34b2e9ad81 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/PBKDF2.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/entry/src/main/ets/pages/PBKDF2.ets @@ -344,9 +344,21 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_pbkdf2')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { let ret = await testDerive(); @@ -359,4 +371,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_1.png index b2f019acdebcc1ffd196864bb6fb4d8bd11abea7..9ccc75e166ce2184f5011af72756742cc717fedb 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_2.png index f982697ae0bab15c32de1567f9dd03484d1be94e..43762154b7c03d9b58e3a27fee239c6528b1a64a 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_1.png index a8c7d929892bc2a561f5772ce1a807ede4b6179f..bc576a1f42c5d57394fb85302a7547bd23b6325f 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_2.png index f93d252259ec1cb7f6d8665c551f7523542609d4..2e3d529959c83d5c637e484e2ff02ac7fbdce30a 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/HKDF_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_1.png index 4817d9fe161ce2dc01d3f9e3c19289f4d4cc053c..5ca73e0caf7fbd6f9bc78f01c2fc525ce455fead 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_2.png index e48ebcd074223c91c67c0ff284c965b487365603..700c836fcdbdfb0162ff3eb7c8180e6d0156a050 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyDerivation/screenshots/PBKDF2_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/DH.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/DH.ets index aff1cf873680b49688e241df75f20b090d115bcf..b49db22859465f34fb7ddf3704fe26cd83e6c0f6 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/DH.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/DH.ets @@ -173,9 +173,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.dh')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await huksDhAgreeTest(); @@ -188,4 +199,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/Index.ets index 88b59c2fdfeacff509d238cdc6819f43f2b642ab..17720b2705a2b128e74cf93163d332b53397d125 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/Index.ets @@ -36,20 +36,39 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.x25519')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/X25519') }) Button($r('app.string.dh')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/DH') }) Button($r('app.string.call_cpp_agree_key')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.agreeKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/X25519.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/X25519.ets index ebcb43efe686dad9784f19f3aeb4f352ab4b71d2..2f6dbbf75f2f47e093a8414649001e073e5f9f1b 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/X25519.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/entry/src/main/ets/pages/X25519.ets @@ -396,9 +396,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.x25519')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await testAgree(); @@ -411,4 +422,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_1.png index de1225dc7779e4322f4b14523715dddac2aebe18..18f8f0cc77d5cc0e0f5fa848226bcac77e39ff5f 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_2.png index e048c90f89fb3b8b771aef25d8db046470166f52..bff5e66377234c8880df85f9d64a55ba32d5feb7 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_1.png index 1ecefe8589ec9d9321e175bec32fa96b1bf1a0ae..e174cf5a8059ce1938dc15fc19ba971ae64185d3 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_2.png index 7603fc0c346ff085cbad6174ee43ccbc5072bbdd..f59179b24fe4b9a2e4d13d3f0f6dcf92432c84d5 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/DH_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_1.png index b413b2c156670ef69cd11667d8a3fcd70cecb1c7..c4f5cbe9ed1d40788be87cfeef2e93e0caa2a214 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_2.png index 58ce686b4d364e84d512a8300b00a492d382f25e..e48b3038e1eb853df8ba8c8cfec17387f8e8222f 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/KeyExchange/screenshots/X25519_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/ECC256SHA256.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/ECC256SHA256.ets index c7bba6d98bf98f265a0aabdc1a01f8e9d3cc2034..f1b7d92746b331551a034d2e5c7ec92ab311cca4 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/ECC256SHA256.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/ECC256SHA256.ets @@ -185,9 +185,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.ecc256_sha256')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await testSignVerify(); @@ -200,4 +211,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/Index.ets index da3be4a7cd4924cea8ca2b1e16b68b8c0f3fceaa..c40cc02187cfb1cfa39390941a0fe8cabc70c7f6 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/Index.ets @@ -36,30 +36,59 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.ecc256_sha256')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/ECC256SHA256'); }) Button($r('app.string.sm2_sm3')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/SM2SM3'); }) Button($r('app.string.rsa_sha256_pss')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/RSASHA256PSS'); }) Button($r('app.string.rsa_sha256_pkcs1_v1_5')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/RSASHA256PKCS1_V1_5'); }) Button($r('app.string.call_cpp_sign_verify')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.signVerifyKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PKCS1_V1_5.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PKCS1_V1_5.ets index 13f18ef5fb81ec119d0721ae246d2df25016fa8e..3442edc3c7af4f18997a63ec324ea81abb46a7f7 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PKCS1_V1_5.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PKCS1_V1_5.ets @@ -187,9 +187,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.rsa_sha256_pkcs1_v1_5')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await testSignVerify(); @@ -202,4 +213,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PSS.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PSS.ets index cd290205009aae944037b586f124b2d7cc2a7556..ddd3b0c8f4069bb82313ebfc37190d2dd693e2a8 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PSS.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/RSASHA256PSS.ets @@ -195,9 +195,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.rsa_sha256_pss')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { await testSignVerify(); @@ -210,4 +221,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/SM2SM3.ets b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/SM2SM3.ets index 415d22547487dfcc803f670fc62fce7a24403b38..7309cd0b0dd4e0a16a0f364e7ebe22b5a9a21058 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/SM2SM3.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/entry/src/main/ets/pages/SM2SM3.ets @@ -188,9 +188,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.sm2_sm3')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(async () => { try { let ret = await testSignVerify(); @@ -203,4 +214,4 @@ struct Index { .height('100%') .width('100%') } -} \ No newline at end of file +} diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2561.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2561.png index a30ad5433e4934fd6cc5761b9923a8a3849c05aa..252dbabaa0cb3c28cc324f48b0d882db1e031452 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2561.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2561.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2562.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2562.png index 0165cedd251392abcc69d54c2ff5f8969287a196..400b4266c04b9dc66de5d8db110c2026ce4b0642 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2562.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/ECC2562.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA1.png index 98e3c301babdab31bc234cc8371e5f0b9d645858..787f3e9a5e28f212e6cc5d7e6a984a6b1c19eadb 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA2.png index 8a7a76516725220f106a09c0a4c8f6c4abefd2b1..ca98a807da703b0a1b707a953c12859b994c762a 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/RSA2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2561.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2561.png index 4c8995614635b20f8a2101d0ac36017309665196..dcf0dcb073906586c4f7bd508eb0288a5e975efa 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2561.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2561.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2562.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2562.png index 6da677635a478569d7c28180b5b2c82aca10e4fb..37bb6090b538c66a63b9482691c01f11f2b1041f 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2562.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SHA2562.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM21.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM21.png index 5693aaef89c66776a38d2e2c4eadd81b3706d5c7..3f0c0d889707a562d93adc10e9c01c888363d54a 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM21.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM21.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM22.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM22.png index 9f0007a70cd2da5f8d321902a4798746b0f7148a..f3a57749b3f76a70532e572423e2114bbf9c519a 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM22.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/SM22.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp1.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp1.png index 4e7ccf89cc26f45ae3d6dcdd507f8b6310a58e85..0740f3ea8c9ba409ac2e42fce0b811ffd4c95022 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp1.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp2.png b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp2.png index 7060efbdd9d7c0bd8788c5fa9a64e1924be07099..be6dff82a487ad3f8c29cb546897442dba166921 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp2.png and b/code/DocsSample/Security/UniversalKeystoreKit/KeyUsage/SigningVerification/screenshots/cpp2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/CheckKeyExists.ets b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/CheckKeyExists.ets index c6f3fa1e54b4bbcbeb3fc53db24becab755ec237..67c2c4ee6e1a7ba9fe1e653c5cc887586311ba6b 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/CheckKeyExists.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/CheckKeyExists.ets @@ -112,9 +112,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_check_key_exists')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: string = check(); this.message = 'CheckKeyExists Result: ' + ret; diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/Index.ets index a5fd69ed9a033a46698ddc96194bef158e9b0e8b..6e524d528afc975b09969cbe88bcb5b41d684ca3 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.check_key_exists')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/CheckKeyExists') }) Button($r('app.string.call_cpp_is_key_exist')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.isKeyExist(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_1.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_1.png index dc1c0b9be9af6da40fc81e110f04e04201d1054c..34e8c2d7ac640bcf34e1ec983f2984517a0f4b77 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_2.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_2.png index 47d01d25175ba7c8eda88cf4da527226dc760d4d..f7cc0f331f6a0724fa0760d0ab53f8d04fed8c4b 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/CheckKeyExists_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_1.png index 28fc418c946667c09255a18609335a79866dd5cb..375b22fd7003d32387329c3da68543981257f8ab 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_2.png index f036124806ed45b53d352d7e48bc4fef5a3b7636..ea4b76851435ad9fb844015189dbfa467cba27fe 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/CheckKeyExists/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/GetKeyAttributes.ets b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/GetKeyAttributes.ets index b23da586c00265006456515874169c803959f38a..02e663fae3ec77eb15cddcc5bae600f547c673f0 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/GetKeyAttributes.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/GetKeyAttributes.ets @@ -107,9 +107,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_get_key_attributes')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: string = check(); this.message = 'GetKeyAttributes Result: ' + ret; diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/Index.ets index d454122737bcaa142ae8348b767ca1708bd19bf4..fe57f81511be5359de65d970dd1135f0f5b7abfc 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.get_key_attributes')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/GetKeyAttributes') }) Button($r('app.string.call_cpp_get_key_param_set')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.getKeyParamSet(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_1.png index ee7cf6bc14d7c8cfefa0fd514a47dcd3d3a602b2..5f33ade88f931531a26f89b188588912d642cd19 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_2.png index e02a1d91d68f2a1d5535dbe986257b1fc92cdeee..cda8123becbbe45d6a13c3ee665c088af2c03998 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_1.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_1.png index f3895fee3a0c7f7d475cb93f63284778acf54dc9..8556975ee86b61fab6386e8505c728295fc731e7 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_2.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_2.png index b1190b4d28dfbf0389edf418c877f8293cf1a0aa..e3e70e9f2723c789f6baaec1d885294a4936fd42 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/GetKeyAttributes/screenshots/GetKeyAttributes_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/Index.ets b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/Index.ets index d10edfea46d172c589150df8e52ed94926056126..32c92c03c603dc81a57adf5022e1f09377d5fb89 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/Index.ets @@ -36,15 +36,29 @@ struct Index { build() { Column({ space: 5 }) { Text(this.message) - .fontSize(25) - .fontWeight(FontWeight.Bold) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button('KeyExport') - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { this.goToSample('pages/KeyExport'); }) Button('Call C/C++') - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: number = testNapi.exportKey(); this.message = 'Call C/C++ Result: ' + ret.toString(); diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/KeyExport.ets b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/KeyExport.ets index 15d80d00cfd78f92016c85aac788ff9c9feabafe..49ec656ef2149050a147db27c7afc9ca4f95b0a8 100755 --- a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/KeyExport.ets +++ b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/entry/src/main/ets/pages/KeyExport.ets @@ -107,9 +107,20 @@ struct Index { build() { Column({ space: 12 }) { - Text(this.message).fontSize(20).fontWeight(FontWeight.Bold) + Text(this.message) + .fontWeight(FontWeight.Regular) + .fontFamily('HarmonyOS Sans') + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .maxLines(Infinity) + .textAlign(TextAlign.Start) Button($r('app.string.call_keyExport')) - .width('70%') + .padding('12vp') + .height('40vp') + .borderRadius($r('sys.float.ohos_id_corner_radius_button')) + .backgroundColor($r('sys.color.ohos_id_color_emphasize')) + .fontSize('14sp') + .fontColor('#ffffff') .onClick(() => { let ret: string = check(); this.message = 'KeyExport Result: ' + ret; diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_1.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_1.png index 46eb269b6ea5804c189b69ea6e2bd4b3ef8a787c..f66b80458aa1f2031b6e9a805029061bf836c975 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_2.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_2.png index 3b94d27ef51554f759ebd8be0fc3881eff293599..6108f98ba61625f95b547708e2a44035450e24f5 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/Cpp_2.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_1.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_1.png index 64adb68cc032214ffca6fb5c09f9f4224e99c155..947d7bd61508771cceb07cd75335c3efed33f552 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_1.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_1.png differ diff --git a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_2.png b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_2.png index c50c89da7db53d4ac46059c337f87f96f1c7bac7..2cd5c6a999664dc42c2fbf1ddeb057af9b9090a0 100755 Binary files a/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_2.png and b/code/DocsSample/Security/UniversalKeystoreKit/OtherOperations/KeyExport/screenshots/KeyExport_2.png differ