!9628 patternlock更改ace_ets_component_ui的patternLock部分

Merge pull request !9628 from tengfan/patternlock_0731

arkui/ace_ets_component_ui/entry/src/main/ets/MainAbility/pages/PatternLockPage.ets

@@ -117,7 +117,19 @@ struct PatternLockPage {
       })
 
       Text(this.passwords.toString()).margin(20).fontSize(15).key('password1')
-      PatternLock(this.patternLockController).key('default')
+      PatternLock(this.patternLockController)
+        .key('default')
+        
+      PatternLock(this.patternLockController)
+        .key('PatternLock')
+        .sideLength(96*3)
+        .circleRadius(6)
+        .regularColor($r('sys.color.ohos_id_color_foreground'))
+        .selectedColor($r('sys.color.ohos_id_color_foreground'))
+        .activeColor($r('sys.color.ohos_id_color_foreground'))
+        .pathColor($r('sys.color.ohos_id_color_fourth'))
+        .pathStrokeWidth(12)
+        .autoReset(true)
     }.width('100%').height('100%')
   }
 }
\ No newline at end of file

arkui/ace_ets_component_ui/entry/src/main/ets/test/PatternLockJsunit.test.ets

@@ -220,24 +220,22 @@ export default function PatternLockJsunit() {
     }); 
 
     it('PatternLockJsunit_1300', 0, async function (done) {
-      // Verify default value of the PatternLock component
       console.info('[PatternLockJsunit_1300] START');
       let strJson = getInspectorByKey('default');
       let obj = JSON.parse(strJson);
-      console.info("[PatternLockJsunit_1300'] component obj is: " + JSON.stringify(obj));
-      await CommonFunc.sleep(1000);
-      // Verify password for the first time
-      expect(obj.$attrs.sideLength).assertEqual('300.00vp');
-      expect(obj.$attrs.circleRadius).assertEqual('14.00vp');
-      expect(obj.$attrs.regularColor).assertEqual('#FF000000');
-      expect(obj.$attrs.selectedColor).assertEqual('#FF000000');
-      expect(obj.$attrs.activeColor).assertEqual('#FF000000');
-      expect(obj.$attrs.pathColor).assertEqual('#FF0000FF');
-      expect(obj.$attrs.pathStrokeWidth).assertEqual('34.00vp');
-      expect(obj.$attrs.autoReset).assertEqual('true');
-      await CommonFunc.sleep(1000);
+      let newStrJson = getInspectorByKey('PatternLock');
+      let newObj = JSON.parse(newStrJson);
+      expect(obj.$attrs.sideLength).assertEqual(newObj.$attrs.sideLength);
+      expect(obj.$attrs.circleRadius).assertEqual(newObj.$attrs.circleRadius);
+      expect(obj.$attrs.regularColor).assertEqual(newObj.$attrs.regularColor);
+      expect(obj.$attrs.selectedColor).assertEqual(newObj.$attrs.selectedColor);
+      expect(obj.$attrs.activeColor).assertEqual(newObj.$attrs.activeColor);
+      expect(obj.$attrs.pathColor).assertEqual(newObj.$attrs.pathColor);
+      expect(obj.$attrs.pathStrokeWidth).assertEqual(newObj.$attrs.pathStrokeWidth);
+      expect(obj.$attrs.autoReset).assertEqual(newObj.$attrs.autoReset);
       console.info('[PatternLockJsunit_1300] END');
       done();
     });
   })
-}
+}
\ No newline at end of file
+