diff --git a/C5/app/src/main/AndroidManifest.xml b/C5/app/src/main/AndroidManifest.xml
index d06ff8a..4f65db4 100644
--- a/C5/app/src/main/AndroidManifest.xml
+++ b/C5/app/src/main/AndroidManifest.xml
@@ -81,6 +81,17 @@
+
+
+
+
+
+
+
+
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
index 0fac1c9..9284242 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
@@ -6,12 +6,14 @@ import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.app.ProgressDialog;
+import android.app.usage.NetworkStats;
import android.content.BroadcastReceiver;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.graphics.Color;
+import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -75,6 +77,7 @@ import com.sunvote.xpadapp.presenter.ServicePresent;
import com.sunvote.xpadapp.presenter.XPadPresenter;
import com.sunvote.xpadapp.server.BatteryReceiver;
import com.sunvote.xpadapp.server.MoniService;
+import com.sunvote.xpadapp.server.NetWorkStateReceiver;
import com.sunvote.xpadapp.utils.FileUtil;
import com.sunvote.xpadapp.utils.SharedPreferencesUtil;
import com.sunvote.xpadapp.widget.StatusBarView;
@@ -217,6 +220,7 @@ public class MainActivity extends BaseActivity implements ComListener {
private ImageView service;
BatteryReceiver m_receiver;
+ NetWorkStateReceiver netWork_receiver;
StatusBarView statusBarView;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -254,6 +258,10 @@ public class MainActivity extends BaseActivity implements ComListener {
IntentFilter intentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
m_receiver = new BatteryReceiver();
registerReceiver(m_receiver, intentFilter);
+
+ IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+ netWork_receiver = new NetWorkStateReceiver();
+ registerReceiver(netWork_receiver, filter);
setTiltleStatus();
clearApkFile();
@@ -293,6 +301,19 @@ public class MainActivity extends BaseActivity implements ComListener {
}
});
+ netWork_receiver.setOnReceiveResultData(new NetWorkStateReceiver.IReceiveData() {
+ @Override
+ public void onReceiveData() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ statusBarView.setStatusSignal(netWork_receiver.getRssiLevel());
+ }
+ });
+ }
+ });
+
+
//显示时间的控件
TimeThread timeThread = new TimeThread(statusBarView.getTimeCtl());
timeThread.start();//启动线程
@@ -370,7 +391,12 @@ public class MainActivity extends BaseActivity implements ComListener {
if (batteryLevelRcvr != null) {
unregisterReceiver(batteryLevelRcvr);
}
-
+ if (m_receiver != null) {
+ unregisterReceiver(m_receiver);
+ }
+ if (netWork_receiver != null) {
+ unregisterReceiver(netWork_receiver);
+ }
System.exit(0);
}
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/server/NetWorkStateReceiver.java b/C5/app/src/main/java/com/sunvote/xpadapp/server/NetWorkStateReceiver.java
new file mode 100644
index 0000000..b6e79c0
--- /dev/null
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/server/NetWorkStateReceiver.java
@@ -0,0 +1,45 @@
+package com.sunvote.xpadapp.server;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+
+public class NetWorkStateReceiver extends BroadcastReceiver {
+
+ int wifiLevel = -101;
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ WifiManager mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ WifiInfo mWifiInfo = mWifiManager.getConnectionInfo();
+ int wifi = mWifiInfo.getRssi();//获取wifi信号强度
+ if (wifi > -50 && wifi < 0) {//最强
+
+ } else if (wifi > -70 && wifi < -50) {//较强
+
+ } else if (wifi > -80 && wifi < -70) {//较弱
+
+ } else if (wifi > -100 && wifi < -80) {//微弱
+
+ } else {
+
+ }
+ wifiLevel = wifi;
+ iReceiveData.onReceiveData();
+ }
+
+ public int getRssiLevel() {
+ return wifiLevel;
+ }
+
+ private IReceiveData iReceiveData;
+ public void setOnReceiveResultData(IReceiveData receiveData){
+ iReceiveData = receiveData;
+ }
+
+ public interface IReceiveData{
+ void onReceiveData();
+ }
+}
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java b/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java
index 66917c1..f5ccced 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/widget/StatusBarView.java
@@ -57,7 +57,7 @@ public class StatusBarView extends LinearLayout {
* @param rssi
*/
public void setStatusSignal(int rssi){
- barSignal.setIcon(R.mipmap.signal);
+ /* barSignal.setIcon(R.mipmap.signal);
if (rssi < 95){
barSignal.setIcon(R.mipmap.signal_1);
}
@@ -72,7 +72,14 @@ public class StatusBarView extends LinearLayout {
}
if (rssi < 55) {
barSignal.setIcon(R.mipmap.signal_5);
- }
+ }*/
+
+ if(rssi > -100) {
+ barSignal.setVisibility(VISIBLE);
+ barSignal.setIcon(R.mipmap.wifi);
+ }else {
+ barSignal.setVisibility(INVISIBLE);
+ }
}
/**
diff --git a/C5/app/src/main/res/mipmap-hdpi/battery.png b/C5/app/src/main/res/mipmap-hdpi/battery.png
index 7548ccf..4d778c5 100644
--- a/C5/app/src/main/res/mipmap-hdpi/battery.png
+++ b/C5/app/src/main/res/mipmap-hdpi/battery.png
diff --git a/C5/app/src/main/res/mipmap-hdpi/battery_1.png b/C5/app/src/main/res/mipmap-hdpi/battery_1.png
index e8dde60..898f9ac 100644
--- a/C5/app/src/main/res/mipmap-hdpi/battery_1.png
+++ b/C5/app/src/main/res/mipmap-hdpi/battery_1.png
diff --git a/C5/app/src/main/res/mipmap-hdpi/battery_2.png b/C5/app/src/main/res/mipmap-hdpi/battery_2.png
index 9947b43..af54cb0 100644
--- a/C5/app/src/main/res/mipmap-hdpi/battery_2.png
+++ b/C5/app/src/main/res/mipmap-hdpi/battery_2.png
diff --git a/C5/app/src/main/res/mipmap-hdpi/battery_3.png b/C5/app/src/main/res/mipmap-hdpi/battery_3.png
index a54991f..518be8a 100644
--- a/C5/app/src/main/res/mipmap-hdpi/battery_3.png
+++ b/C5/app/src/main/res/mipmap-hdpi/battery_3.png
diff --git a/C5/app/src/main/res/mipmap-hdpi/battery_4.png b/C5/app/src/main/res/mipmap-hdpi/battery_4.png
index bdba7db..9cb1370 100644
--- a/C5/app/src/main/res/mipmap-hdpi/battery_4.png
+++ b/C5/app/src/main/res/mipmap-hdpi/battery_4.png
diff --git a/C5/app/src/main/res/mipmap-hdpi/wifi.png b/C5/app/src/main/res/mipmap-hdpi/wifi.png
new file mode 100644
index 0000000..cf199f5
--- /dev/null
+++ b/C5/app/src/main/res/mipmap-hdpi/wifi.png