diff --git a/UI/JsApp/entry/src/main/js/default/common/item_000.png b/UI/JsApp/entry/src/main/js/default/common/item_000.png new file mode 100644 index 0000000000000000000000000000000000000000..cf963d769f6a8d0768be96236239795c70666809 Binary files /dev/null and b/UI/JsApp/entry/src/main/js/default/common/item_000.png differ diff --git a/UI/JsApp/entry/src/main/js/default/common/item_001.png b/UI/JsApp/entry/src/main/js/default/common/item_001.png new file mode 100644 index 0000000000000000000000000000000000000000..6cd12c6d4eebca7adc2f5518607f95eb2b643724 Binary files /dev/null and b/UI/JsApp/entry/src/main/js/default/common/item_001.png differ diff --git a/UI/JsApp/entry/src/main/js/default/common/item_003.png b/UI/JsApp/entry/src/main/js/default/common/item_003.png new file mode 100644 index 0000000000000000000000000000000000000000..86bfb4697be2e0a445ec892281f52803694b9657 Binary files /dev/null and b/UI/JsApp/entry/src/main/js/default/common/item_003.png differ diff --git a/UI/JsApp/screenshots/device/JsApplication1.png b/UI/JsApp/screenshots/device/JsApplication1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d45157af719703f47bda0d35e9f705b64912334 Binary files /dev/null and b/UI/JsApp/screenshots/device/JsApplication1.png differ diff --git a/UI/JsApp/screenshots/device/jsapplication.png b/UI/JsApp/screenshots/device/jsapplication.png index 90f247c6ca96450ef1004da0162abee3e3c0cee8..8dd5fddf860a6d9b0886a93a9fe9465265f69e44 100644 Binary files a/UI/JsApp/screenshots/device/jsapplication.png and b/UI/JsApp/screenshots/device/jsapplication.png differ diff --git a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java index cbd768a23605d3c9d7fde065e66ba448b9615e3f..432ae55821a655b16e6e7ed69f18ccb8b8f8c9b9 100644 --- a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java +++ b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java @@ -151,16 +151,18 @@ public class MainAbilitySlice extends AbilitySlice { try { ResultSet resultSet = databaseHelper.query(Uri.parse(Const.BASE_URI + Const.DATA_PATH), columns, predicates); - if (resultSet.getRowCount() == 0) { + if (!resultSet.goToFirstRow()) { HiLog.info(LABEL_LOG, "%{public}s", "query:No result found"); return; } - resultSet.goToFirstRow(); logText.setText(""); + int nameIndex = resultSet.getColumnIndexForName(Const.DB_COLUMN_NAME); + int ageIndex = resultSet.getColumnIndexForName(Const.DB_COLUMN_AGE); + int userIndex = resultSet.getColumnIndexForName(Const.DB_COLUMN_USER_ID); do { - String name = resultSet.getString(resultSet.getColumnIndexForName(Const.DB_COLUMN_NAME)); - int age = resultSet.getInt(resultSet.getColumnIndexForName(Const.DB_COLUMN_AGE)); - int userId = resultSet.getInt(resultSet.getColumnIndexForName(Const.DB_COLUMN_USER_ID)); + String name = resultSet.getString(nameIndex); + int age = resultSet.getInt(ageIndex); + int userId = resultSet.getInt(userIndex); logText.append(userId + " " + name + " " + age + System.lineSeparator()); } while (resultSet.goToNextRow()); } catch (DataAbilityRemoteException | IllegalStateException exception) { diff --git a/ability/DistributedMusicPlayer/entry/src/main/resources/rawfile/Homey.mp3 b/ability/DistributedMusicPlayer/entry/src/main/resources/rawfile/Homey.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..b4e53978f0080d6532574ba9ea313ee306be1465 Binary files /dev/null and b/ability/DistributedMusicPlayer/entry/src/main/resources/rawfile/Homey.mp3 differ diff --git a/ability/DistributedMusicPlayer/entry/src/main/resources/rawfile/Technology.mp3 b/ability/DistributedMusicPlayer/entry/src/main/resources/rawfile/Technology.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..74122760bea998b603e9cddbdb5e14cb343af436 Binary files /dev/null and b/ability/DistributedMusicPlayer/entry/src/main/resources/rawfile/Technology.mp3 differ diff --git a/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java b/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java index 778fe6b4fe22fb8ceb6ec906f1717b8094d59fe0..df5006db77a417bdbae6902d7cf92b2115d8350c 100644 --- a/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java +++ b/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java @@ -15,8 +15,6 @@ package ohos.samples.camera; -import static ohos.bundle.IBundleManager.PERMISSION_GRANTED; - import ohos.samples.camera.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; @@ -56,7 +54,7 @@ public class MainAbility extends Ability { return; } for (int grantResult : grantResults) { - if (grantResult != PERMISSION_GRANTED) { + if (grantResult != IBundleManager.PERMISSION_GRANTED) { terminateAbility(); break; } diff --git a/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java b/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java index 0b30d63b6fde64ba79177f0cb77dc41bb4715cc9..361f364aa46256b9806cd80c1af2225d4a9c1a90 100644 --- a/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java +++ b/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java @@ -160,6 +160,9 @@ public class VideoRecordAbility extends Ability { private void switchCamera(Component component) { isFrontCamera = !isFrontCamera; + if (cameraDevice != null) { + cameraDevice.release(); + } updateComponentVisible(false); openCamera(); }