diff --git a/Data/StringCipherETS/README.md b/Data/StringCipherETS/README.md index 8924614896da93c24d6bc614e89e1f575fdfc2b2..42f6d402f5d156e8c0f36328aed8609eab4ba562 100644 --- a/Data/StringCipherETS/README.md +++ b/Data/StringCipherETS/README.md @@ -278,7 +278,7 @@ ivOffset: 0, ivLen: 16, success: function(data) { - that.decryptPassword = data.data.text; + that.decryptPassword = data.text; that.login(); }, fail: function (data, code) { @@ -486,7 +486,7 @@ ivOffset: 0, ivLen: 16, success: function(data) { - that.encryptPassword = data.data.text; + that.encryptPassword = data.text; that.insertUser(); }, fail: function (data, code) { diff --git a/Data/StringCipherETS/entry/build-profile.json5 b/Data/StringCipherETS/entry/build-profile.json5 index f8f03407f77914b43168aeca6bb0929efd6700b4..befa10141dfc5999e35f60a36a9f948e664732b1 100644 --- a/Data/StringCipherETS/entry/build-profile.json5 +++ b/Data/StringCipherETS/entry/build-profile.json5 @@ -5,9 +5,6 @@ "targets": [ { "name": "default" - }, - { - "name": "ohosTest", } ] } \ No newline at end of file diff --git a/Data/StringCipherETS/entry/src/main/ets/Model/RdbModel.ts b/Data/StringCipherETS/entry/src/main/ets/Model/RdbModel.ts index 4fa08983af88cf835641e649a20f1cd4977616fa..9da9c5ca3e23a74b56bb631e38acbcefaf8de314 100644 --- a/Data/StringCipherETS/entry/src/main/ets/Model/RdbModel.ts +++ b/Data/StringCipherETS/entry/src/main/ets/Model/RdbModel.ts @@ -14,7 +14,7 @@ */ import dataRdb from '@ohos.data.rdb' -import prompt from '@system.prompt' +import prompt from '@ohos.prompt' export class RdbModel { private rdbStore: any = null diff --git a/Data/StringCipherETS/entry/src/main/ets/pages/index.ets b/Data/StringCipherETS/entry/src/main/ets/pages/index.ets index 2eafceddc5b01b2462fd0e428820f848204840e4..be5cbb5b858582335811fcbd61495170277ddb2d 100644 --- a/Data/StringCipherETS/entry/src/main/ets/pages/index.ets +++ b/Data/StringCipherETS/entry/src/main/ets/pages/index.ets @@ -14,8 +14,8 @@ */ // @ts-nocheck -import prompt from '@system.prompt'; -import router from '@system.router'; +import prompt from '@ohos.prompt'; +import router from '@ohos.router'; import cipher from '@system.cipher'; import { User } from '../model/User'; import { InputItem } from '../pages/inputItem' @@ -166,7 +166,7 @@ struct Index { ivOffset: 0, ivLen: 16, success: function(data) { - that.decryptPassword = data.data.text; + that.decryptPassword = data.text; that.login(); }, fail: function (data, code) { diff --git a/Data/StringCipherETS/entry/src/main/ets/pages/register.ets b/Data/StringCipherETS/entry/src/main/ets/pages/register.ets index 07b0c1c0857777508f2a379403d3227b9d9158c8..5966f91c75bdad92a2caf48605358417cbf8bc93 100644 --- a/Data/StringCipherETS/entry/src/main/ets/pages/register.ets +++ b/Data/StringCipherETS/entry/src/main/ets/pages/register.ets @@ -14,8 +14,8 @@ */ // @ts-nocheck -import prompt from '@system.prompt'; -import router from '@system.router'; +import prompt from '@ohos.prompt'; +import router from '@ohos.router'; import cipher from '@system.cipher'; import { User } from '../model/User'; import { InputItem } from '../pages/inputItem'; @@ -187,7 +187,7 @@ struct Register { ivOffset: 0, ivLen: 16, success: function(data) { - that.encryptPassword = data.data.text; + that.encryptPassword = data.text; that.insertUser(); }, fail: function (data, code) { diff --git a/Data/StringCipherETS/entry/src/main/ets/pages/welcome.ets b/Data/StringCipherETS/entry/src/main/ets/pages/welcome.ets index e4cce505a83b641eda825a4f7557a402242408fd..71722221430992a2d12e0d5f45322ccfd6b48bfc 100644 --- a/Data/StringCipherETS/entry/src/main/ets/pages/welcome.ets +++ b/Data/StringCipherETS/entry/src/main/ets/pages/welcome.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import router from '@system.router'; +import router from '@ohos.router'; @Entry @Component diff --git a/JSUI/JSCanvasComponet/entry/src/main/js/MainAbility/pages/index/index.js b/JSUI/JSCanvasComponet/entry/src/main/js/MainAbility/pages/index/index.js index 16d5dae2bbc0082814e733bdf31453cda83a166d..5b6bf7600188d3acc458a5e14e2e615876974578 100644 --- a/JSUI/JSCanvasComponet/entry/src/main/js/MainAbility/pages/index/index.js +++ b/JSUI/JSCanvasComponet/entry/src/main/js/MainAbility/pages/index/index.js @@ -48,7 +48,7 @@ export default { // 开始画 draw() { // 将画布沿X、Y轴平移指定距离 - this.ctx.translate(this.centerX + 10, this.centerY); + this.ctx.translate(this.centerX + 20, this.centerY - this.padding * 1.3); // 画外部圆盘的花瓣 this.drawFlower(); // 画外部圆盘、小圈圈、五角星 @@ -217,8 +217,8 @@ export default { const floatX = event.touches[0].globalX; const floatY = event.touches[0].globalY; const radius = this.centerX / 7 + this.padding / 2; - const isScopeX = this.centerX - radius < floatX && this.centerX + radius > floatX; - const isScopeY = this.centerY - radius < floatY && this.centerY + radius > floatY; + const isScopeX = this.centerX + 20 - radius < floatX && this.centerX + 20 + radius > floatX; + const isScopeY = this.centerY - this.padding * 1.3 - radius < floatY && this.centerY - this.padding * 1.3 + radius > floatY; if (isScopeX && isScopeY && this.playState !== 'running') { this.startAnimator(); } @@ -228,7 +228,7 @@ export default { drawCenter() { const nine = 10; const centerCtx = this.$element('center').getContext('2d'); - centerCtx.translate(this.centerX, this.centerY); + centerCtx.translate(this.centerX + 20, this.centerY - this.padding * 1.3); // 画大指针 centerCtx.beginPath();