Commit 91980b05 by Lee Munkyeong

Merge branch 'features/1.4.100_develop' into 'features/1.4.100'

Features/1.4.100 develop

See merge request !215
parents c76a851c ac90cc34
Subproject commit d67a57e92c7b11b5fc0548445d8c60ffa7c82779 Subproject commit 89f7f804a54cf4890189864d9384f6b3de21ccb4
...@@ -41,6 +41,7 @@ import java.util.Calendar; ...@@ -41,6 +41,7 @@ import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Stack; import java.util.Stack;
...@@ -204,6 +205,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -204,6 +205,7 @@ public class OperationListActivity extends ABVUIActivity {
ArrayList<String> paramList = new ArrayList<String>(); ArrayList<String> paramList = new ArrayList<String>();
paramList.add("debug=1"); paramList.add("debug=1");
paramList.add("app=android"); paramList.add("app=android");
paramList.add("lang=" + ActivityHandlingHelper.getInstance().getLocaleFileName());
paramList.add("mobile_flg=" + (isNormalSize() ? "1" : "0")); paramList.add("mobile_flg=" + (isNormalSize() ? "1" : "0"));
paramList.add("isRFIDBarcodeScan=" + (ABVDataCache.getInstance().serviceOption.isUsableRFIDBarcodeScan() ? "1" : "0")); paramList.add("isRFIDBarcodeScan=" + (ABVDataCache.getInstance().serviceOption.isUsableRFIDBarcodeScan() ? "1" : "0"));
paramList.add("isOperationGroupMaster=" + (ABVDataCache.getInstance().serviceOption.isOperationGroupMaster() ? "1" : "0")); paramList.add("isOperationGroupMaster=" + (ABVDataCache.getInstance().serviceOption.isOperationGroupMaster() ? "1" : "0"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment