密码长度修改成45

gradle.properties

@@ -26,5 +26,5 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
 
-versionCode=55
-versionName=4.11.15
+versionCode=56
+versionName=4.11.16

iFish7/src/main/java/com/ifish/tcp/Context.java

@@ -1,5 +1,7 @@
 package com.ifish.tcp;
 
+import com.ifish.utils.Commons;
+
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 
@@ -13,7 +15,7 @@ public class Context {
       
     public Context(Charset charset) {  
         decoder = charset.newDecoder();
-        buf = IoBuffer.allocate(100).setAutoExpand(true);  
+        buf = IoBuffer.allocate(Commons.IoBuffer).setAutoExpand(true);
         //buf.order(ByteOrder.LITTLE_ENDIAN);  
     }  
   

iFish7/src/main/java/com/ifish/tcp/ModelCodec.java

@@ -24,7 +24,7 @@ public class ModelCodec {
      * @return
      */
     public static byte[] enCode(Object obj) {
-        IoBuffer buffer = IoBuffer.allocate(100).setAutoExpand(true);
+        IoBuffer buffer = IoBuffer.allocate(Commons.IoBuffer).setAutoExpand(true);
 
         if(obj instanceof BackInfoSix_4F_XunHuanTimes){ //设置循环模式时间
             BackInfoSix_4F_XunHuanTimes model = (BackInfoSix_4F_XunHuanTimes) obj;

iFish7/src/main/java/com/ifish/tcp/OrderDeviceConnectModel.java

@@ -7,6 +7,8 @@
  */
 package com.ifish.tcp;
 
+import com.ifish.utils.Commons;
+
 import java.io.Serializable;
 
 /**
@@ -14,9 +16,9 @@ import java.io.Serializable;
  */
 public class OrderDeviceConnectModel extends HeadModel implements Serializable {
     //路由器wifi名
-    private byte[] ssid_name = new byte[60];
+    private byte[] ssid_name = new byte[Commons.SSID_LENGTH];
     //路由器wifi密码
-    private byte[] ssid_password = new byte[60];
+    private byte[] ssid_password = new byte[Commons.SSID_LENGTH];
 
     public byte[] getSsid_name() {
         return ssid_name;

iFish7/src/main/java/com/ifish/tcp/OrderModel.java

@@ -20,7 +20,8 @@ public class OrderModel {
         //15字节数据包头
         model.setType((byte) 0);
         model.setCheck_code((byte) 7);
-        model.setRemote_len((byte) 57);
+//        model.setRemote_len((byte) 57);
+        model.setRemote_len((byte) Commons.Remote_len);
         //wifi账号密码
         byte[] wifi_Account = model.getWifiSSID();
         byte[] wifi_Password = model.getWifiPWD();
@@ -74,7 +75,8 @@ public class OrderModel {
         //15字节数据包头
         model.setType((byte) 0);
         model.setCheck_code((byte) 18);
-        model.setRemote_len((byte) 57);
+//        model.setRemote_len((byte) 57);
+        model.setRemote_len((byte) Commons.Remote_len);
         //wifi账号密码
         byte[] wifi_Account = model.getSsid_name();
         byte[] wifi_Password = model.getSsid_password();

iFish7/src/main/java/com/ifish/utils/ByteUtil.java

@@ -72,7 +72,7 @@ public class ByteUtil{
 	 * @param str 
 	 */  
 	public static IoBuffer byteToIoBuffer(byte [] bt,int length){  
-		IoBuffer ioBuffer = IoBuffer.allocate(100).setAutoExpand(true);
+		IoBuffer ioBuffer = IoBuffer.allocate(Commons.IoBuffer).setAutoExpand(true);
 		//ioBuffer.order(ByteOrder.LITTLE_ENDIAN);// 修改此缓冲区的字节顺大端模式
 		ioBuffer.put(bt, 0, length);  
 		ioBuffer.flip();  

iFish7/src/main/java/com/ifish/utils/Commons.java

@@ -60,6 +60,10 @@ public class Commons {
     public static List<GradeRules> GRADERULES = null;//等级规则
     public static List<GoldTasks> GOLDTASKS = null;//金币任务
     public static final String NimUIKit_ID = "3";//云信聊天 联系爱鱼奇官方的用户id
+    public static final int SSID_STEP = 25;
+    public static final int IoBuffer = 100+SSID_STEP*2;
+    public static final int Remote_len = 57+SSID_STEP*2;
+    public static final int SSID_LENGTH = 20+SSID_STEP;
 
     public static int num;
 
@@ -431,5 +435,6 @@ public class Commons {
         public static final String Xunhuanbang_sNumber = "F4";
         public static final String Shajundeng_sNumber = "F5";
         public static final String Zaolangbang_sNumber = "F6";
+
     }
 }