From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 29 Jun 2021 02:43:33 +0000 (+0800)
Subject: merge files
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=ea84adca7d787a68ada207c23ecde2e607f10f8d;p=protocol_srv.git

merge files
---

ea84adca7d787a68ada207c23ecde2e607f10f8d
diff --cc app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
index 5a2c6161,97bfd304..a1356460
--- a/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
@@@ -7,10 -7,10 +7,10 @@@ import android.content.Intent
  import com.enqualcomm.support.utils.ICLogger;
  
  public class BootCompleteReceiver extends BroadcastReceiver {
--  public void onReceive(Context paramContext, Intent paramIntent) {
--    ICLogger.i("监听到开机广播");
-     paramContext.startService(new Intent(paramContext, CoreService.class));
 -    ///paramContext.startService(new Intent(paramContext, com.enqualcomm.support.CoreService.class));
--  }
++    public void onReceive(Context paramContext, Intent paramIntent) {
++        ICLogger.i("监听到开机广播");
++        paramContext.startService(new Intent(paramContext, CoreService.class));
++    }
  }
  
  
diff --cc app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 6b45dcc1,2ada45a3..dd9734b0
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@@ -114,10 -144,32 +144,32 @@@ public class protocolAPIHelper 
      }
  
      public static StringMessage genStringMessage(String cmdName, String msg) {
-         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
-         sm.refresh(msg);
-         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
-         return sm;
+         if (is_protocol_not_Initialled()) return null;
+         StringMessage ret = null;
+         switch (Config.protocol_no) {
+             case Config.PROTOCOL_JIAI:
 -                ret = protocol_jiai.genStringMessage(cmdName,msg);
++                ret = protocol_jiai.genStringMessage(cmdName, msg);
+                 break;
+             case Config.PROTOCOL_BEEHOME:
 -                ret = protocol_beehome.genStringMessage(cmdName,msg);
++                ret = protocol_beehome.genStringMessage(cmdName, msg);
+                 break;
+             case Config.PROTOCOL_IC:
 -                ret = protocol_ic.genStringMessage(cmdName,msg);
++                ret = protocol_ic.genStringMessage(cmdName, msg);
+                 break;
+             case Config.PROTOCOL_FZD:
 -                ret = protocol_fzd.genStringMessage(cmdName,msg);
++                ret = protocol_fzd.genStringMessage(cmdName, msg);
+                 break;
+             case Config.PROTOCOL_MQTT:
 -                ret = protocol_mqtt.genStringMessage(cmdName,msg);
++                ret = protocol_mqtt.genStringMessage(cmdName, msg);
+                 break;
+             case Config.PROTOCOL_S123:
 -                ret = protocol_s123.genStringMessage(cmdName,msg);
++                ret = protocol_s123.genStringMessage(cmdName, msg);
+                 break;
+             case Config.PROTOCOL_GATOR:
 -                ret = protocol_gator.genStringMessage(cmdName,msg);
++                ret = protocol_gator.genStringMessage(cmdName, msg);
+                 break;
+         }
+         return ret;
      }
  
      /***
@@@ -153,7 -205,12 +205,12 @@@
                  ret = protocol_s123.isCmdStr(msg.isFromCache());
                  break;
              case Config.PROTOCOL_GATOR:
-                 ret = protocol_gator.isCmdStr(msg.isFromCache());
 -                if(msg.isFromCache().startsWith("GT")) {
++                if (msg.isFromCache().startsWith("GT")) {
+                     //是加密数据就先解密
+                     ret = protocol_gator.isCmdStr(AESCipher.aesDecryptStringFixedKey(msg.isFromCache().substring(8)));
 -                }else{
++                } else {
+                     ret = protocol_gator.isCmdStr(msg.isFromCache());
+                 }
                  break;
          }
          return ret;
@@@ -309,8 -365,7 +366,8 @@@
                  ret = protocol_anan.APCH(charging);
                  break;
              case Config.PROTOCOL_S123:
 -                ret = protocol_s123.APCH(charging);
 +                if (Config.custom_name.equals("VitracK"))
-                     ret = protocol_ic.APCH(charging);
++                    ret = protocol_s123.APCH(charging);
                  break;
              case Config.PROTOCOL_GATOR:
                  ret = null;
@@@ -343,10 -398,10 +400,10 @@@
                  ret = protocol_anan.AP10(runtime);
                  break;
              case Config.PROTOCOL_S123:
-                 ret = protocol_ic.AP10(runtime);
 -                ret =  protocol_s123.AP10(runtime);
++                ret = protocol_s123.AP10(runtime);
                  break;
              case Config.PROTOCOL_GATOR:
 -                ret =  null;
 +                ret = null;
                  break;
          }
          return ret;
@@@ -407,11 -462,10 +464,11 @@@
                  ret = protocol_anan.AP03(runtime);
                  break;
              case Config.PROTOCOL_S123:
 +                //ret = protocol_s123.AP00(runtime);
-                 ret = protocol_ic.AP03(runtime);
+                 ret = protocol_s123.AP03(runtime);
                  break;
              case Config.PROTOCOL_GATOR:
-                 ret = null;
+                 ret = protocol_gator.BP33(runtime);
                  break;
          }
          return ret;
@@@ -771,7 -825,7 +828,7 @@@
                  //ret = protocol_anan.APTQ(runtime);
                  break;
              case Config.PROTOCOL_S123:
-                 ret = protocol_ic.APTQ(runtime);
 -                ret =  protocol_s123.APTQ(runtime);
++                ret = protocol_s123.APTQ(runtime);
                  break;
              case Config.PROTOCOL_GATOR:
                  ret = null;
@@@ -869,11 -923,7 +926,11 @@@
                  ret = null;
                  break;
              case Config.PROTOCOL_S123:
 -                ret = protocol_s123.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore());
 +                if (Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP)) {
 +                    ret = null;
 +                } else {
-                     ret = protocol_ic.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore());
++                    ret = protocol_s123.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore());
 +                }
                  break;
              case Config.PROTOCOL_GATOR:
                  ret = null;
diff --cc local.properties
index 70a3febd,38ddae0c..505a8dba
--- a/local.properties
+++ b/local.properties
@@@ -4,5 -4,5 +4,10 @@@
  # Location of the SDK. This is only used by Gradle.
  # For customization when using a Version Control System, please read the
  # header note.
++<<<<<<< HEAD
 +#Sat Jun 26 13:03:49 CST 2021
- sdk.dir=E\:\\Android\\Sdk
++sdk.dir=E\:\\Android\\Sdk
++=======
+ #Sun Jun 27 19:54:51 CST 2021
+ sdk.dir=E\:\\Android\\sdk
++>>>>>>> bac6231c4f7e5884c23cfac5feb384cddb497355