修改SMS命令：

1、在IMEI设置过程中添加AT指令设置IMEI的功能，不过IMEI被展讯 disable了，需要继续沟通。
2、添加AT指令执行接口，不过没有反馈at执行结果给手机端，只告诉执行了。
命令格式：#atcmd#=[at cmdline]

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 6ae1dc3..abf3ce8 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -104,7 +104,7 @@ public class CoreService extends Service {
 \r
     private static final int GRAY_SERVICE_ID =android.os.Process.myPid();\r
 \r
-    private static final String MY_WAKE_LOCKTAG = "MyWakelockTag";\r
+    private static final String MY_WAKE_LOCKTAG =CoreService.class.getSimpleName();\r
 \r
     public static int alarmCycle = 1;\r
 \r
@@ -612,7 +612,7 @@ public class CoreService extends Service {
                 AlarmWakeUp.setAlarmWakeUpTime();\r
                 boolean screenon = ((PowerManager)getSystemService(POWER_SERVICE)).isScreenOn();\r
                 if (!screenon) {\r
-                    send_at_to_update_lbs();\r
+                    SimSignalUtil.send_at_to_update_lbs(this.runtime);\r
                 }\r
                 //这里就是为了省电，如果wifi开启，且屏幕关闭，则wifi也关闭\r
                 if (Util.isConnectWifi((this.runtime.getContextProxy()).context) && !screenon) {\r
@@ -725,26 +725,6 @@ public class CoreService extends Service {
 \r
     public boolean onUnbind(Intent paramIntent) { return false; }\r
 \r
-    public void send_at_to_update_lbs() {\r
-        Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");\r
-        intent.putExtra("command", "AT+CREG=2");\r
-        intent.putExtra("arg2", "");\r
-        (this.runtime.getContextProxy()).context.sendBroadcast(intent);\r
-        ICLogger.i("send_at_to_update_lbs ");\r
-    }\r
-\r
-    public void send_at_to_onoff_simcard(boolean simon){\r
-\r
-        Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");\r
-        if (simon) {\r
-            intent.putExtra("command", "AT+SFUN=2"); //开卡\r
-        }else{\r
-            intent.putExtra("command", "AT+SFUN=3");//关卡\r
-        }\r
-        intent.putExtra("arg2", "");\r
-        (this.runtime.getContextProxy()).context.sendBroadcast(intent);\r
-        ICLogger.i("send_at_to_update_lbs ");\r
-    }\r
     //每一分钟设置一次\r
     public void setAlarm(int paramInt) {\r
 //        AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,paramInt,ACTION_ALARM);\r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 4bf42a9..88ae41e 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -41,6 +41,9 @@ import rx.functions.Action1;
 import static com.enqualcomm.support.Config.upload_logs_via_ftp;\r
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;\r
 import static com.enqualcomm.support.utils.DeviceInfoUtil.getDeviceVersion;\r
+import static com.enqualcomm.support.utils.SimSignalUtil.send_at_cmd;\r
+import static com.enqualcomm.support.utils.SimSignalUtil.send_at_setImei0;\r
+import static com.enqualcomm.support.utils.SimSignalUtil.send_at_setImei1;\r
 \r
 \r
 public class ICSmsManager {\r
@@ -177,19 +180,29 @@ public class ICSmsManager {
                 String reply = "IMEI=" + runtime.IMEI() + "\nSW:" + DeviceInfoUtil.getVersionCode(mContext) + " " + DeviceInfoUtil.getSWVersionDisplayName();\r
                 ICLogger.i("SMS " + sms + " reply \n" + reply);\r
                 sendSMS(phonenumber, reply);\r
-            } else if (sms.startsWith("#imei:")) {\r
+            } else if (sms.startsWith("#atcmd#=")) {\r
+                String cmd = sms.substring(8);\r
+                ICLogger.i("atcmd  " + cmd);\r
+                if (cmd.length() >0 ) {\r
+                    send_at_cmd(runtime,cmd);\r
+                    sendSMS(phonenumber, "run At cmd "+cmd+"!");\r
+                }  else {\r
+                    sendSMS(phonenumber, "At cmd empty error!");\r
+                }\r
+            }else if (sms.startsWith("#imei:")) {\r
                 String imei = sms.substring(6);\r
                 ICLogger.i("SMS " + sms + " imei=" + imei);\r
                 if (imei.length() == 15) {\r
+                    send_at_setImei0(runtime,imei);\r
                     Config.setIMEI(mContext, imei);\r
                     runtime.setImeiAndCid(imei, "");\r
-                    sendSMS(phonenumber, "set IMEI " + imei + " sucess !");\r
+                    sendSMS(phonenumber, "set IMEI " + imei + " success !");\r
                     CoreService.getInstance().disconnect_server();\r
                     CoreService.getInstance().ReConnectToServer();\r
                 } else if (imei.equals("reset")) {\r
                     Config.setIMEI(mContext, "");\r
                     runtime.setImeiAndCid(PhoneUtils.getIMEI(mContext), "");\r
-                    sendSMS(phonenumber, "reset IMEI to " + PhoneUtils.getIMEI(mContext) + " sucess !");\r
+                    sendSMS(phonenumber, "reset IMEI to " + PhoneUtils.getIMEI(mContext) + " success !");\r
                     CoreService.getInstance().disconnect_server();\r
                     CoreService.getInstance().ReConnectToServer();\r
                 } else if (imei.equals("current")) {\r

diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index d54747a..e421a94 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -184,7 +184,7 @@ public class LocationClient {
   private void performAlarm(PowerManager.WakeLock paramWakeLock) {\r
     if (!runtime.isAirMode) {\r
       updateStepCount();//update StepCount\r
-      CellInfoUtil.triggerUpdateCellinfo();\r
+     // CellInfoUtil.triggerUpdateCellinfo();  //这个在locationClinet中也会执行更新\r
       sendBatteryNotification();\r
     }\r
   }\r
@@ -393,7 +393,7 @@ public class LocationClient {
   \r
 \r
 public void updateCellInfo() {\r
-   this.mLbsHelper.getAttchCellInfo(runtime.getContextProxy().getTelephonyManager());\r
+//   this.mLbsHelper.getAttchCellInfo(runtime.getContextProxy().getTelephonyManager());\r
 //    CellInfoUtil.triggerUpdateCellinfo();\r
     CellInfoUtil.setCurrentAttachCellInfo(runtime, getLocationWakeLock());\r
   }\r
@@ -405,7 +405,7 @@ public void updateCellInfo() {
 \r
 \r
   public PowerManager.WakeLock getLocationWakeLock() {\r
-    PowerManager.WakeLock wakeLock = ((PowerManager)(runtime.getContextProxy()).context.getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "locationSend");\r
+    PowerManager.WakeLock wakeLock = ((PowerManager)(runtime.getContextProxy()).context.getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, this.getClass().getSimpleName());\r
     wakeLock.acquire(1000L);\r
     return wakeLock;\r
   }\r

diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java
index 3ff2175..a6537e8 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/MainActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java
@@ -16,6 +16,7 @@ import android.widget.ToggleButton;
 
 import com.enqualcomm.support.R;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
+import com.enqualcomm.support.utils.SimSignalUtil;
 import com.ic.jni.ICJniUtils;
 import com.enqualcomm.support.CoreService;
 import com.enqualcomm.support.utils.ICLogger;
@@ -64,7 +65,7 @@ public class MainActivity extends AppCompatActivity {
 
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                CoreService.getInstance().send_at_to_onoff_simcard(b);
+                SimSignalUtil.send_at_to_onoff_simcard(CoreService.getInstance().runtime);
             }
         });
         ToggleButton tbtnblood = (ToggleButton)findViewById(R.id.toggleButton2);

diff --git a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
index 1a043d9..847b0f7 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
@@ -200,18 +200,35 @@ public class SimSignalUtil {
 \r
     return lisScreenOn;\r
   }\r
-  public void send_at_to_onoff_simcard(Runtime runtime,boolean simon){\r
+  public static void send_at_to_onoff_simcard(Runtime runtime){\r
 \r
     Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");\r
-    if (simon) {\r
-      intent.putExtra("command", "AT+SFUN=2"); //开卡\r
-    }else{\r
-      intent.putExtra("command", "AT+SFUN=3");//关卡\r
-    }\r
+    intent.putExtra("command", "AT+SFUN=2"); //重新初始化sim卡\r
     intent.putExtra("arg2", "");\r
     ( runtime.getContextProxy()).context.sendBroadcast(intent);\r
     ICLogger.i("send_at_to_update_lbs ");\r
   }\r
+  public static void send_at_to_update_lbs(Runtime runtime) {\r
+    Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");\r
+    intent.putExtra("command", "AT+CREG=2");\r
+    intent.putExtra("arg2", "");\r
+    (runtime.getContextProxy()).context.sendBroadcast(intent);\r
+    ICLogger.i("send_at_to_update_lbs ");\r
+  }\r
+\r
+  public static void send_at_cmd(Runtime runtime, String cmd){\r
+    Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");\r
+    intent.putExtra("command", cmd);\r
+    intent.putExtra("arg2", "");\r
+    ( runtime.getContextProxy()).context.sendBroadcast(intent);\r
+    ICLogger.i("send_at_cmd "+cmd);\r
+  }\r
+  public static void send_at_setImei0(Runtime runtime, String imei){\r
+    send_at_cmd(runtime,"AT+SPIMEI=0,"+imei);\r
+  }\r
+  public static void send_at_setImei1(Runtime runtime, String imei){\r
+    send_at_cmd(runtime,"AT+SPIMEI=1,"+imei);\r
+  }\r
 \r
   public void setAirMode(String paramString) {\r
 \r