Skip to content

Commit 68ad239

Browse files
author
Your Name
committed
忘了改了啥
1 parent aba3491 commit 68ad239

File tree

13 files changed

+151
-138
lines changed

13 files changed

+151
-138
lines changed

app/app.iml

+13-17
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -93,8 +93,6 @@
9393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.0.0/jars" />
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars" />
9595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.0.0/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/8.1.0/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.1.0/jars" />
9896
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9997
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
10098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
@@ -116,19 +114,17 @@
116114
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
117115
<orderEntry type="sourceFolder" forTests="false" />
118116
<orderEntry type="library" exported="" name="recyclerview-v7-24.0.0" level="project" />
119-
<orderEntry type="library" exported="" name="play-services-appindexing-8.1.0" level="project" />
117+
<orderEntry type="library" exported="" name="design-24.0.0" level="project" />
118+
<orderEntry type="library" exported="" name="api-82-sources" level="project" />
119+
<orderEntry type="library" exported="" name="hamcrest-core-1.3" level="project" />
120+
<orderEntry type="library" exported="" name="junit-4.12" level="project" />
120121
<orderEntry type="library" exported="" name="appcompat-v7-24.0.0" level="project" />
122+
<orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
121123
<orderEntry type="library" exported="" name="api-82" level="project" />
122124
<orderEntry type="library" exported="" name="1_api-82" level="project" />
123-
<orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
124125
<orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
125126
<orderEntry type="library" exported="" name="support-vector-drawable-24.0.0" level="project" />
126127
<orderEntry type="library" exported="" name="animated-vector-drawable-24.0.0" level="project" />
127-
<orderEntry type="library" exported="" name="play-services-basement-8.1.0" level="project" />
128-
<orderEntry type="library" exported="" name="design-24.0.0" level="project" />
129-
<orderEntry type="library" exported="" name="api-82-sources" level="project" />
130-
<orderEntry type="library" exported="" name="hamcrest-core-1.3" level="project" />
131-
<orderEntry type="library" exported="" name="junit-4.12" level="project" />
132128
<orderEntry type="module" module-name="library" exported="" />
133129
</component>
134130
</module>

app/library/library.iml

+8-8
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -81,6 +73,14 @@
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />

app/src/main/AndroidManifest.xml

+10-9
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,19 @@
2222
android:theme="@style/AppTheme.NoActionBar">
2323
<intent-filter>
2424
<action android:name="android.intent.action.MAIN" />
25+
<category android:name="android.intent.category.LAUNCHER" />
2526
</intent-filter>
2627
</activity>
27-
<activity-alias
28-
android:name=".SplashActivity-Alias"
29-
android:enabled="true"
30-
android:targetActivity=".SplashActivity">
31-
<intent-filter>
32-
<action android:name="android.intent.action.MAIN" />
28+
<!--<activity-alias-->
29+
<!--android:name=".SplashActivity-Alias"-->
30+
<!--android:enabled="true"-->
31+
<!--android:targetActivity=".SplashActivity">-->
32+
<!--<intent-filter>-->
33+
<!--<action android:name="android.intent.action.MAIN" />-->
34+
<!--&lt;!&ndash;<category android:name="android.intent.category.LAUNCHER" />&ndash;&gt;-->
3335
<!--<category android:name="android.intent.category.LAUNCHER" />-->
34-
<category android:name="android.intent.category.LAUNCHER" />
35-
</intent-filter>
36-
</activity-alias>
36+
<!--</intent-filter>-->
37+
<!--</activity-alias>-->
3738

3839
<meta-data
3940
android:name="xposedmodule"

app/src/main/java/com/coderstory/miui_toolkit/AboutActivity.java

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import android.os.Bundle;
77
import android.view.View;
88

9+
import java.io.File;
10+
911
import me.imid.swipebacklayout.lib.SwipeBackLayout;
1012
import me.imid.swipebacklayout.lib.app.SwipeBackActivity;
1113

@@ -25,6 +27,7 @@ public void opneUrl(View view) {
2527
Intent intent = new Intent(Intent.ACTION_VIEW);
2628
intent.setData(Uri.parse("http://blog.coderstory.cn"));
2729
startActivity(intent);
30+
2831
}
2932
//打开支付宝
3033
public void alipay(View view) {
@@ -33,4 +36,5 @@ public void alipay(View view) {
3336
intent.setData(Uri.parse("https://qr.alipay.com/aex087445gnaa6gawjaohe8"));
3437
startActivity(intent);
3538
}
39+
3640
}

app/src/main/java/com/coderstory/miui_toolkit/FAQActivity.java

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import android.support.v7.app.AppCompatActivity;
44
import android.os.Bundle;
55

6+
import java.io.File;
7+
68
import me.imid.swipebacklayout.lib.SwipeBackLayout;
79
import me.imid.swipebacklayout.lib.app.SwipeBackActivity;
810

@@ -14,5 +16,6 @@ protected void onCreate(Bundle savedInstanceState) {
1416
setContentView(R.layout.activity_faq);
1517
getSwipeBackLayout().setSwipeMode(SwipeBackLayout.FULL_SCREEN_LEFT);
1618
getSwipeBackLayout().setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT);
19+
1720
}
1821
}

app/src/main/java/com/coderstory/miui_toolkit/MainActivity.java

+10-37
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import android.content.Intent;
1111
import android.content.SharedPreferences;
1212
import android.content.pm.PackageManager;
13-
import android.net.Uri;
1413
import android.os.AsyncTask;
1514
import android.os.Build;
1615
import android.os.Bundle;
@@ -24,11 +23,11 @@
2423
import android.view.View;
2524
import android.widget.CompoundButton;
2625
import android.widget.Switch;
27-
import android.widget.TextView;
2826
import android.widget.Toast;
2927

30-
import com.coderstory.miui_toolkit.tools.hosts;
28+
import com.coderstory.miui_toolkit.tools.HostsHelper;
3129

30+
import java.io.File;
3231
import java.io.IOException;
3332
import java.util.HashMap;
3433
import java.util.Map;
@@ -73,6 +72,7 @@ public void onClick(DialogInterface dialog, int which) {
7372
}).create();
7473
builder.show();
7574
}
75+
7676
}
7777

