|
|
@@ -24,7 +24,6 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baidu.mapapi.search.core.PoiInfo;
|
|
|
import com.lidroid.xutils.ViewUtils;
|
|
|
import com.lidroid.xutils.view.annotation.ViewInject;
|
|
|
-import com.xzjmyk.pm.activity.AppConfig;
|
|
|
import com.xzjmyk.pm.activity.BdLocationHelper;
|
|
|
import com.xzjmyk.pm.activity.MyApplication;
|
|
|
import com.xzjmyk.pm.activity.R;
|
|
|
@@ -320,16 +319,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
getActivity().overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
|
|
|
break;
|
|
|
case R.id.signin_btn:
|
|
|
- if (!AppConfig.COMPANY) {
|
|
|
- if (!AppConfig.COMPANY) {
|
|
|
- CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
|
|
|
- @Override
|
|
|
- public void callBack(String code) {
|
|
|
- doSigninByNotCompany(code);
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- } else if (isPlay()) {
|
|
|
+ if (isPlay()) {
|
|
|
if (!CommonUtil.isNetWorkConnected(ct)) {
|
|
|
Crouton.makeText(ct, "当前网络不可用,请检查网络连接", Style.holoRedLight, 2000);
|
|
|
return;
|
|
|
@@ -835,34 +825,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
|
|
|
loadNet(url, param, 0x13);
|
|
|
}
|
|
|
|
|
|
- private void doSigninByNotCompany(String code) {
|
|
|
- isSignining = true;
|
|
|
- signin_btn.setFocusable(false);
|
|
|
- String url = "mobile/saveCardLog.action";
|
|
|
- Map<String, Object> param = new HashMap<>();
|
|
|
- Map<String, Object> form = new HashMap<>();
|
|
|
- form.put("cl_code", code);
|
|
|
- form.put("cl_phone", MyApplication.getInstance().mLoginUser.getTelephone());
|
|
|
- form.put("cl_emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
|
|
|
- String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
|
|
|
- if (StringUtils.isEmpty(emname)) {
|
|
|
- emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
|
|
|
- }
|
|
|
- form.put("cl_emname", emname);
|
|
|
- if (distance > companyDistance) {
|
|
|
- form.put("cl_location", "英唐大厦");
|
|
|
- form.put("cl_distance", Math.random() * 100);
|
|
|
- form.put("cl_address", "中国广东省深圳市南山区科技南五路5");
|
|
|
- } else {
|
|
|
- form.put("cl_location", loaction);
|
|
|
- form.put("cl_distance", distance);
|
|
|
- form.put("cl_address", addr);
|
|
|
- }
|
|
|
- String formStore = StringUtils.mapToJson(form);
|
|
|
- param.put("caller", "CardLog");
|
|
|
- param.put("formStore", formStore);
|
|
|
- loadNet(url, param, 0x13);
|
|
|
- }
|
|
|
|
|
|
//请求合并,抽取共同代码
|
|
|
private void loadNet(String urlCheche, Map<String, Object> param, int what) {
|