From ba713938e4f94ce58044835965f60c10d354b3a4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Oct 2021 17:14:55 +0800 Subject: [PATCH 1/4] modify_code Signed-off-by: unknown --- .../samples/distributedsearch/ui/DeviceSelectDialog.java | 5 +---- .../java/ohos/samples/distributedsearch/ui/PopupDialog.java | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) 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 2c5e24c85d..26a0e12b24 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 f269fb8140..07e1face02 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()); } -- Gitee From 414a837687fb430ef2b2fb412a47d164a5e49e9f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Oct 2021 17:17:43 +0800 Subject: [PATCH 2/4] modify_TicTocGame Signed-off-by: unknown --- .../samples/tictactoegame/connections/MyRemoteProxy.java | 7 ++----- .../ui/listcomponent/ListComponentAdapter.java | 4 ++-- .../ohos/samples/tictactoegame/utils/GameStatusUtils.java | 2 +- .../java/ohos/samples/tictactoegame/utils/PkUtils.java | 2 +- .../entry/src/main/resources/base/element/string.json | 4 ++++ .../src/main/resources/base/layout/dialog_game_rule.xml | 6 +++--- .../entry/src/main/resources/en/element/string.json | 4 ++++ .../entry/src/main/resources/zh/element/string.json | 4 ++++ 8 files changed, 21 insertions(+), 12 deletions(-) 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 ae365428eb..2a48916392 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 ca0c2c3864..76a312babc 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 cdaa598379..e0b13d4f51 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 6502bba42a..2131665f5e 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 b4179ae8ab..0edee77a1a 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 b9344fe6ed..0934202a28 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 ac5af6d4c6..75edaed3ad 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 4c029dc471..415269ced2 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 -- Gitee From 934c3de6395c8a2e72c709e8bc8ef42576baee75 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Oct 2021 17:20:45 +0800 Subject: [PATCH 3/4] modify_code Signed-off-by: unknown --- .../distributedscheduler/RemoteAbility.java | 9 +++---- .../slice/MainAbilitySlice.java | 26 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) 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 372c8b34a9..2948450765 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 03c09aa018..3c8b55d568 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 -- Gitee From cc5a4444a98f377ebe2dfbf4540ef414647740e6 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Oct 2021 17:22:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: unknown --- ability/Idl/build.gradle | 4 ++-- ability/Idl/rpcclient/build.gradle | 4 ++-- ability/Idl/rpcclient/src/main/config.json | 2 +- ability/Idl/rpcserver/build.gradle | 4 ++-- ability/Idl/rpcserver/src/main/config.json | 2 +- .../src/main/java/ohos/samples/rpcserver/ServiceAbility.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ability/Idl/build.gradle b/ability/Idl/build.gradle index 4e8a6aadbd..906f424fe3 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 83f59debbd..039f7877f9 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 a31f8a681b..826daddc6b 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 83f59debbd..039f7877f9 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 0a88ac2730..f667cd65a5 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 4565010178..56dab79150 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); } -- Gitee