|
@@ -103,7 +103,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
private int loginNum = 0; //登陆次数
|
|
private int loginNum = 0; //登陆次数
|
|
|
private boolean isReOne = true;//判断是否是第一次重新定位
|
|
private boolean isReOne = true;//判断是否是第一次重新定位
|
|
|
private boolean isMacInNet = true;//是否提交过mac地址
|
|
private boolean isMacInNet = true;//是否提交过mac地址
|
|
|
- private String macError = null;
|
|
|
|
|
|
|
+ private String macError = null;//mac错误信息
|
|
|
|
|
+ private String macAddress;
|
|
|
|
|
+ private WifiReceiverUtil wifiReceiver;
|
|
|
|
|
+ private MacAndIDUtil util;
|
|
|
|
|
|
|
|
private Handler handler = new Handler() {
|
|
private Handler handler = new Handler() {
|
|
|
@Override
|
|
@Override
|
|
@@ -210,9 +213,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
- private String macAddress;
|
|
|
|
|
- private WifiReceiverUtil wifiReceiver;
|
|
|
|
|
- private MacAndIDUtil util;
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
//生命周期
|
|
//生命周期
|
|
|
@Override
|
|
@Override
|
|
@@ -338,6 +339,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void init() {
|
|
private void init() {
|
|
|
|
|
+ //循环刷新地址
|
|
|
ThreadUtil.getInstance().addTask(new Runnable() {
|
|
ThreadUtil.getInstance().addTask(new Runnable() {
|
|
|
@Override
|
|
@Override
|
|
|
public void run() {
|
|
public void run() {
|
|
@@ -358,9 +360,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
int resultCode = MyApplication.getInstance().getBdLocationHelper().getResultCode();
|
|
int resultCode = MyApplication.getInstance().getBdLocationHelper().getResultCode();
|
|
|
if (isOk) {
|
|
if (isOk) {
|
|
|
setBaiduLocation();
|
|
setBaiduLocation();
|
|
|
- if (isReOne && distance > companyDistance && !isOpenGps()) {
|
|
|
|
|
- Crouton.makeText(ct, "如果发现定位不准,请及时打开gps并重新定位", 2000);
|
|
|
|
|
- }
|
|
|
|
|
isReOne = false;
|
|
isReOne = false;
|
|
|
} else {
|
|
} else {
|
|
|
if (resultCode == 62) {
|
|
if (resultCode == 62) {
|
|
@@ -382,6 +381,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
Log.i("gongpengming", "isOpen=" + isOpen);
|
|
Log.i("gongpengming", "isOpen=" + isOpen);
|
|
|
if (isOpen) {
|
|
if (isOpen) {
|
|
|
macAddress = util.getMac(ct);
|
|
macAddress = util.getMac(ct);
|
|
|
|
|
+ Log.i("gongpengming","");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -420,6 +420,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
//TODO 调转到申请更换手机界面
|
|
//TODO 调转到申请更换手机界面
|
|
|
dialog.dismiss();
|
|
dialog.dismiss();
|
|
|
Intent intent = new Intent(ct, ChangeMobileActivity.class);
|
|
Intent intent = new Intent(ct, ChangeMobileActivity.class);
|
|
|
|
|
+ intent.putExtra("macAddress",macAddress);
|
|
|
startActivityForResult(intent, 0x18);
|
|
startActivityForResult(intent, 0x18);
|
|
|
}
|
|
}
|
|
|
|
|
|