Skip to content

Commit

Permalink
ui fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@soloPi
soloPi committed Sep 21, 2020
1 parent 5da3b51 commit be35542
Show file tree
Hide file tree
Showing 15 changed files with 69 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/app/src/main/java/com/alipay/hulu/adapter/LocalTaskResultListAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
holder.deviceInfo.setVisibility(View.GONE);
}

if (result.getExceptionStep() > -1) {
if (result.getExceptionMessage() != null) {
holder.status.setTextColor(0xfff76262);
holder.status.setText(R.string.constant__fail);
} else {
Expand Down
38 changes: 20 additions & 18 deletions src/app/src/main/java/com/alipay/hulu/fragment/CaseStepEditFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public View getView(FlowLayout parent, int position, String o) {

// 转换模式
Menu menu = new Menu(true, 0);
menu.addItem(new MenuItem.Builder().setText("删除步骤").setTextColor(Color.WHITE)
menu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__remove)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
Expand All @@ -359,42 +359,42 @@ public View getView(FlowLayout parent, int position, String o) {

// 空项
Menu controlMenu = new Menu(false, 1);
controlMenu.addItem(new MenuItem.Builder().setText("删除步骤").setTextColor(Color.WHITE)
controlMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__remove)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setBackground(new ColorDrawable(colorDelete)).build());
controlMenu.addItem(new MenuItem.Builder().setText("恢复步骤").setTextColor(Color.WHITE)
controlMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__restore_step)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setBackground(new ColorDrawable(colorIf)).build());

// 空项
Menu controlSubMenu = new Menu(false, 2);
controlMenu.addItem(new MenuItem.Builder().setText("删除步骤").setTextColor(Color.WHITE)
controlSubMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__remove)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setBackground(new ColorDrawable(colorDelete)).build());

// 转换模式
Menu clickMenu = new Menu(true, 3);
clickMenu.addItem(new MenuItem.Builder().setText("删除步骤").setTextColor(Color.WHITE)
clickMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__remove)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setBackground(new ColorDrawable(colorDelete)).build());
clickMenu.addItem(new MenuItem.Builder().setText("转换为IF").setTextColor(Color.WHITE).setWidth(dp64)
clickMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__convert_if)).setTextColor(Color.WHITE).setWidth(dp64)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setTextSize(textSize13)
.setBackground(new ColorDrawable(colorIf)).build());
clickMenu.addItem(new MenuItem.Builder().setText("转换为WHILE").setTextColor(Color.WHITE)
clickMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__convert_while)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setTextSize(textSize13)
.setBackground(new ColorDrawable(colorWhile)).build());
clickMenu.addItem(new MenuItem.Builder().setText("转化为发现则点击").setTextColor(Color.WHITE)
clickMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__convert_click_if_exist)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
Expand All @@ -403,21 +403,21 @@ public View getView(FlowLayout parent, int position, String o) {

// 转换模式
Menu clickIfMenu = new Menu(true, 4);
clickIfMenu.addItem(new MenuItem.Builder().setText("删除步骤").setTextColor(Color.WHITE)
clickIfMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__remove)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setBackground(new ColorDrawable(colorDelete)).build());
clickIfMenu.addItem(new MenuItem.Builder().setText("转换为IF").setTextColor(Color.WHITE).setWidth(dp64)
clickIfMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__convert_if)).setTextColor(Color.WHITE).setWidth(dp64)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setTextSize(textSize13)
.setBackground(new ColorDrawable(colorIf)).build());
clickIfMenu.addItem(new MenuItem.Builder().setText("转换为WHILE").setTextColor(Color.WHITE)
clickIfMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__convert_while)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setDirection(MenuItem.DIRECTION_RIGHT)
.setTextSize(textSize13)
.setBackground(new ColorDrawable(colorWhile)).build());
clickIfMenu.addItem(new MenuItem.Builder().setText("转化为点击").setTextColor(Color.WHITE)
clickIfMenu.addItem(new MenuItem.Builder().setText(getString(R.string.step_edit__convert_click)).setTextColor(Color.WHITE)
.setWidth(dp64)
.setTextSize(textSize13)
.setDirection(MenuItem.DIRECTION_RIGHT)
Expand Down Expand Up @@ -821,9 +821,11 @@ private OperationStep clone(OperationStep origin) {
* 展示选择添加步骤模式
*/
private void showSelectModeAction(final int position) {
final String[] actions = new String[]{"控件操作", "全局操作", "录制添加操作"};
final String[] actions = new String[]{getString(R.string.case_step_edit__node_action),
getString(R.string.case_step_edit__global_action),
getString(R.string.case_step_edit__record_add_action)};
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppDialogTheme)
.setTitle("请选择要添加的操作类型")
.setTitle(R.string.case_step_edit__select_add_action)
.setSingleChoiceItems(actions, -1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Expand All @@ -841,7 +843,7 @@ public void onClick(DialogInterface dialog, int which) {
addRecordCases(position);
}
}
}).setNegativeButton("取消", new DialogInterface.OnClickListener() {
}).setNegativeButton(R.string.constant__cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
Expand All @@ -866,7 +868,7 @@ private void showCreateNodeView(final int position) {
final EditText xpath = (EditText) createNodeView.findViewById(R.id.create_node_xpath);

final AlertDialog dialog = new AlertDialog.Builder(getActivity())
.setView(createNodeView).setPositiveButton("选择操作", new DialogInterface.OnClickListener() {
.setView(createNodeView).setPositiveButton(R.string.case_step_edit__select_action, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
OperationNode node = new OperationNode();
Expand Down Expand Up @@ -904,8 +906,8 @@ public void onClick(DialogInterface dialog, int which) {
showAddFunctionView(node, position);
}
})
.setNegativeButton("取消", null)
.setTitle("设置控件信息").create();
.setNegativeButton(R.string.constant__cancel, null)
.setTitle(R.string.case_step_edit__set_node_info).create();
dialog.show();

// 选择第一个
Expand Down
3 changes: 1 addition & 2 deletions src/app/src/main/java/com/alipay/hulu/fragment/LocalReplayResultListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import com.alipay.hulu.bean.ReplayResultBean;
import com.alipay.hulu.bean.ReplayStepInfoBean;
import com.alipay.hulu.common.bean.DeviceInfo;
import com.alipay.hulu.common.injector.InjectorService;
import com.alipay.hulu.common.tools.BackgroundExecutor;
import com.alipay.hulu.common.utils.FileUtils;
import com.alipay.hulu.common.utils.LogUtil;
Expand Down Expand Up @@ -273,7 +272,7 @@ private void deleteResult(int position) {
private void initEmptyView(View view) {
mEmptyView = view.findViewById(R.id.empty_view_container);
mEmptyTextView = view.findViewById(R.id.empty_text);
mEmptyTextView.setText("您还没有回放过用例哦");
mEmptyTextView.setText(R.string.replay_result__no_history);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/main/java/com/alipay/hulu/util/FunctionSelectUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ private static void showSelectView(final OperationMethod method, final Context c
View itemScan = customView.findViewById(R.id.item_scan);
TextView itemUrl = customView.findViewById(R.id.item_url);
if (actionEnum == PerformActionEnum.GENERATE_QR_CODE) {
itemUrl.setText("输入码值");
itemUrl.setText(R.string.function__input_code);
}
final AlertDialog dialog = new AlertDialog.Builder(context, R.style.AppDialogTheme)
.setView(customView)
Expand Down
12 changes: 12 additions & 0 deletions src/app/src/main/res/values-zh/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,4 +423,16 @@
<string name="record_float__kill_process">杀当前进程</string>
<string name="record_float__average">平均值</string>
<string name="record_float__nth_time">第%d次</string>
<string name="step_edit__remove">删除步骤</string>
<string name="step_edit__restore_step">恢复步骤</string>
<string name="step_edit__convert_click_if_exist">转化为发现则点击</string>
<string name="step_edit__convert_click">转化为点击</string>
<string name="replay_result__no_history">您还没有保存过用例回放结果哦</string>
<string name="function__input_code">输入码值</string>
<string name="case_step_edit__select_add_action">请选择要添加的操作类型</string>
<string name="case_step_edit__node_action">控件操作</string>
<string name="case_step_edit__global_action">全局操作</string>
<string name="case_step_edit__record_add_action">录制添加操作</string>
<string name="case_step_edit__select_action">选择操作</string>
<string name="case_step_edit__set_node_info">设置控件信息</string>
</resources>
14 changes: 13 additions & 1 deletion src/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,9 +419,21 @@
<string name="activity_local_replay_result_title">Local Replay Result</string>
<string name="local_result__running_time">Run Time: </string>
<string name="local_result__target_app">Test App: </string>
<string name="toast_message__add_solopi_background">Please Turn On \"Display pop-up windows while running in the background\" Permission</string>
<string name="toast_message__add_solopi_background">Please make sure SoloPi in background cleanup whitelist</string>
<string name="replay_result__delete_item">Delete replay result?</string>
<string name="record_float__kill_process">Kill Process</string>
<string name="record_float__average">AVG</string>
<string name="record_float__nth_time">%dth</string>
<string name="step_edit__remove">Remove Step</string>
<string name="step_edit__restore_step">Restore Step</string>
<string name="step_edit__convert_click_if_exist">Convert to ClickIfExists</string>
<string name="step_edit__convert_click">Convert to Click</string>
<string name="replay_result__no_history">No case replay result found</string>
<string name="function__input_code">Input Code Value</string>
<string name="case_step_edit__select_add_action">Please select action type</string>
<string name="case_step_edit__node_action">Node Operation</string>
<string name="case_step_edit__global_action">Global Operation</string>
<string name="case_step_edit__record_add_action">Record Steps</string>
<string name="case_step_edit__select_action">Next</string>
<string name="case_step_edit__set_node_info">Set Node Info.</string>
</resources>
8 changes: 8 additions & 0 deletions src/common/src/main/java/com/alipay/hulu/common/application/LauncherApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,14 @@ public void showToast(String message) {
showToast(getContext(), message);
}

/**
* 显示Toast
* @param res 文字资源
*/
public void showToast(int res, Object... args) {
showToast(getContext(), getContext().getString(res, args));
}

/**
* 展示加载框
*
Expand Down
2 changes: 1 addition & 1 deletion src/common/src/main/java/com/alipay/hulu/common/utils/activity/PermissionDialogActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ public void onFailed() {
CmdTools.putAccessibility("enabled_accessibility_services", "com.alipay.hulu/com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl");

// 等待辅助功能重新激活
LauncherApplication.getInstance().showToast("尝试重启辅助功能，等待10秒");
LauncherApplication.getInstance().showToast(R.string.permission__restarting_accessibility);
try {
latch.await(10000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
Expand Down
2 changes: 1 addition & 1 deletion src/common/src/main/res/values-sw600dp/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dimen name="float_win_height">600dp</dimen>
<dimen name="float_group_text_size">18dp</dimen>
<dimen name="float_group_icon_size">39dp</dimen>
<dimen name="float_group_icon_gap">24dp</dimen>
<dimen name="float_group_icon_gap">27dp</dimen>
<dimen name="float_item_icon_size">36dp</dimen>
<dimen name="float_item_text_size">22sp</dimen>

Expand Down
2 changes: 1 addition & 1 deletion src/common/src/main/res/values-sw720dp/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dimen name="float_win_height">800dp</dimen>
<dimen name="float_group_text_size">24dp</dimen>
<dimen name="float_group_icon_size">52dp</dimen>
<dimen name="float_group_icon_gap">32dp</dimen>
<dimen name="float_group_icon_gap">36dp</dimen>
<dimen name="float_item_icon_size">48dp</dimen>
<dimen name="float_item_text_size">30sp</dimen>

Expand Down
2 changes: 1 addition & 1 deletion src/common/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dimen name="float_win_height">440dp</dimen>
<dimen name="float_group_text_size">12dp</dimen>
<dimen name="float_group_icon_size">26dp</dimen>
<dimen name="float_group_icon_gap">16dp</dimen>
<dimen name="float_group_icon_gap">18dp</dimen>
<dimen name="float_item_icon_size">24dp</dimen>
<dimen name="float_item_text_size">18sp</dimen>

Expand Down
2 changes: 1 addition & 1 deletion src/common/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<string name="permission__receive_mms">Receive MMS</string>
<string name="permission__read_external_storage">Read External Storage</string>
<string name="permission__write_external_storage">Write External Storage</string>
<string name="permission__restarting_accessibility">Restarting Accessibility Service...</string>
<string name="permission__restarting_accessibility">Restarting Accessibility Service…s</string>
<string name="permission__kill_app">Kill App: %s</string>
<string name="permission__open_accessibility">Starting Accessibility Service</string>
<string name="permission__try_kil_uiautomator">Try to kill uiautomator and instrument processes</string>
Expand Down
7 changes: 4 additions & 3 deletions src/portal/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ android {
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'
}
versionNameSuffix "-inner"
}

buildTypes {
Expand All @@ -52,8 +51,10 @@ android {
}

packagingOptions {
exclude 'META-INF/LICENSE'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/**'
exclude 'lib/x86/**'
exclude 'lib/armeabi/**'
/*exclude 'assets/lineDashTexture.png'*/
}

dexOptions {
Expand Down
5 changes: 3 additions & 2 deletions ...d/src/main/java/com/alipay/hulu/shared/node/tree/accessibility/AccessibilityProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.alipay.hulu.common.utils.LogUtil;
import com.alipay.hulu.common.utils.MiscUtil;
import com.alipay.hulu.common.utils.StringUtil;
import com.alipay.hulu.shared.R;
import com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl;
import com.alipay.hulu.shared.node.AbstractProvider;
import com.alipay.hulu.shared.node.tree.FakeNodeTree;
Expand Down Expand Up @@ -379,7 +380,7 @@ private MetaTree loadMetaTree() {
* 重启辅助功能
*/
private void restartAccessibilityService() {
LauncherApplication.getInstance().showToast("重启辅助功能中，请耐心等待");
LauncherApplication.getInstance().showToast(StringUtil.getString(R.string.permission__restarting_accessibility));
// 关uiautomator
cleanInstrumentationAndUiAutomator();

Expand Down Expand Up @@ -418,7 +419,7 @@ public void onFailed() {
* 重启辅助功能
*/
private void simpleRestartAccessibilityService() {
LauncherApplication.getInstance().showToast("简易重启辅助功能中，请耐心等待");
LauncherApplication.getInstance().showToast(R.string.permission__restarting_accessibility);

// 切换回TalkBack
CmdTools.putAccessibility("enabled_accessibility_services", "com.android.talkback/com.google.android.marvin.talkback.TalkBackService");
Expand Down
2 changes: 1 addition & 1 deletion src/shared/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<string name="action__long_click">LONG PRESS</string>
<string name="action__input">INPUT</string>
<string name="action__multi_click">REPEAT CLICK</string>
<string name="action__find_click">FIND AND CLICK</string>
<string name="action__find_click">CLICK IF EXISTS</string>
<string name="action__quick_click">QUICK CLICK</string>
<string name="action__input_search">INPUT AND SEARCH</string>
<string name="action__scroll_to_bottom">SCROLL DOWN</string>
Expand Down

0 comments on commit be35542

Please sign in to comment.