diff --git a/build/generated/source/buildConfig/debug/com/ectrip/trips/check/BuildConfig.java b/build/generated/source/buildConfig/debug/com/ectrip/trips/check/BuildConfig.java index c098346..5582e9b 100644 --- a/build/generated/source/buildConfig/debug/com/ectrip/trips/check/BuildConfig.java +++ b/build/generated/source/buildConfig/debug/com/ectrip/trips/check/BuildConfig.java @@ -8,6 +8,6 @@ public final class BuildConfig { public static final String APPLICATION_ID = "com.ectrip.trips.check"; public static final String BUILD_TYPE = "debug"; public static final String FLAVOR = ""; - public static final int VERSION_CODE = 25; - public static final String VERSION_NAME = "4.22"; + public static final int VERSION_CODE = 26; + public static final String VERSION_NAME = "4.23"; } diff --git a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java index 567e501..1dca1bd 100644 --- a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java +++ b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java @@ -236,7 +236,9 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { } DbManager.ClearConfig(); DbManager.InsertConfig(bean); - Toast.makeText(this,"配置成功",Toast.LENGTH_SHORT); + Intent intent = new Intent(PhomeScanerOrderActivity.this, + SettingsActivity.class); + startActivity(intent); } } diff --git a/src/com/ectrip/cyt/ui/SettingsActivity.java b/src/com/ectrip/cyt/ui/SettingsActivity.java index 57f71fd..eae6242 100644 --- a/src/com/ectrip/cyt/ui/SettingsActivity.java +++ b/src/com/ectrip/cyt/ui/SettingsActivity.java @@ -432,6 +432,8 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, @Override public void onClick(View arg0) { finish(); + Intent intent = new Intent(SettingsActivity.this,MainActivity.class); + startActivity(intent); } }); } @@ -738,6 +740,8 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, Intent intent = new Intent(); setResult(SETTING_REQUESTCODE, intent); finish(); + Intent intent1 = new Intent(SettingsActivity.this,MainActivity.class); + startActivity(intent1); } } else { MToast(SettingsActivity.this, diff --git a/src/com/ectrip/trips/net/HttpHelper.java b/src/com/ectrip/trips/net/HttpHelper.java index 78f469f..74c7f67 100644 --- a/src/com/ectrip/trips/net/HttpHelper.java +++ b/src/com/ectrip/trips/net/HttpHelper.java @@ -1,5 +1,6 @@ package com.ectrip.trips.net; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -8,11 +9,13 @@ import android.text.TextUtils; import android.widget.Toast; import com.ectrip.cyt.base.DataTrans; +import com.ectrip.cyt.bean.ConfigBean; import com.ectrip.cyt.callback.HttpCallback; import com.ectrip.cyt.config.DevicTool; import com.ectrip.cyt.config.MyApp; import com.ectrip.cyt.constant.LogoType; import com.ectrip.cyt.constant.constant; +import com.ectrip.cyt.db.DbManager; import com.ectrip.cyt.request.ConsumeOrderRequest; import com.ectrip.cyt.request.DetectVersionRequest; import com.ectrip.cyt.request.LoginRequest; @@ -39,7 +42,7 @@ public class HttpHelper extends HttpHelperCore { private static BaseActivity activity; // public static final String action="/service/terminal-2.action"; public final String action = "/service/terminal-3.do"; - + private ArrayList configBeans = DbManager.GetConfigs(); public static HttpHelper getInstance(Context mContext) { if (helper == null) { @@ -78,7 +81,7 @@ public class HttpHelper extends HttpHelperCore { } orderRequest.setVer(MyApp.getInstance().getVer()); orderRequest.setVerType(MyApp.getInstance().getVerType()); - orderRequest.setDevId(DevicTool.getInstance().getDevId()); + orderRequest.setDevId(configBeans.get(0).getEc_mac()); orderRequest.setDevType(devType); HashMap map = new HashMap(); map.put("method", "queryOrder"); @@ -99,7 +102,7 @@ public class HttpHelper extends HttpHelperCore { } activity.MToast(mContext, "服务地址：" + MyApp.getInstance().getServiceIp() + ";" + "机器码：" - + DevicTool.getInstance().getDevId() + ";" + credentials + ";" + + configBeans.get(0).getEc_mac() + ";" + credentials + ";" + phone + ";", Toast.LENGTH_LONG); } } @@ -118,7 +121,7 @@ public class HttpHelper extends HttpHelperCore { count, password, verifyPassword, consumedSeq, products); consumeCount.setVer(MyApp.getInstance().getVer()); consumeCount.setVerType(MyApp.getInstance().getVerType()); - consumeCount.setDevId(DevicTool.getInstance().getDevId()); + consumeCount.setDevId(configBeans.get(0).getEc_mac()); consumeCount.setAccountId(accountId); consumeCount.setDevType(devType); @@ -141,7 +144,7 @@ public class HttpHelper extends HttpHelperCore { } activity.MToast(mContext, "服务地址：" + MyApp.getInstance().getServiceIp() + ";" + "机器码：" - + DevicTool.getInstance().getDevId() + ";" + "订单号：" + orderId + + configBeans.get(0).getEc_mac() + ";" + "订单号：" + orderId + ";", Toast.LENGTH_LONG); } } @@ -153,7 +156,7 @@ public class HttpHelper extends HttpHelperCore { count, password, verifyPassword, consumedSeq, products); consumeCount.setVer(MyApp.getInstance().getVer()); consumeCount.setVerType(MyApp.getInstance().getVerType()); - consumeCount.setDevId(DevicTool.getInstance().getDevId()); + consumeCount.setDevId(configBeans.get(0).getEc_mac()); consumeCount.setAccountId(accountId); consumeCount.setDevType(devType); if (isId) { @@ -181,7 +184,7 @@ public class HttpHelper extends HttpHelperCore { } activity.MToast(mContext, "服务地址：" + MyApp.getInstance().getServiceIp() + ";" + "机器码：" - + DevicTool.getInstance().getDevId() + ";" + "订单号：" + orderId + + configBeans.get(0).getEc_mac() + ";" + "订单号：" + orderId + ";", Toast.LENGTH_LONG); } } @@ -199,7 +202,8 @@ public class HttpHelper extends HttpHelperCore { startdate, enddate, month); consumeCount.setVer(MyApp.getInstance().getVer()); consumeCount.setVerType(MyApp.getInstance().getVerType()); - consumeCount.setDevId(DevicTool.getInstance().getDevId()); +// consumeCount.setDevId(DevicTool.getInstance().getDevId()); + consumeCount.setDevId(configBeans.get(0).getEc_mac()); consumeCount.setDevType(devType); HashMap map = new HashMap(); map.put("method", "consumeSummary"); @@ -217,9 +221,14 @@ public class HttpHelper extends HttpHelperCore { if (activity == null) { return; } +// activity.MToast(mContext, "服务地址：" +// + MyApp.getInstance().getServiceIp() + ";" + "机器码：" +// + DevicTool.getInstance().getDevId() + ";" + "开始时间：" +// + startdate + ";" + "结束：" + enddate + ";" + "月份：" + month, +// Toast.LENGTH_LONG); activity.MToast(mContext, "服务地址：" + MyApp.getInstance().getServiceIp() + ";" + "机器码：" - + DevicTool.getInstance().getDevId() + ";" + "开始时间：" + + configBeans.get(0).getEc_mac() + ";" + "开始时间：" + startdate + ";" + "结束：" + enddate + ";" + "月份：" + month, Toast.LENGTH_LONG); } @@ -235,7 +244,8 @@ public class HttpHelper extends HttpHelperCore { reprintVoucherRequest.setOrderId(orderId); reprintVoucherRequest.setVer(MyApp.getInstance().getVer()); reprintVoucherRequest.setVerType(MyApp.getInstance().getVerType()); - reprintVoucherRequest.setDevId(DevicTool.getInstance().getDevId()); +// reprintVoucherRequest.setDevId(DevicTool.getInstance().getDevId()); + reprintVoucherRequest.setDevId(configBeans.get(0).getEc_mac()); reprintVoucherRequest.setDevType(devType); HashMap map = new HashMap(); map.put("method", "consumeHistoryQuery"); @@ -254,9 +264,13 @@ public class HttpHelper extends HttpHelperCore { if (activity == null) { return; } +// activity.MToast(mContext, "服务地址：" +// + MyApp.getInstance().getServiceIp() + ";" + "机器码：" +// + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId, +// Toast.LENGTH_LONG); activity.MToast(mContext, "服务地址：" + MyApp.getInstance().getServiceIp() + ";" + "机器码：" - + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId, + + configBeans.get(0).getEc_mac() + ";" + "补打订单：" + orderId, Toast.LENGTH_LONG); } } @@ -280,7 +294,8 @@ public class HttpHelper extends HttpHelperCore { reprintVoucherRequest.setOrderDetailIds(buffer.toString()); reprintVoucherRequest.setVer(MyApp.getInstance().getVer()); reprintVoucherRequest.setVerType(MyApp.getInstance().getVerType()); - reprintVoucherRequest.setDevId(DevicTool.getInstance().getDevId()); +// reprintVoucherRequest.setDevId(DevicTool.getInstance().getDevId()); + reprintVoucherRequest.setDevId(configBeans.get(0).getEc_mac()); reprintVoucherRequest.setDevType(devType); HashMap map = new HashMap(); map.put("method", "reprintVoucher"); @@ -299,9 +314,13 @@ public class HttpHelper extends HttpHelperCore { if (activity == null) { return; } +// activity.MToast(mContext, "服务地址：" +// + MyApp.getInstance().getServiceIp() + ";" + "机器码：" +// + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId, +// Toast.LENGTH_LONG); activity.MToast(mContext, "服务地址：" + MyApp.getInstance().getServiceIp() + ";" + "机器码：" - + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId, + + configBeans.get(0).getEc_mac() + ";" + "补打订单：" + orderId, Toast.LENGTH_LONG); } } @@ -317,7 +336,8 @@ public class HttpHelper extends HttpHelperCore { public void versionUpdate(String curVersionName, String signkey, String identity, String url, HttpCallback httpCallback) { DetectVersionRequest detectVersionRequest = new DetectVersionRequest(); - detectVersionRequest.setDevId(DevicTool.getInstance().getDevId()); +// detectVersionRequest.setDevId(DevicTool.getInstance().getDevId()); + detectVersionRequest.setDevId(configBeans.get(0).getEc_mac()); detectVersionRequest.setDevType("MDEV"); detectVersionRequest.setVer(curVersionName); if (constant.logoMark == LogoType.CYT.getValue() || constant.logoMark == LogoType.EMC.getValue()) { @@ -344,12 +364,14 @@ public class HttpHelper extends HttpHelperCore { * @param httpCallback */ public void login(String username, String password, HttpCallback httpCallback) { + LoginRequest loginRequest = new LoginRequest(); loginRequest.setAccountName(username); loginRequest.setPassword(password); loginRequest.setVer(MyApp.getInstance().getVer()); loginRequest.setVerType(MyApp.getInstance().getVerType()); - loginRequest.setDevId(DevicTool.getInstance().getDevId()); +// loginRequest.setDevId(DevicTool.getInstance().getDevId()); + loginRequest.setDevId(configBeans.get(0).getEc_mac()); loginRequest.setDevType(devType); HashMap map = new HashMap();