diff --git a/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/DeviceSelectDialog.java b/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/DeviceSelectDialog.java index 2c5e24c85d432bdc15d9c414ba829a6efff170cb..26a0e12b24f1d544f4e29c91f4afb8dcf391d578 100644 --- a/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/DeviceSelectDialog.java +++ b/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/DeviceSelectDialog.java @@ -47,7 +47,7 @@ public class DeviceSelectDialog extends CommonDialog { private final AbilitySlice context; - private DeviceInfo checkedDevice; + @@ -82,9 +82,6 @@ public class DeviceSelectDialog extends CommonDialog { for (DeviceInfo deviceInfo : deviceInfoList) { deviceList.add(new DeviceData(false, deviceInfo)); } - if (deviceInfoList.size() > 0) { - checkedDevice = deviceInfoList.get(0); - } LogUtil.info(TAG, "get " + deviceInfoList.size() + " devices"); return deviceList; } diff --git a/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/PopupDialog.java b/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/PopupDialog.java index f269fb8140251ce1f7a1c25be868af7aadafc98e..07e1face02c498309b287affd5532b8fd2a84621 100644 --- a/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/PopupDialog.java +++ b/CompleteApps/DistributedSearch/entry/src/main/java/ohos/samples/distributedsearch/ui/PopupDialog.java @@ -57,9 +57,7 @@ public class PopupDialog extends CommonDialog { private void configChoiceButton(Component rootView) { LogUtil.info(TAG, "begin to configChoiceButton"); Text operateYes = (Text) rootView.findComponentById(ResourceTable.Id_operate_yes); - operateYes.setClickedListener(component -> { - destroy(); - }); + operateYes.setClickedListener(component -> destroy()); Text operateNo = (Text) rootView.findComponentById(ResourceTable.Id_operate_no); operateNo.setClickedListener(component -> destroy()); } diff --git a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/connections/MyRemoteProxy.java b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/connections/MyRemoteProxy.java index ae365428eb620698a4a6b1f579eb6cbc8e7772f1..2a4891639219e4ed66b74797dc81f1d5b21106ec 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/connections/MyRemoteProxy.java +++ b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/connections/MyRemoteProxy.java @@ -57,10 +57,8 @@ public class MyRemoteProxy implements IRemoteBroker { * sendCmd * * @param cmd the cmd to send - * @return send result. */ - public int sendCmd(int cmd) { - int result = 0; + public void sendCmd(int cmd) { MessageParcel data = MessageParcel.obtain(); data.writeInt(cmd); @@ -72,12 +70,11 @@ public class MyRemoteProxy implements IRemoteBroker { if (ec != ERR_OK) { throw new RemoteException(); } - result = reply.readInt(); } catch (RemoteException e) { HiLog.error(LABEL_LOG, LOG_FORMAT, "MyRemoteProxy", "" + e); } - return result; + } } diff --git a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/ui/listcomponent/ListComponentAdapter.java b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/ui/listcomponent/ListComponentAdapter.java index ca0c2c3864aeb3de9ff8f1b1b2fb0874015827b7..76a312babc902245be2b6af2eb7227487cd050e9 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/ui/listcomponent/ListComponentAdapter.java +++ b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/ui/listcomponent/ListComponentAdapter.java @@ -15,9 +15,9 @@ package ohos.samples.tictactoegame.ui.listcomponent; +import ohos.agp.components.BaseItemProvider; import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; -import ohos.agp.components.RecycleItemProvider; import ohos.app.Context; import java.util.List; @@ -27,7 +27,7 @@ import java.util.List; * * @param params type */ -public abstract class ListComponentAdapter extends RecycleItemProvider { +public abstract class ListComponentAdapter extends BaseItemProvider { private final Context mContext; private final List mListBean; private final int mXmlId; diff --git a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/GameStatusUtils.java b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/GameStatusUtils.java index cdaa5983796212c9a74c495622f92e15dcbc2693..e0b13d4f51d7ab6c987819e704a51e8d26a8ed71 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/GameStatusUtils.java +++ b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/GameStatusUtils.java @@ -55,7 +55,7 @@ public class GameStatusUtils { img.setPixelMap(ResourceTable.Media_game_tie); } new ToastDialog(context) - .setComponent(toastLayout) + .setContentCustomComponent(toastLayout) .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) .setAlignment(LayoutAlignment.CENTER) .setDuration(durationTime) diff --git a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/PkUtils.java b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/PkUtils.java index 6502bba42a1c42af173aa94daeb2fe2ca05b7a90..2131665f5e495c8ef65ac34fe843e0cbfda16a6f 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/PkUtils.java +++ b/CompleteApps/TicTacToeGame/entry/src/main/java/ohos/samples/tictactoegame/utils/PkUtils.java @@ -30,7 +30,7 @@ public class PkUtils { DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(context) .parse(ResourceTable.Layout_layout_toast, null, false); new ToastDialog(context) - .setComponent(toastLayout) + .setContentCustomComponent(toastLayout) .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) .setAlignment(LayoutAlignment.CENTER) .show(); diff --git a/CompleteApps/TicTacToeGame/entry/src/main/resources/base/element/string.json b/CompleteApps/TicTacToeGame/entry/src/main/resources/base/element/string.json index b4179ae8ab26c5e5c95bf245f2eded65786d96c8..0edee77a1ada3057d4bb4f75a362e0b418dcb2ce 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/resources/base/element/string.json +++ b/CompleteApps/TicTacToeGame/entry/src/main/resources/base/element/string.json @@ -51,6 +51,10 @@ { "name": "num0", "value": "0" + }, + { + "name": "SansSerif", + "value": "sans-serif" } ] } \ No newline at end of file diff --git a/CompleteApps/TicTacToeGame/entry/src/main/resources/base/layout/dialog_game_rule.xml b/CompleteApps/TicTacToeGame/entry/src/main/resources/base/layout/dialog_game_rule.xml index b9344fe6ed6f5f3b8ee071e0df56252f453b2497..0934202a282b3acd9985551b14dcf4185bf69dd9 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/resources/base/layout/dialog_game_rule.xml +++ b/CompleteApps/TicTacToeGame/entry/src/main/resources/base/layout/dialog_game_rule.xml @@ -34,7 +34,7 @@ ohos:text="$string:game_rules" ohos:text_size="48px" ohos:text_color="#333333" - ohos:text_font="PingFangSC-Medium" + ohos:text_font="$string:SansSerif" ohos:start_padding="356px" ohos:end_padding="0px" ohos:top_padding="130px"/> @@ -45,7 +45,7 @@ ohos:multiple_lines="true" ohos:text_size="36px" ohos:text_color="#666666" - ohos:text_font="PingFangSC-Regular" + ohos:text_font="$string:SansSerif" ohos:start_padding="100px" ohos:end_padding="0px" ohos:top_padding="50px"/> @@ -58,7 +58,7 @@ ohos:element_padding="10px" ohos:text_size="36px" ohos:text_color="#666666" - ohos:text_font="PingFangSC-Regular" + ohos:text_font="$string:SansSerif" ohos:start_padding="100px" ohos:end_padding="0px" ohos:top_padding="50px"/> diff --git a/CompleteApps/TicTacToeGame/entry/src/main/resources/en/element/string.json b/CompleteApps/TicTacToeGame/entry/src/main/resources/en/element/string.json index ac5af6d4c650d1f1b559d20413cfe4cb4dacafbb..75edaed3ad96e0e0e7d89e7033559cf9dfc4ff98 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/resources/en/element/string.json +++ b/CompleteApps/TicTacToeGame/entry/src/main/resources/en/element/string.json @@ -51,6 +51,10 @@ { "name": "num0", "value": "0" + }, + { + "name": "SansSerif", + "value": "sans-serif" } ] } diff --git a/CompleteApps/TicTacToeGame/entry/src/main/resources/zh/element/string.json b/CompleteApps/TicTacToeGame/entry/src/main/resources/zh/element/string.json index 4c029dc471c4a7bc3e72ac39276e1c112b1ee043..415269ced25dc2e447e00ec38a3028331913d176 100644 --- a/CompleteApps/TicTacToeGame/entry/src/main/resources/zh/element/string.json +++ b/CompleteApps/TicTacToeGame/entry/src/main/resources/zh/element/string.json @@ -51,6 +51,10 @@ { "name": "num0", "value": "0" + }, + { + "name": "SansSerif", + "value": "sans-serif" } ] } \ No newline at end of file diff --git a/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/RemoteAbility.java b/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/RemoteAbility.java index 372c8b34a995f20a116a744569709a9b28d86739..2948450765db12b673487fb38d47d288ba3a0c67 100644 --- a/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/RemoteAbility.java +++ b/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/RemoteAbility.java @@ -22,7 +22,6 @@ import ohos.app.Context; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; import ohos.rpc.IRemoteObject; -import ohos.rpc.RemoteException; /** * RemoteAbility @@ -37,7 +36,7 @@ public class RemoteAbility extends Ability { RemoteAgentStub remoteAgentStub = new RemoteAgentStub(DESCRIPTOR) { @Override - public void setRemoteObject(String param) throws RemoteException { + public void setRemoteObject(String param) { if(isConnected) { showTips(RemoteAbility.this, param); } @@ -79,8 +78,8 @@ public class RemoteAbility extends Ability { } private void showTips(Context context, String msg) { - getUITaskDispatcher().asyncDispatch(()->{ - new ToastDialog(context).setText(msg).show(); - }); + getUITaskDispatcher().asyncDispatch(()-> + new ToastDialog(context).setText(msg).show() + ); } } diff --git a/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/slice/MainAbilitySlice.java b/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/slice/MainAbilitySlice.java index 03c09aa0185a92e65e90fed2733194c61d17a7a1..3c8b55d5680ad17f0bf651b9549fd97289c0ff5c 100644 --- a/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/slice/MainAbilitySlice.java +++ b/ability/DistributedScheduler/entry/src/main/java/ohos/samples/distributedscheduler/slice/MainAbilitySlice.java @@ -186,11 +186,11 @@ public class MainAbilitySlice extends AbilitySlice implements IAbilityContinuati } }; - private Intent getRemotePageIntent(String bundleName, String serviceName) { + private Intent getRemotePageIntent() { Operation operation = new Intent.OperationBuilder() .withDeviceId(selectedDeviceId) - .withBundleName(bundleName) - .withAbilityName(serviceName) + .withBundleName(REMOTE_BUNDLE) + .withAbilityName(REMOTE_SERVICE_FA) .withFlags(Intent.FLAG_ABILITYSLICE_MULTI_DEVICE) .build(); Intent intent = new Intent(); @@ -199,15 +199,15 @@ public class MainAbilitySlice extends AbilitySlice implements IAbilityContinuati } private void startRemoteFA() { - Intent remotePageIntent = getRemotePageIntent(REMOTE_BUNDLE, REMOTE_SERVICE_FA); + Intent remotePageIntent = getRemotePageIntent(); startAbility(remotePageIntent); } - private Intent getRemoteServiceIntent(String bundleName, String serviceName) { + private Intent getRemoteServiceIntent() { Operation operation = new Intent.OperationBuilder() .withDeviceId(selectedDeviceId) - .withBundleName(bundleName) - .withAbilityName(serviceName) + .withBundleName(REMOTE_BUNDLE) + .withAbilityName(REMOTE_SERVICE) .withFlags(Intent.FLAG_ABILITYSLICE_MULTI_DEVICE) .build(); Intent intent = new Intent(); @@ -216,17 +216,17 @@ public class MainAbilitySlice extends AbilitySlice implements IAbilityContinuati } private void startRemoteService() { - Intent remoteServiceIntent = getRemoteServiceIntent(REMOTE_BUNDLE, REMOTE_SERVICE); + Intent remoteServiceIntent = getRemoteServiceIntent(); startAbility(remoteServiceIntent); } private void stopService() { - Intent intent = getRemoteServiceIntent(REMOTE_BUNDLE, REMOTE_SERVICE); + Intent intent = getRemoteServiceIntent(); stopAbility(intent); } private void connectService() { - Intent intent = getRemoteServiceIntent(REMOTE_BUNDLE, REMOTE_SERVICE); + Intent intent = getRemoteServiceIntent(); connectAbility(intent, connection); } @@ -252,9 +252,9 @@ public class MainAbilitySlice extends AbilitySlice implements IAbilityContinuati }; public void showTips(Context context, String msg) { - getUITaskDispatcher().asyncDispatch(()->{ - new ToastDialog(context).setText(msg).show(); - }); + getUITaskDispatcher().asyncDispatch(()-> + new ToastDialog(context).setText(msg).show() + ); } @Override diff --git a/ability/Idl/build.gradle b/ability/Idl/build.gradle index 4e8a6aadbd114fd91535e3347c8a293ad0fab769..906f424fe303cd6c7ec136c703e8008bde67011f 100644 --- a/ability/Idl/build.gradle +++ b/ability/Idl/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } diff --git a/ability/Idl/rpcclient/build.gradle b/ability/Idl/rpcclient/build.gradle index 83f59debbd68242b503a22270f4378d7843ca204..039f7877f91214270fa54779929e660dc5f5bc55 100644 --- a/ability/Idl/rpcclient/build.gradle +++ b/ability/Idl/rpcclient/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { diff --git a/ability/Idl/rpcclient/src/main/config.json b/ability/Idl/rpcclient/src/main/config.json index a31f8a681bbce58870102653bcac03518b42dee0..826daddc6bfd96dc54825da96996661723e1d632 100644 --- a/ability/Idl/rpcclient/src/main/config.json +++ b/ability/Idl/rpcclient/src/main/config.json @@ -47,7 +47,7 @@ "distroFilter": { "apiVersion": { "policy": "include", - "value": [5,4] + "value": [6,5] } } } diff --git a/ability/Idl/rpcserver/build.gradle b/ability/Idl/rpcserver/build.gradle index 83f59debbd68242b503a22270f4378d7843ca204..039f7877f91214270fa54779929e660dc5f5bc55 100644 --- a/ability/Idl/rpcserver/build.gradle +++ b/ability/Idl/rpcserver/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { diff --git a/ability/Idl/rpcserver/src/main/config.json b/ability/Idl/rpcserver/src/main/config.json index 0a88ac2730a9f21f9ae1b63c15cae71178c4f48e..f667cd65a51253fe69a4220f4ef23742614e90ca 100644 --- a/ability/Idl/rpcserver/src/main/config.json +++ b/ability/Idl/rpcserver/src/main/config.json @@ -52,7 +52,7 @@ "distroFilter": { "apiVersion": { "policy": "include", - "value": [5,4] + "value": [6,5] } } } diff --git a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java index 4565010178b72122fe919fd9909cb9c05d80949f..56dab791504aecc6e3e38a621930ddae5b47450c 100644 --- a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java +++ b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java @@ -31,7 +31,7 @@ public class ServiceAbility extends Ability { /** * CalculatorInterfaceStubImpl */ - private static class CalculatorInterfaceStubImpl extends CalculatorInterfaceStub { + private static class CalculatorInterfaceStubImpl extends CalculatorInterfaceStub implements IRemoteObject { public CalculatorInterfaceStubImpl(String descriptor) { super(descriptor); }