v2.4.1 for Android 5.0+ release!

padeoe · padeoe · commit 0d167678ce1c · 2015-11-21T20:20:39.000+08:00
diff --git a/BUILDING.md b/BUILDING.md
@@ -0,0 +1,20 @@
+## Building the app
+1. 安装以下软件:
+       - Android SDK:
+         http://developer.android.com/sdk/index.html
+       - Gradle:
+         http://www.gradle.org/downloads
+       - Android Studio:
+         http://developer.android.com/sdk/installing/studio.html
+2. 运行sdk manager(可以在Android Studio中工具栏上点击按钮或者在命令行中输入android打开），确保以下内容已安装：
+       - Tools > Android SDK Platform-tools (rev 22 or above)
+       - Tools > Android SDK Tools (rev 24.3.3 or above)
+       - Tools > Android SDK Build-tools version 20
+       - Tools > Android SDK Build-tools version 21 (rev 22.0.1 or above)
+       - Android 4.0.3 > SDK Platform (API 15)
+       - Android 5.0.1 > SDK Platform (API 21)
+3. 将工程导入Android Studio:
+    1. 点击 File > Import Project
+    2. 切换到工程中的 settings.gradle 文件并选择
+    3. 点击 OK
+4. 点击运行或者使用快捷键shift+F10
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.padeoe.autoconnect"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1
-        versionName "2.4"
+        versionCode 2112241
+        versionName "2.4.1"
     }
     buildTypes {
         release {
@@ -38,5 +38,5 @@ dependencies {
     compile 'cn.leancloud.android:avoscloud-sdk:v3.3+'
     compile 'cn.leancloud.android:Java-WebSocket:1.2.0-leancloud'
     compile 'cn.leancloud.android:avoscloud-statistics:v3.3+@aar'
-    compile 'com.android.support:support-v4:23.0.0'
+    compile 'com.android.support:support-v4:23.1.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
         </activity>
 
         <service
-            android:name=".service.WiFiDetectService"
+            android:name=".service.ConnectService"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
diff --git a/app/src/main/java/com/padeoe/autoconnect/activity/App.java b/app/src/main/java/com/padeoe/autoconnect/activity/App.java
@@ -3,18 +3,20 @@
 import android.app.Application;
 import android.content.Context;
 
+import com.avos.avoscloud.AVOSCloud;
+
 /**
  * Created by padeoe on 2015/7/2.
  */
 public class App extends Application {
-    public static final String LOGINURL = "http://219.219.114.15/portal_io/login";
-    public static final String LOGOUTURL = "http://219.219.114.15/portal_io/logout";
     public static Context context;
 
     @Override
     public void onCreate() {
         super.onCreate();
         context = getApplicationContext();
+        //添加LeanCloud用户统计分析，下面一行代码中的key仅用于测试，发布的apk中使用的不同
+        AVOSCloud.initialize(this, "rfdbmj8hpdbo3dwx2unrqmvhfb2y8r6d3xrsaiwwoewr2bc4", "c6n60q7onyffn97vey1jywk3bje590xlntp8ddasdo0hnvcy");
     }
 
 }
diff --git a/app/src/main/java/com/padeoe/autoconnect/activity/MainActivity.java b/app/src/main/java/com/padeoe/autoconnect/activity/MainActivity.java
@@ -38,12 +38,12 @@
 import com.avos.avoscloud.AVObject;
 import com.avos.avoscloud.AVQuery;
 import com.avos.avoscloud.FindCallback;
+import com.padeoe.autoconnect.service.ConnectService;
 import com.padeoe.autoconnect.service.InstallService;
 import com.padeoe.autoconnect.ui.CaptivePortalLoginFragment;
 import com.padeoe.autoconnect.ui.ExplainPermissionFragment;
 import com.padeoe.autoconnect.util.ResultUtils;
 import com.padeoe.autoconnect.R;
-import com.padeoe.autoconnect.service.WiFiDetectService;
 import com.padeoe.autoconnect.ui.AboutDialogFragment;
 import com.padeoe.autoconnect.ui.CheckUpdateFragment;
 import com.padeoe.autoconnect.ui.SettingDialogFragment;
@@ -66,23 +66,26 @@ public class MainActivity extends Activity implements CheckUpdateFragment.Update
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+/*        Log.e("time", "开始计时");
+        Timer t = new Timer();
+        t.start();*/
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        //添加LeanCloud用户统计分析，下面一行代码中的key仅用于测试，发布的apk中使用的不同
-        AVOSCloud.initialize(this, "rfdbmj8hpdbo3dwx2unrqmvhfb2y8r6d3xrsaiwwoewr2bc4", "c6n60q7onyffn97vey1jywk3bje590xlntp8ddasdo0hnvcy");
-
         //获取现有配置
         sharedPreferences = App.context.getSharedPreferences("DataFile", MODE_PRIVATE);
         editor = sharedPreferences.edit();
-        String username = sharedPreferences.getString("username", null);
-        String password = sharedPreferences.getString("password", null);
+/*        String username = sharedPreferences.getString("username", null);
+        String password = sharedPreferences.getString("password", null);*/
+        String username=ConnectService.getUsername();
+        String password=ConnectService.getPassword();
         //显示现有配置
         usernameEdit = (EditText) findViewById(R.id.username);
         passwordEdit = (EditText) findViewById(R.id.password);
         if (username != null) usernameEdit.setText(username);
         if (password != null) passwordEdit.setText(password);
         if (username != null & password != null) {
-            this.startService(new Intent(this, WiFiDetectService.class));
+            this.startService(new Intent(this, ConnectService.class));
         }
 
         final ListView listview = (ListView) findViewById(R.id.listview);
@@ -138,7 +141,7 @@ public void onClick(DialogInterface dialog, int id) {
             AlertDialog dialog = builder.create();
             dialog.show();
         }
-
+        /*Log.e("time", t.end() + "ms");*/
     }
 
     /**
@@ -161,7 +164,7 @@ public void updateClick(DialogFragment dialog) {
      */
     @Override
     public void explainOverClick(DialogFragment dialog) {
-        requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
     }
 
     private class StableArrayAdapter extends ArrayAdapter<String> {
@@ -265,7 +268,7 @@ public void connectNow() {
                 ReturnData returnData = null;
                 returnData = ReturnData.getFromJson(connectResult);
                 if (returnData != null && returnData.getReply_message().equals("登录成功!")) {
-                    App.context.startService(new Intent(App.context, WiFiDetectService.class));
+                    App.context.startService(new Intent(App.context, ConnectService.class));
                     if (sharedPreferences.getString("username", null) == null) {
                         storeInfo();
                     }
@@ -290,14 +293,10 @@ public void connectNow() {
     public void storeInfo() {
         String username = usernameEdit.getText().toString();
         String password = passwordEdit.getText().toString();
-        editor.putString("username", username);
-        editor.putString("password", password);
-        editor.commit();
         if (username.length() > 0 && password.length() > 0) {
-            editor.putString("username", username);
-            editor.putString("password", password);
-            editor.commit();
-            App.context.startService(new Intent(App.context, WiFiDetectService.class));
+            ConnectService.setUsername(username);
+            ConnectService.setPassword(password);
+            App.context.startService(new Intent(App.context, ConnectService.class));
             Log.i("配置文件", "保存了用户名密码");
             Log.i("保存", " 保存后开启了服务");
             ShowOnMainActivity((String) getResources().getText(R.string.saved_success));
@@ -368,8 +367,7 @@ public void allowStatics(View view) {
     }
 
     public void staticsButtonOnClicked(boolean allow) {
-        editor.putBoolean("allow_statistics", allow);
-        editor.commit();
+        ConnectService.setAllowStatistics(allow);
         if (allow) {
             Toast.makeText(App.context, (String) getResources().getText(R.string.have_allowed_statistics), Toast.LENGTH_SHORT).show();
             AVObject Like = new AVObject("AllowData");
@@ -444,7 +442,6 @@ private void downloadNow() {
      * @param permissions
      * @param grantResults
      */
-
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            String permissions[], int[] grantResults) {
@@ -527,3 +524,17 @@ public void done(List<AVObject> avObjects, AVException e) {
 
 };
 
+/**
+ * 用于实验缓存多大时文件读写速度最快，测量所用时间
+ */
+/*class Timer {
+    long s;
+    public long start() {
+        s = System.currentTimeMillis();
+        return s;
+    }
+    public long end() {
+        return System.currentTimeMillis() - s;
+    }
+}*/
+
diff --git a/app/src/main/java/com/padeoe/autoconnect/receiver/BootReceiver.java b/app/src/main/java/com/padeoe/autoconnect/receiver/BootReceiver.java
@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 
-import com.padeoe.autoconnect.service.WiFiDetectService;
+import com.padeoe.autoconnect.service.ConnectService;
 
 public class BootReceiver extends BroadcastReceiver {
     @Override
@@ -15,7 +15,7 @@ public void onReceive(Context context, Intent intent) {
             boolean isBanned = sharedPreferences.getBoolean("isBanned", false);
             String PostData = sharedPreferences.getString("PostData", null);
             if (!isBanned && PostData != null && PostData.length() > 0) {
-                context.startService(new Intent(context, WiFiDetectService.class));
+                context.startService(new Intent(context, ConnectService.class));
             }
         }
     }
diff --git a/app/src/main/java/com/padeoe/autoconnect/receiver/NetworkConnectChangedReceiver.java b/app/src/main/java/com/padeoe/autoconnect/receiver/NetworkConnectChangedReceiver.java
@@ -10,7 +10,7 @@
 import android.util.Log;
 
 import com.avos.avoscloud.AVAnalytics;
-import com.padeoe.autoconnect.service.WiFiDetectService;
+import com.padeoe.autoconnect.service.ConnectService;
 import com.padeoe.nicservice.njuwlan.service.LoginService;
 
 /**
@@ -32,19 +32,19 @@ public void onReceive(final Context context, Intent intent) {
                     WifiInfo wifiInfo = mWifi.getConnectionInfo();
                     Log.d("wifiInfo:", wifiInfo.getSSID());
                     if (wifiInfo.getSSID().equals("\"NJU-FAST\"") || wifiInfo.getSSID().equals("\"NJU-WLAN\"")) {
-                        Log.d("后台wifi连接检测", "是目标wifi");
+                        Log.i("后台登陆", "是目标ssid");
                         if (i == 1) {
                             new Thread() {
                                 @Override
                                 public void run() {
                                     try {
-                                        if (WiFiDetectService.username != null & WiFiDetectService.password != null) {
+                                        if (ConnectService.getUsername() != null & ConnectService.getPassword() != null) {
                                             Thread.sleep(200);
                                             for (int i = 0; i < 5; i++) {
                                                 Log.i("后台登陆","第"+i+"次尝试");
-                                                if (LoginService.getInstance().isLoginSuccess(LoginService.getInstance().connect(WiFiDetectService.username, WiFiDetectService.password))) {
+                                                if (LoginService.isLoginSuccess(LoginService.getInstance().connect(ConnectService.getUsername(), ConnectService.getPassword()))) {
                                                     Log.i("后台登陆","后台登陆成功");
-                                                    if (WiFiDetectService.allowStatistics) {
+                                                    if (ConnectService.isAllowStatistics()) {
                                                         AVAnalytics.onEvent(context, "后台自动登陆NJU-WLAN成功");
                                                     }
                                                     break;
@@ -65,7 +65,7 @@ public void run() {
                         } else
                             i++;
                     } else {
-                        Log.i("RESULT", "SSID不是目标");
+                        Log.i("RESULT", "SSID不是目标，SSID是"+wifiInfo.getSSID());
                     }
                 }
             }
diff --git a/app/src/main/java/com/padeoe/autoconnect/service/ConnectService.java b/app/src/main/java/com/padeoe/autoconnect/service/ConnectService.java
@@ -0,0 +1,87 @@
+package com.padeoe.autoconnect.service;
+
+import android.app.Service;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.net.wifi.WifiManager;
+import android.os.IBinder;
+
+import com.padeoe.autoconnect.activity.App;
+import com.padeoe.autoconnect.receiver.NetworkConnectChangedReceiver;
+
+public class ConnectService extends Service {
+    private static boolean allowStatistics=false;
+    private static String username;
+    private static String password;
+    static final SharedPreferences sharedPreferences = App.context.getSharedPreferences("DataFile", 0);
+    static SharedPreferences.Editor editor = sharedPreferences.edit();
+    NetworkConnectChangedReceiver networkConnectChangedReceiver=new NetworkConnectChangedReceiver();
+    @Override
+    public IBinder onBind(Intent intent) {
+        // TODO: Return the communication channel to the service.
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @Override
+    public void onCreate() {
+        System.out.println("onCreate"+"正在读文件");
+        // TODO Auto-generated method stub
+        super.onCreate();
+        username = sharedPreferences.getString("username", null);
+        password = sharedPreferences.getString("password", null);
+        allowStatistics = sharedPreferences.getBoolean("allow_statistics", false);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+        registerReceiver(networkConnectChangedReceiver, filter);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        System.out.println("onDestroyed");
+        unregisterReceiver(networkConnectChangedReceiver);
+    }
+
+    public static boolean isAllowStatistics() {
+        return allowStatistics;
+    }
+
+    public static void setAllowStatistics(boolean allowStatistics) {
+        ConnectService.allowStatistics = allowStatistics;
+        editor.putBoolean("allow_statistics",allowStatistics);
+        editor.apply();
+    }
+
+    public static String getUsername() {
+        if(username==null){
+            System.out.println("正在读文件");
+            username=sharedPreferences.getString("username",null);
+        }
+        return username;
+    }
+
+    public static void setUsername(String username) {
+        ConnectService.username = username;
+        editor.putString("username",username);
+        editor.apply();
+    }
+
+    public static String getPassword() {
+        if(password==null){
+            System.out.println("正在读文件");
+            password=sharedPreferences.getString("password",null);
+        }
+        return password;
+    }
+
+    public static void setPassword(String password) {
+        ConnectService.password = password;
+        editor.putString("password", password);
+        editor.apply();
+    }
+
+}
+
diff --git a/app/src/main/java/com/padeoe/autoconnect/service/WiFiDetectService.java b/app/src/main/java/com/padeoe/autoconnect/service/WiFiDetectService.java
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`import android.content.Intent;`
`6`	`6`	`import android.content.SharedPreferences;`
`7`	`7`
`8`		`-import com.padeoe.autoconnect.service.WiFiDetectService;`
	`8`	`+import com.padeoe.autoconnect.service.ConnectService;`
`9`	`9`
`10`	`10`	`public class BootReceiver extends BroadcastReceiver {`
`11`	`11`	`@Override`
`@@ -15,7 +15,7 @@ public void onReceive(Context context, Intent intent) {`
`15`	`15`	`boolean isBanned = sharedPreferences.getBoolean("isBanned", false);`
`16`	`16`	`String PostData = sharedPreferences.getString("PostData", null);`
`17`	`17`	`if (!isBanned && PostData != null && PostData.length() > 0) {`
`18`		`- context.startService(new Intent(context, WiFiDetectService.class));`
	`18`	`+ context.startService(new Intent(context, ConnectService.class));`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`