Skip to content

Commit 0d61246

Browse files
pansong291pansong291
committed
修复使用其他浏览器打开失效问题
1 parent 9bd46c2 commit 0d61246

File tree

4 files changed

+50
-45
lines changed

4 files changed

+50
-45
lines changed

‎app/src/main/java/pansong291/xposed/quickenergy/ui/EditDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void onClick(DialogInterface p1, int p2)
6464
break;
6565

6666
case THREAD_COUNT:
67-
if(i > 0)
67+
if(i >= 0)
6868
Config.setThreadCount(i);
6969
break;
7070

‎app/src/main/java/pansong291/xposed/quickenergy/ui/HtmlViewerActivity.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.os.Bundle;
88
import android.view.Menu;
99
import android.view.MenuItem;
10+
import android.widget.Toast;
1011

1112
public class HtmlViewerActivity extends Activity
1213
{
@@ -27,13 +28,8 @@ protected void onCreate(Bundle savedInstanceState)
2728
@Override
2829
public boolean onCreateOptionsMenu(Menu menu)
2930
{
30-
Intent it = new Intent(Intent.ACTION_VIEW);
31-
it.addCategory(Intent.CATEGORY_DEFAULT);
32-
it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
33-
it.setDataAndType(uri, "text/html");
34-
menu.add(0, 1, 0, "Open with other browser")
35-
.setIntent(Intent.createChooser(it, "Choose a browser"));
36-
menu.add(0,2,0,"Copy the url");
31+
menu.add(0, 1, 0, "Open with other browser");
32+
menu.add(0, 2, 0, "Copy the url");
3733
menu.add(0, 3, 0, "Scroll to top");
3834
menu.add(0, 4, 0, "Scroll to bottom");
3935
return super.onCreateOptionsMenu(menu);
@@ -44,11 +40,20 @@ public boolean onOptionsItemSelected(MenuItem item)
4440
{
4541
switch(item.getItemId())
4642
{
43+
case 1:
44+
Intent it = new Intent(Intent.ACTION_VIEW);
45+
it.addCategory(Intent.CATEGORY_DEFAULT);
46+
it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
47+
it.setDataAndType(uri, "text/html");
48+
startActivity(Intent.createChooser(it, "Choose a browser"));
49+
break;
50+
4751
case 2:
4852
ClipboardManager cm = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
4953
cm.setText(uri.toString());
54+
Toast.makeText(this, "Copy success", 0).show();
5055
break;
51-
56+
5257
case 3:
5358
mWebView.scrollTo(0, 0);
5459
break;

‎app/src/main/java/pansong291/xposed/quickenergy/ui/MainActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public boolean onCreateOptionsMenu(Menu menu)
7272
menu.add(0, 1, 0, "Hide the application icon")
7373
.setCheckable(true)
7474
.setChecked(state > PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
75-
menu.add(0, 2, 0, "Export statistic file");
76-
menu.add(0, 3, 0, "Import statistic file");
75+
menu.add(0, 2, 0, "Export the statistic file");
76+
menu.add(0, 3, 0, "Import the statistic file");
7777
menu.add(0, 4, 0, "Settings");
7878
return super.onCreateOptionsMenu(menu);
7979
}

‎app/src/main/res/layout/include_settings.xml

+34-34
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
android:layout_height="wrap_content"
8080
style="?android:attr/buttonBarButtonStyle"
8181
android:text="Check interval (minutes)"
82-
android:textAllCaps="false"
82+
android:textAllCaps="false"
8383
android:onClick="onClick"
8484
android:minHeight="50dp"
8585
android:gravity="left|center_vertical"
@@ -92,7 +92,7 @@
9292
android:layout_height="wrap_content"
9393
style="?android:attr/buttonBarButtonStyle"
9494
android:text="Thread count"
95-
android:textAllCaps="false"
95+
android:textAllCaps="false"
9696
android:onClick="onClick"
9797
android:minHeight="50dp"
9898
android:gravity="left|center_vertical"
@@ -105,7 +105,7 @@
105105
android:layout_height="wrap_content"
106106
style="?android:attr/buttonBarButtonStyle"
107107
android:text="Advance time (milliseconds)"
108-
android:textAllCaps="false"
108+
android:textAllCaps="false"
109109
android:onClick="onClick"
110110
android:minHeight="50dp"
111111
android:gravity="left|center_vertical"
@@ -118,7 +118,7 @@
118118
android:layout_height="wrap_content"
119119
style="?android:attr/buttonBarButtonStyle"
120120
android:text="Collect interval (milliseconds)"
121-
android:textAllCaps="false"
121+
android:textAllCaps="false"
122122
android:onClick="onClick"
123123
android:minHeight="50dp"
124124
android:gravity="left|center_vertical"
@@ -131,7 +131,7 @@
131131
android:layout_height="wrap_content"
132132
style="?android:attr/buttonBarButtonStyle"
133133
android:text="Collect timeout (seconds)"
134-
android:textAllCaps="false"
134+
android:textAllCaps="false"
135135
android:onClick="onClick"
136136
android:minHeight="50dp"
137137
android:gravity="left|center_vertical"
@@ -143,8 +143,8 @@
143143
android:layout_width="match_parent"
144144
android:layout_height="wrap_content"
145145
style="?android:attr/buttonBarButtonStyle"
146-
android:text="Water three times while collect X"
147-
android:textAllCaps="false"
146+
android:text="Return water 30"
147+
android:textAllCaps="false"
148148
android:onClick="onClick"
149149
android:minHeight="50dp"
150150
android:gravity="left|center_vertical"
@@ -156,8 +156,8 @@
156156
android:layout_width="match_parent"
157157
android:layout_height="wrap_content"
158158
style="?android:attr/buttonBarButtonStyle"
159-
android:text="Water twice while collect X"
160-
android:textAllCaps="false"
159+
android:text="Return water 20"
160+
android:textAllCaps="false"
161161
android:onClick="onClick"
162162
android:minHeight="50dp"
163163
android:gravity="left|center_vertical"
@@ -169,8 +169,8 @@
169169
android:layout_width="match_parent"
170170
android:layout_height="wrap_content"
171171
style="?android:attr/buttonBarButtonStyle"
172-
android:text="Water once while collect X"
173-
android:textAllCaps="false"
172+
android:text="Return water 10"
173+
android:textAllCaps="false"
174174
android:onClick="onClick"
175175
android:minHeight="50dp"
176176
android:gravity="left|center_vertical"
@@ -191,7 +191,7 @@
191191
android:layout_height="wrap_content"
192192
style="?android:attr/buttonBarButtonStyle"
193193
android:text="Don't collect list"
194-
android:textAllCaps="false"
194+
android:textAllCaps="false"
195195
android:onClick="onClick"
196196
android:minHeight="50dp"
197197
android:gravity="left|center_vertical"
@@ -204,7 +204,7 @@
204204
android:layout_height="wrap_content"
205205
style="?android:attr/buttonBarButtonStyle"
206206
android:text="Don't help collect list"
207-
android:textAllCaps="false"
207+
android:textAllCaps="false"
208208
android:onClick="onClick"
209209
android:minHeight="50dp"
210210
android:gravity="left|center_vertical"
@@ -225,7 +225,7 @@
225225
android:layout_height="wrap_content"
226226
style="?android:attr/buttonBarButtonStyle"
227227
android:text="Water friend list"
228-
android:textAllCaps="false"
228+
android:textAllCaps="false"
229229
android:onClick="onClick"
230230
android:minHeight="50dp"
231231
android:gravity="left|center_vertical"
@@ -246,7 +246,7 @@
246246
android:layout_height="wrap_content"
247247
style="?android:attr/buttonBarButtonStyle"
248248
android:text="Cooperate water list"
249-
android:textAllCaps="false"
249+
android:textAllCaps="false"
250250
android:onClick="onClick"
251251
android:minHeight="50dp"
252252
android:gravity="left|center_vertical"
@@ -298,7 +298,7 @@
298298
android:layout_height="wrap_content"
299299
style="?android:attr/buttonBarButtonStyle"
300300
android:text="Send type"
301-
android:textAllCaps="false"
301+
android:textAllCaps="false"
302302
android:onClick="onClick"
303303
android:minHeight="50dp"
304304
android:gravity="left|center_vertical"
@@ -311,7 +311,7 @@
311311
android:layout_height="wrap_content"
312312
style="?android:attr/buttonBarButtonStyle"
313313
android:text="Don't send firend list"
314-
android:textAllCaps="false"
314+
android:textAllCaps="false"
315315
android:onClick="onClick"
316316
android:minHeight="50dp"
317317
android:gravity="left|center_vertical"
@@ -324,7 +324,7 @@
324324
android:layout_height="wrap_content"
325325
style="?android:attr/buttonBarButtonStyle"
326326
android:text="Recall animal type"
327-
android:textAllCaps="false"
327+
android:textAllCaps="false"
328328
android:onClick="onClick"
329329
android:minHeight="50dp"
330330
android:gravity="left|center_vertical"
@@ -401,7 +401,7 @@
401401
android:layout_height="wrap_content"
402402
style="?android:attr/buttonBarButtonStyle"
403403
android:text="Feed friend animal list"
404-
android:textAllCaps="false"
404+
android:textAllCaps="false"
405405
android:onClick="onClick"
406406
android:minHeight="50dp"
407407
android:gravity="left|center_vertical"
@@ -422,7 +422,7 @@
422422
android:layout_height="wrap_content"
423423
style="?android:attr/buttonBarButtonStyle"
424424
android:text="Don't notify friend list"
425-
android:textAllCaps="false"
425+
android:textAllCaps="false"
426426
android:onClick="onClick"
427427
android:minHeight="50dp"
428428
android:gravity="left|center_vertical"
@@ -453,21 +453,21 @@
453453
android:minHeight="50dp"
454454
android:id="@+id/cb_receivePoint"/>
455455

456-
<CheckBox
457-
android:layout_width="match_parent"
458-
android:layout_height="wrap_content"
459-
android:text="Open treasure box"
460-
android:onClick="onClick"
461-
android:minHeight="50dp"
456+
<CheckBox
457+
android:layout_width="match_parent"
458+
android:layout_height="wrap_content"
459+
android:text="Open treasure box"
460+
android:onClick="onClick"
461+
android:minHeight="50dp"
462462
android:id="@+id/cb_openTreasureBox"/>
463463

464-
<CheckBox
465-
android:layout_width="match_parent"
466-
android:layout_height="wrap_content"
467-
android:text="Koubei sign in"
468-
android:onClick="onClick"
469-
android:minHeight="50dp"
470-
android:id="@+id/cb_kbSignIn"/>
464+
<CheckBox
465+
android:layout_width="match_parent"
466+
android:layout_height="wrap_content"
467+
android:text="Koubei sign in"
468+
android:onClick="onClick"
469+
android:minHeight="50dp"
470+
android:id="@+id/cb_kbSignIn"/>
471471

472472
</LinearLayout>
473473

@@ -489,7 +489,7 @@
489489
android:layout_height="wrap_content"
490490
style="?android:attr/buttonBarButtonStyle"
491491
android:text="Support developer"
492-
android:textAllCaps="false"
492+
android:textAllCaps="false"
493493
android:onClick="onClick"
494494
android:minHeight="50dp"
495495
android:gravity="left|center_vertical"

0 commit comments

Comments
 (0)