From 48e0d8da4095b7e8909849ffcc811bb12fdf346e Mon Sep 17 00:00:00 2001 From: snickersun Date: Fri, 29 Jan 2021 10:02:23 +0800 Subject: [PATCH] =?utf8?q?=E9=98=B2=E8=B5=B0=E4=B8=A2=E5=8D=8F=E8=AE=AE?= =?utf8?q?=E5=8A=A0=E5=85=A5=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=8F=AF=E4=BB=A5?= =?utf8?q?=E5=8E=BB=E9=99=A4=E5=8A=A0=E5=AF=86=E4=BF=A1=E6=81=AF=20persist?= =?utf8?q?.sys.encrypt=5Ffzd=20=E9=BB=98=E8=AE=A4true?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../java/com/ic/protocols/protocol_fzd.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java index 1ce6b005..16fb98a7 100644 --- a/app/src/main/java/com/ic/protocols/protocol_fzd.java +++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java @@ -1,3 +1,4 @@ + package com.ic.protocols; import android.content.ComponentName; @@ -37,7 +38,7 @@ public class protocol_fzd { private static final String CMDEND = "]"; private static final String CMDHEADERSPLIT = "*"; private static final String CMDSPLIT = ","; - + private static final boolean doEncryption=Util.getSystemProperties("persist.sys.encrypt_fzd","true").equals("true"); public static final String defaultServerIP = "api.xcloudtech.com"; public static final int defaultServerPort = 9000; @@ -308,8 +309,12 @@ public class protocol_fzd { StringBuilder sb = new StringBuilder(); int len = CMD.length(); String header = genHeader(len, CMD); - String keyheader = keyheader(CMD, len); - sb.append(CMDHEADER).append(keyheader).append(header).append(CMDEND); + if(doEncryption) { + String keyheader = keyheader(CMD, len); + sb.append(CMDHEADER).append(keyheader).append(header).append(CMDEND); + }else{ + sb.append(CMDHEADER).append(header).append(CMDEND); + } return genStringMessage(CMD, sb.toString()); } @@ -318,8 +323,12 @@ public class protocol_fzd { String data_buf = CMD + CMDSPLIT + data; int data_buf_len = data_buf.length(); String header = genHeader(data_buf_len, CMD); - String keyheader = keyheader(CMD, data_buf_len);//计算header md5值 - sb.append(CMDHEADER).append(keyheader).append(header).append(CMDSPLIT).append(data).append(CMDEND); + if(doEncryption) { + String keyheader = keyheader(CMD, data_buf_len);//计算header md5值 + sb.append(CMDHEADER).append(keyheader).append(header).append(CMDSPLIT).append(data).append(CMDEND); + }else{ + sb.append(CMDHEADER).append(header).append(CMDSPLIT).append(data).append(CMDEND); + } return genStringMessage(CMD, sb.toString()); } -- 2.17.1