7878
/*初始化每一个布局上的按钮的状态并绑定事件
@@ -82,6 +82,7 @@ private void loadSettings(MainActivity mainActivity) {
8282
Boolean SetValue;
8383
Switch SwitchBtn;
8484

85+
8586
//移除搜索框
8687
SetValue = prefs.getBoolean("RemoveSearchBar", false);
8788
SwitchBtn = (Switch) mainActivity.findViewById(R.id.RemoveSearchBar);
@@ -169,20 +170,14 @@ private void loadSettings(MainActivity mainActivity) {
169170
SwitchBtn.setChecked(SetValue);
170171
}
171172
initControl(SwitchBtn, "root");
172-
173-
174-
175173
}
176-
177174
//初始化每个按钮的事件
178175
private void initControl(Switch SwitchBtn, final String key) {
179-
180176
SwitchBtn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
181177
@Override
182178
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
183179
editor.putBoolean(key, isChecked);
184180
editor.apply();
185-
186181
switch (key) {
187182
case "switchIcon":
188183
if (isChecked) {
@@ -211,20 +206,17 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
211206
}
212207
});
213208
}
214-
215209
@Override
216210
public boolean onCreateOptionsMenu(Menu menu) {
217211
// TODO Auto-generated method stub
218212
MenuInflater inflater = getMenuInflater();
219213
inflater.inflate(R.menu.menu, menu);
220214
return true;
221215
}
222-
223216
@Override
224217
public boolean onOptionsItemSelected(MenuItem item) {
225218
// TODO Auto-generated method stub
226219
int item_id = item.getItemId();
227-
228220
switch (item_id) {
229221
case R.id.hotboot:
230222
showTips("busybox killall system_server", getString(R.string.Tips_HotBoot), this);
@@ -244,7 +236,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
244236
}
245237
return true;
246238
}
247-
248239
/*实现弹窗确定执行某条命令*/
249240
public static void showTips(final String commandText, String messageText, final Context mContext) {
250241
AlertDialog builder = new AlertDialog.Builder(mContext)
@@ -253,12 +244,10 @@ public static void showTips(final String commandText, String messageText, final
253244
.setPositiveButton(R.string.Btn_Sure, new DialogInterface.OnClickListener() {
254245
@Override
255246
public void onClick(DialogInterface dialog, int which) {
256-
257247
if ("echo 1".equals(commandText)) {
258248
editor.putBoolean("getRoot", true);
259249
editor.apply();
260250
}
261-
262251
// String cmd = commandText;
263252
try {
264253
Runtime.getRuntime().exec(new String[]{"su", "-c", commandText});
@@ -277,7 +266,6 @@ public void onClick(DialogInterface dialog, int which) {
277266
System.exit(0);
278267
}
279268
dialog.cancel();
280-
281269
}
282270
}).create();
283271
builder.show();
@@ -286,30 +274,26 @@ public void openAbout(View v){
286274
Intent intent=new Intent(this,AboutActivity.class);
287275
startActivity(intent);
288276
}
289-
290277
//隐藏图标
291278
private void HideIcon() {
292-
ComponentName localComponentName = new ComponentName(this, getClass().getName() + "-Alias");
279+
ComponentName localComponentName = new ComponentName(this,"com.coderstory.miui_toolkit.SplashActivity");
293280
PackageManager localPackageManager = getPackageManager();
294281
localPackageManager.getComponentEnabledSetting(localComponentName);
295282
PackageManager packageManager = getPackageManager();
296-
ComponentName componentName = new ComponentName(this, getClass().getName() + "-Alias");
283+
ComponentName componentName = new ComponentName(this, "com.coderstory.miui_toolkit.SplashActivity");
297284
packageManager.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
298285
PackageManager.DONT_KILL_APP);
299286
}
300-
301287
//显示图标
302288
private void showIcon() {
303-
ComponentName localComponentName = new ComponentName(this, getClass().getName() + "-Alias");
289+
ComponentName localComponentName = new ComponentName(this, "com.coderstory.miui_toolkit.SplashActivity");
304290
PackageManager localPackageManager = getPackageManager();
305291
localPackageManager.getComponentEnabledSetting(localComponentName);
306292
PackageManager packageManager = getPackageManager();
307-
ComponentName componentName = new ComponentName(this, getClass().getName() + "-Alias");
293+
ComponentName componentName = new ComponentName(this, "com.coderstory.miui_toolkit.SplashActivity");
308294
packageManager.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
309295
PackageManager.DONT_KILL_APP);
310296
}
311-
312-
313297
//修改hosts的方法
314298
private void changeHosts() {
315299
boolean NoUpdate = prefs.getBoolean("NoUpdate", false); //1
@@ -333,14 +317,12 @@ private void changeHosts() {
333317
} else {
334318
setMap.put("RemoveAdshosts", "False");
335319
}
336-
337320
if (NoStore) {
338321
setMap.put("NoStore", "True");
339322
} else {
340323
setMap.put("NoStore", "False");
341324
}
342-
343-
hosts h = new hosts(MainActivity.this, setMap);
325+
HostsHelper h = new HostsHelper(MainActivity.this, setMap);
344326
if (!h.execute()) {
345327
Toast.makeText(MainActivity.this, R.string.Tips_No_Root, Toast.LENGTH_SHORT).show();
346328
Switch SwitchBtn = (Switch) MainActivity.this.findViewById(R.id.RemoveAdshosts);
@@ -349,35 +331,30 @@ private void changeHosts() {
349331
}
350332
}
351333
}
352-
353334
//因为hosts修改比较慢 所以改成异步的
354335
class MyTask extends AsyncTask<String, Integer, String> {
355336
@Override
356337
protected void onPreExecute() {
357338
setProgressBarIndeterminateVisibility(true);
358339
showProgress();
359340
}
360-
361341
@Override
362342
protected void onPostExecute(String param) {
363343
// showData();
364344
setProgressBarIndeterminateVisibility(false);
365345
// adapter.notifyDataSetChanged();
366346
closeProgress();
367347
}
368-
369348
@Override
370349
protected void onCancelled() {
371350
// TODO Auto-generated method stub
372351
super.onCancelled();
373352
}
374-
375353
@Override
376354
protected void onProgressUpdate(Integer... values) {
377355
// TODO Auto-generated method stub
378356
super.onProgressUpdate(values);
379357
}
380-
381358
@Override
382359
protected String doInBackground(String... params) {
383360
Looper.prepare();
@@ -386,9 +363,7 @@ protected String doInBackground(String... params) {
386363
return null;
387364
}
388365
}
389-
390366
private Dialog dialog;
391-
392367
protected void showProgress() {
393368
if (dialog == null) {
394369
// dialog.setContentView(R.layout.progress_dialog);
@@ -397,12 +372,10 @@ protected void showProgress() {
397372
dialog.show();
398373
}
399374
}
400-
401375
protected void closeProgress() {
402-
403376
if (dialog != null) {
404377
dialog.cancel();
405378
dialog = null;
406379
}
407380
}
408-
}
381+
}

0 commit comments

Comments
 (0)