|
40 | 40 | */ |
41 | 41 | public class UIAutoActivity extends Activity { |
42 | 42 | private static final String TAG = "UIAutoActivity"; |
43 | | - private static final String DIVIDER_Y = "DIVIDER_Y"; |
44 | | - private static final String DIVIDER_HEIGHT = "DIVIDER_HEIGHT"; |
45 | | - private static final String DIVIDER_COLOR = "DIVIDER_COLOR"; |
| 43 | + private static final String SPLIT_Y = "SPLIT_Y"; |
| 44 | + private static final String SPLIT_HEIGHT = "SPLIT_HEIGHT"; |
| 45 | + private static final String SPLIT_COLOR = "SPLIT_COLOR"; |
46 | 46 |
|
47 | 47 | private static final String INTENT_FLOW_ID = "INTENT_FLOW_ID"; |
48 | 48 | private static final String INTENT_TOUCH_LIST = "INTENT_TOUCH_LIST"; |
@@ -73,7 +73,7 @@ public static Intent createIntent(Context context, String list) { |
73 | 73 | // //通过遍历数组来实现 |
74 | 74 | //// if (lastCurTime >= System.currentTimeMillis()) { |
75 | 75 | //// isRecovering = false; |
76 | | -//// pbUIAutoDivider.setVisibility(View.GONE); |
| 76 | +//// pbUIAutoSplit.setVisibility(View.GONE); |
77 | 77 | //// } |
78 | 78 | //// |
79 | 79 | //// MotionEvent event = (MotionEvent) msg.obj; |
@@ -86,7 +86,7 @@ public static Intent createIntent(Context context, String list) { |
86 | 86 | // |
87 | 87 | // if (eventNode.next == null) { |
88 | 88 | // isRecovering = false; |
89 | | -// pbUIAutoDivider.setVisibility(View.GONE); |
| 89 | +// pbUIAutoSplit.setVisibility(View.GONE); |
90 | 90 | // return; |
91 | 91 | // } |
92 | 92 | // |
@@ -106,14 +106,14 @@ public static Intent createIntent(Context context, String list) { |
106 | 106 | // int windowY; |
107 | 107 | // |
108 | 108 | // ViewGroup cover; |
109 | | -// ViewGroup divider; |
110 | | -// View rlUIAutoDivider; |
111 | | -// View vUIAutoDivider; |
112 | | -// View ivUIAutoDivider; |
113 | | -// View pbUIAutoDivider; |
114 | | -// |
115 | | -// private float dividerY; |
116 | | -// private float dividerHeight; |
| 109 | +// ViewGroup split; |
| 110 | +// View rlUIAutoSplitY; |
| 111 | +// View vUIAutoSplit; |
| 112 | +// View ivUIAutoSplit; |
| 113 | +// View pbUIAutoSplit; |
| 114 | +// |
| 115 | +// private float splitY; |
| 116 | +// private float splitHeight; |
117 | 117 | // private boolean moved = false; |
118 | 118 |
|
119 | 119 | private JSONArray touchList; |
@@ -148,11 +148,11 @@ protected void onCreate(Bundle savedInstanceState) { |
148 | 148 | // |
149 | 149 | // cache = getSharedPreferences(TAG, Context.MODE_PRIVATE); |
150 | 150 | // |
151 | | -// dividerY = cache.getFloat(DIVIDER_Y, 0); |
152 | | -// dividerHeight = cache.getFloat(DIVIDER_HEIGHT, dip2px(24)); |
| 151 | +// splitY = cache.getFloat(SPLIT_Y, 0); |
| 152 | +// splitHeight = cache.getFloat(SPLIT_HEIGHT, dip2px(24)); |
153 | 153 | // |
154 | | -// if (dividerY <= dividerHeight || dividerY >= windowHeight - dividerHeight) { |
155 | | -// dividerY = windowHeight - dividerHeight - dip2px(30); |
| 154 | +// if (splitY <= splitHeight || splitY >= windowHeight - splitHeight) { |
| 155 | +// splitY = windowHeight - splitHeight - dip2px(30); |
156 | 156 | // } |
157 | 157 |
|
158 | 158 | if (touchList != null && touchList.isEmpty() == false) { //TODO 回放操作 |
@@ -164,43 +164,43 @@ protected void onCreate(Bundle savedInstanceState) { |
164 | 164 |
|
165 | 165 | // ViewGroup root = (ViewGroup) getWindow().getDecorView(); |
166 | 166 | // cover = (ViewGroup) getLayoutInflater().inflate(R.layout.ui_auto_cover_layout, null); |
167 | | -// divider = (ViewGroup) getLayoutInflater().inflate(R.layout.ui_auto_divider_layout, null); |
| 167 | +// split = (ViewGroup) getLayoutInflater().inflate(R.layout.ui_auto_split_y_layout, null); |
168 | 168 | // |
169 | | -// rlUIAutoDivider = divider.findViewById(R.id.rlUIAutoDivider); |
170 | | -// vUIAutoDivider = divider.findViewById(R.id.vUIAutoDivider); |
171 | | -// ivUIAutoDivider = divider.findViewById(R.id.ivUIAutoDivider); |
172 | | -// pbUIAutoDivider = divider.findViewById(R.id.pbUIAutoDivider); |
173 | | -// pbUIAutoDivider.setVisibility(View.GONE); |
| 169 | +// rlUIAutoSplitY = split.findViewById(R.id.rlUIAutoSplitY); |
| 170 | +// vUIAutoSplit = split.findViewById(R.id.vUIAutoSplit); |
| 171 | +// ivUIAutoSplit = split.findViewById(R.id.ivUIAutoSplit); |
| 172 | +// pbUIAutoSplit = split.findViewById(R.id.pbUIAutoSplit); |
| 173 | +// pbUIAutoSplit.setVisibility(View.GONE); |
174 | 174 | // |
175 | | -// ViewGroup.LayoutParams dividerLp = rlUIAutoDivider.getLayoutParams(); |
176 | | -// if (dividerLp == null) { |
177 | | -// dividerLp = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) dividerHeight); |
| 175 | +// ViewGroup.LayoutParams splitLp = rlUIAutoSplitY.getLayoutParams(); |
| 176 | +// if (splitLp == null) { |
| 177 | +// splitLp = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) splitHeight); |
178 | 178 | // } else { |
179 | | -// dividerLp.height = (int) dividerHeight; |
| 179 | +// splitLp.height = (int) splitHeight; |
180 | 180 | // } |
181 | | -// rlUIAutoDivider.setLayoutParams(dividerLp); |
| 181 | +// rlUIAutoSplitY.setLayoutParams(splitLp); |
182 | 182 | // |
183 | | -//// cover.addView(divider); |
| 183 | +//// cover.addView(split); |
184 | 184 | // |
185 | | -//// rlUIAutoDivider.post(new Runnable() { |
| 185 | +//// rlUIAutoSplitY.post(new Runnable() { |
186 | 186 | //// @Override |
187 | 187 | //// public void run() { |
188 | | -//// rlUIAutoDivider.setY(dividerY - rlUIAutoDivider.getHeight()/2); |
| 188 | +//// rlUIAutoSplitY.setY(splitY - rlUIAutoSplitY.getHeight()/2); |
189 | 189 | //// cover.setVisibility(View.GONE); |
190 | 190 | //// } |
191 | 191 | //// }); |
192 | 192 | // |
193 | | -// vUIAutoDivider.setBackgroundColor(Color.parseColor(cache.getString(DIVIDER_COLOR, "#10000000"))); |
| 193 | +// vUIAutoSplit.setBackgroundColor(Color.parseColor(cache.getString(SPLIT_COLOR, "#10000000"))); |
194 | 194 | // |
195 | | -// ViewGroup.LayoutParams lineLp = ivUIAutoDivider.getLayoutParams(); |
| 195 | +// ViewGroup.LayoutParams lineLp = ivUIAutoSplit.getLayoutParams(); |
196 | 196 | // if (lineLp == null) { |
197 | | -// lineLp = new RelativeLayout.LayoutParams((int) dividerHeight, (int) dividerHeight); |
| 197 | +// lineLp = new RelativeLayout.LayoutParams((int) splitHeight, (int) splitHeight); |
198 | 198 | // } else { |
199 | | -// lineLp.width = lineLp.height = (int) dividerHeight; |
| 199 | +// lineLp.width = lineLp.height = (int) splitHeight; |
200 | 200 | // } |
201 | | -// ivUIAutoDivider.setLayoutParams(lineLp); |
| 201 | +// ivUIAutoSplit.setLayoutParams(lineLp); |
202 | 202 | // |
203 | | -// ivUIAutoDivider.setOnClickListener(new View.OnClickListener() { |
| 203 | +// ivUIAutoSplit.setOnClickListener(new View.OnClickListener() { |
204 | 204 | // @Override |
205 | 205 | // public void onClick(View v) { |
206 | 206 | // isRecovering = false; |
@@ -223,26 +223,26 @@ protected void onCreate(Bundle savedInstanceState) { |
223 | 223 | // startActivity(UIAutoActivity.createIntent(DemoApplication.getInstance(), touchList == null ? null : touchList.toJSONString())); |
224 | 224 | // |
225 | 225 | // floatCover = null; |
226 | | -// floatDivider = null; |
| 226 | +// floatSplitY = null; |
227 | 227 | // FloatWindow.destroy("v"); |
228 | 228 | // FloatWindow.destroy("v_ball"); |
229 | 229 | // } |
230 | 230 | // }); |
231 | | -// rlUIAutoDivider.setOnTouchListener(new View.OnTouchListener() { |
| 231 | +// rlUIAutoSplitY.setOnTouchListener(new View.OnTouchListener() { |
232 | 232 | // @Override |
233 | 233 | // public boolean onTouch(View v, MotionEvent event) { |
234 | 234 | //// 都不动了 if (event.getY() - event.getRawY() >= 10) { |
235 | 235 | // if (event.getAction() == MotionEvent.ACTION_MOVE || event.getAction() == MotionEvent.ACTION_HOVER_MOVE) { |
236 | 236 | // moved = true; |
237 | | -// divider.setY(event.getY()); |
238 | | -//// divider.invalidate(); |
| 237 | +// split.setY(event.getY()); |
| 238 | +//// split.invalidate(); |
239 | 239 | // } else { |
240 | 240 | // if (event.getAction() == MotionEvent.ACTION_DOWN) { |
241 | 241 | // moved = false; |
242 | 242 | // } |
243 | 243 | // else if (event.getAction() == MotionEvent.ACTION_UP) { |
244 | 244 | // if (! moved) { |
245 | | -// ivUIAutoDivider.performClick(); |
| 245 | +// ivUIAutoSplit.performClick(); |
246 | 246 | // } |
247 | 247 | // } |
248 | 248 | // } |
@@ -297,8 +297,8 @@ protected void onCreate(Bundle savedInstanceState) { |
297 | 297 | // s = ""; |
298 | 298 | // } |
299 | 299 | // |
300 | | -// float dividerY = floatDivider.getY() + rlUIAutoDivider.getHeight()/2; |
301 | | -// float relativeY = event.getY() <= dividerY ? event.getY() : (event.getY() - screenHeight); |
| 300 | +// float splitY = floatSplitY.getY() + rlUIAutoSplitY.getHeight()/2; |
| 301 | +// float relativeY = event.getY() <= splitY ? event.getY() : (event.getY() - screenHeight); |
302 | 302 | // |
303 | 303 | // tvTouch.setText(Calendar.getInstance().getTime().toLocaleString() + " " + InputUtil.getActionName(event.getAction()) + "\nx:" + event.getX() + "; y:" + event.getY() + "; relativeY: " + relativeY + "; pointerCount: " + event.getPointerCount() + "\n" + s); |
304 | 304 | //// Toast.makeText(context, "vTouch.action:" + (event.getAction()) + "; x:" + event.getX() + "; y:" + event.getY(), Toast.LENGTH_SHORT).show(); |
@@ -387,12 +387,12 @@ public void record(View v) { |
387 | 387 |
|
388 | 388 |
|
389 | 389 | // private IFloatWindow floatCover; |
390 | | -// private IFloatWindow floatDivider; |
| 390 | +// private IFloatWindow floatSplitY; |
391 | 391 | // |
392 | 392 | // private void showCover(boolean show, Activity activity) { |
393 | 393 | // //TODO 为纵屏、横屏分别加两套,判断屏幕方向来显示对应的一套 |
394 | | -//// rlUIAutoDivider.setVisibility(show ? View.VISIBLE : View.GONE); |
395 | | -//// rlUIAutoDivider.setY(dividerY + dividerHeight/2); |
| 394 | +//// rlUIAutoSplitY.setVisibility(show ? View.VISIBLE : View.GONE); |
| 395 | +//// rlUIAutoSplitY.setY(splitY + splitHeight/2); |
396 | 396 | // |
397 | 397 | // floatCover = FloatWindow.get("v"); |
398 | 398 | // if (floatCover == null) { |
@@ -415,26 +415,26 @@ public void record(View v) { |
415 | 415 | // floatCover.show(); |
416 | 416 | // |
417 | 417 | // |
418 | | -// floatDivider = FloatWindow.get("v_ball"); |
419 | | -// if (floatDivider == null) { |
| 418 | +// floatSplitY = FloatWindow.get("v_ball"); |
| 419 | +// if (floatSplitY == null) { |
420 | 420 | // FloatWindow |
421 | 421 | // .with(getApplicationContext()) |
422 | 422 | // .setTag("v_ball") |
423 | | -// .setView(divider) |
| 423 | +// .setView(split) |
424 | 424 | // .setWidth(windowWidth) //设置控件宽高 |
425 | | -// .setHeight((int) dividerHeight) |
| 425 | +// .setHeight((int) splitHeight) |
426 | 426 | // .setX(0) //设置控件初始位置 |
427 | | -// .setY((int) (windowY + dividerY - dividerHeight/2)) |
| 427 | +// .setY((int) (windowY + splitY - splitHeight/2)) |
428 | 428 | //// .setY(screenHeight/2) |
429 | 429 | // .setMoveType(MoveType.slide) |
430 | 430 | // .setDesktopShow(true) //必须为 true,否则切换 Activity 就会自动隐藏 //桌面显示 |
431 | 431 | //// .setViewStateListener(mViewStateListener) //监听悬浮控件状态改变 |
432 | 432 | //// .setPermissionListener(mPermissionListener) //监听权限申请结果 |
433 | 433 | // .build(); |
434 | 434 | // |
435 | | -// floatDivider = FloatWindow.get("v_ball"); |
| 435 | +// floatSplitY = FloatWindow.get("v_ball"); |
436 | 436 | // } |
437 | | -// floatDivider.show(); |
| 437 | +// floatSplitY.show(); |
438 | 438 | // |
439 | 439 | // //TODO 新建一个 have already added to window manager |
440 | 440 | // |
@@ -458,11 +458,11 @@ public void record(View v) { |
458 | 458 | //// FloatWindow |
459 | 459 | //// .with(getApplicationContext()) |
460 | 460 | //// .setTag("h_ball") |
461 | | -//// .setView(divider) |
| 461 | +//// .setView(split) |
462 | 462 | //// .setWidth(screenWidth) //设置控件宽高 |
463 | | -//// .setHeight((int) dividerHeight) |
| 463 | +//// .setHeight((int) splitHeight) |
464 | 464 | //// .setX(0) //设置控件初始位置 |
465 | | -//// .setY((int) (dividerY + dividerHeight/2)) |
| 465 | +//// .setY((int) (splitY + splitHeight/2)) |
466 | 466 | ////// .setY(screenHeight/2) |
467 | 467 | //// .setMoveType(MoveType.slide) |
468 | 468 | //// .setDesktopShow(true) //桌面显示 |
@@ -525,17 +525,17 @@ public void record(View v) { |
525 | 525 | // } |
526 | 526 | // |
527 | 527 | // |
528 | | -//// float dividerY = rlUIAutoDivider.getY() + rlUIAutoDivider.getHeight()/2; |
529 | | -//// float dividerY = floatDivider.getY() + rlUIAutoDivider.getHeight()/2; |
530 | | -//// float relativeY = event.getY() <= dividerY ? event.getY() : (event.getY() - screenHeight); |
| 528 | +//// float splitY = rlUIAutoSplitY.getY() + rlUIAutoSplitY.getHeight()/2; |
| 529 | +//// float splitY = floatSplitY.getY() + rlUIAutoSplitY.getHeight()/2; |
| 530 | +//// float relativeY = event.getY() <= splitY ? event.getY() : (event.getY() - screenHeight); |
531 | 531 | //// |
532 | 532 | //// JSONObject obj = new JSONObject(true); |
533 | 533 | //// obj.put("id", - System.currentTimeMillis()); |
534 | 534 | //// obj.put("flowId", flowId); |
535 | 535 | //// obj.put("action", event.getAction()); |
536 | 536 | //// obj.put("x", (int) event.getX()); |
537 | 537 | //// obj.put("y", (int) relativeY); |
538 | | -//// obj.put("dividerY", (int) dividerY); |
| 538 | +//// obj.put("splitY", (int) splitY); |
539 | 539 | //// obj.put("rawX", (int) event.getRawX()); |
540 | 540 | //// obj.put("rawY", (int) event.getRawY()); |
541 | 541 | //// obj.put("time", System.currentTimeMillis()); |
@@ -576,7 +576,7 @@ public void record(View v) { |
576 | 576 | // |
577 | 577 | // @Override |
578 | 578 | // protected void onDestroy() { |
579 | | -// cache.edit().remove(DIVIDER_Y).putFloat(DIVIDER_Y, rlUIAutoDivider.getY() + rlUIAutoDivider.getHeight()/2).apply(); |
| 579 | +// cache.edit().remove(SPLIT_Y).putFloat(SPLIT_Y, rlUIAutoSplitY.getY() + rlUIAutoSplitY.getHeight()/2).apply(); |
580 | 580 | // super.onDestroy(); |
581 | 581 | // } |
582 | 582 | // |
@@ -613,7 +613,7 @@ public void record(View v) { |
613 | 613 | // firstCurTime = 0; |
614 | 614 | // if (firstTime > 0) { |
615 | 615 | // firstCurTime = System.currentTimeMillis(); |
616 | | -// pbUIAutoDivider.setVisibility(View.VISIBLE); |
| 616 | +// pbUIAutoSplit.setVisibility(View.VISIBLE); |
617 | 617 | // |
618 | 618 | // for (int i = 0; i < touchList.size(); i++) { |
619 | 619 | // JSONObject obj = touchList.getJSONObject(i); |
@@ -739,15 +739,15 @@ public void record(View v) { |
739 | 739 | // } |
740 | 740 | // |
741 | 741 | // private JSONArray addInputEvent(InputEvent ie, Activity activity) { |
742 | | -// int dividerY = floatDivider.getY() + rlUIAutoDivider.getHeight()/2; |
| 742 | +// int splitY = floatSplitY.getY() + rlUIAutoSplitY.getHeight()/2; |
743 | 743 | // int orientation = activity == null ? Configuration.ORIENTATION_PORTRAIT : activity.getResources().getConfiguration().orientation; |
744 | 744 | // |
745 | 745 | // JSONObject obj = new JSONObject(true); |
746 | 746 | // obj.put("id", - System.currentTimeMillis()); |
747 | 747 | // obj.put("flowId", flowId); |
748 | 748 | // obj.put("time", System.currentTimeMillis()); |
749 | 749 | // obj.put("orientation", orientation); |
750 | | -// obj.put("dividerY", dividerY); |
| 750 | +// obj.put("splitY", splitY); |
751 | 751 | // |
752 | 752 | // if (ie instanceof KeyEvent) { |
753 | 753 | // KeyEvent event = (KeyEvent) ie; |
@@ -784,7 +784,7 @@ public void record(View v) { |
784 | 784 | // obj.put("deviceId", event.getDeviceId()); |
785 | 785 | // //虽然 KeyEvent 和 MotionEvent 都有,但都不在父类 InputEvent 中 >>>>>>>>>>>>>>>>>> |
786 | 786 | // |
787 | | -// float relativeY = event.getY() <= dividerY ? event.getY() : (event.getY() - screenHeight); |
| 787 | +// float relativeY = event.getY() <= splitY ? event.getY() : (event.getY() - screenHeight); |
788 | 788 | // |
789 | 789 | // obj.put("x", (int) event.getX()); |
790 | 790 | // obj.put("y", (int) relativeY); |
|