|
@@ -159,14 +159,14 @@ public class CaptureResultActivity extends Activity {
|
|
|
}
|
|
}
|
|
|
}));*/
|
|
}));*/
|
|
|
String url = null;
|
|
String url = null;
|
|
|
-// url = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl")+"common/checkQrcodeScan.action";
|
|
|
|
|
- url = "http://192.168.253.63:8080/ERP/"+"common/checkQrcodeScan.action";
|
|
|
|
|
|
|
+ url = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl")+"common/checkQrcodeScan.action";
|
|
|
|
|
+// url = "http://192.168.253.63:8080/ERP/"+"common/checkQrcodeScan.action";
|
|
|
String em_code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
|
|
String em_code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
|
|
|
String sob = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
|
|
String sob = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
|
|
|
String password = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "user_password");
|
|
String password = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "user_password");
|
|
|
Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
|
|
Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
|
|
|
intent_web.putExtra("url",url + "?em_code=" + em_code + "&sob=" + sob + "&clientId=" + clientId + "&password=" + password);
|
|
intent_web.putExtra("url",url + "?em_code=" + em_code + "&sob=" + sob + "&clientId=" + clientId + "&password=" + password);
|
|
|
- intent_web.putExtra("title", "UAS网页登录");
|
|
|
|
|
|
|
+ intent_web.putExtra("title", "扫码登录");
|
|
|
intent_web.putExtra("cookie", true);
|
|
intent_web.putExtra("cookie", true);
|
|
|
startActivity(intent_web);
|
|
startActivity(intent_web);
|
|
|
finish();
|
|
finish();
|