绑定wifi和连接热点增加userId

iFish7/src/main/java/com/ifish/activity/BindWifiTankActivity.java

@@ -7,7 +7,6 @@
  */
 package com.ifish.activity;
 
-import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -20,7 +19,6 @@ import android.net.wifi.ScanResult;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -45,7 +43,6 @@ import com.ifish.utils.HttpManager;
 import com.ifish.utils.SPUtil;
 import com.ifish.utils.ToastUtil;
 import com.ifish.utils.WifiAdmin;
-import com.ifish.utils.WifiUtil;
 
 import java.io.IOException;
 import java.io.InputStream;

iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java

@@ -40,6 +40,7 @@ public class HotSpotConnentSetWIFIActivity extends BaseActivity {
 //                doPostBindDevice();
                 isjump = true;
                 Intent i = new Intent();
+                i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 i = new Intent(Settings.ACTION_WIFI_SETTINGS);
                 startActivity(i);
             }

iFish7/src/main/java/com/ifish/basebean/User.java

@@ -1,6 +1,10 @@
 package com.ifish.basebean;
 
+import com.ifish.utils.Commons;
+import com.lidroid.xutils.util.LogUtils;
+
 import java.io.Serializable;
+import java.util.Arrays;
 
 /**
  *
@@ -46,6 +50,25 @@ public class User implements Serializable{
     public String getUserId() {
         return userId;
     }
+
+    public byte[] getUserIdBytes(){
+        String originalUserId = Commons.USER.getUserId();
+
+        // 创建一个长度为10的字节数组，用于存储补零后的用户ID
+        byte[] userIdBytes = new byte[10];
+
+        // 将原始用户ID的字节数组复制到新的字节数组中
+        byte[] originalBytes = originalUserId.getBytes();
+        System.arraycopy(originalBytes, 0, userIdBytes, 0, Math.min(originalBytes.length, userIdBytes.length));
+
+        // 如果原始用户ID的长度小于10，用零填充剩余的空间
+        for (int i = originalBytes.length; i < userIdBytes.length; i++) {
+            userIdBytes[i] = 0;
+        }
+        LogUtils.d("LHD 传递userId = "+ Arrays.toString(userIdBytes));
+        return userIdBytes;
+    }
+
     public String getToken() {
         return token;
     }

iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java

@@ -52,8 +52,8 @@ public class BaseApplication extends MultiDexApplication {
     /**
      * 正式环境
      */
-    public static String BASE = "https://app.ifish7.cn/";//正式环境 接口访问地址
-    //    public static String BASE = "http://139.196.24.156:7080/";//测试环境 接口访问地址
+//    public static String BASE = "https://app.ifish7.cn/";//正式环境 接口访问地址
+        public static String BASE = "http://139.196.24.156:7080/";//测试环境 接口访问地址
     public static String BASE_URL = BASE + "api/";// 接口URL
 
     @Override

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

@@ -1,9 +1,10 @@
 package com.ifish.tcp;
 
+import static com.ifish.utils.Commons.Device;
+
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.ifish.basebean.Device;
 import com.ifish.utils.ByteUtil;
 import com.ifish.utils.Commons;
 
@@ -13,9 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import static com.ifish.utils.Commons.Device;
-import static com.ifish.utils.Commons.num;
-
 public class ModelCodec {
     /**
      * 把对象转成字节数
@@ -270,6 +268,8 @@ public class ModelCodec {
             buffer.put(model.getWifiSSID());
             //wifi密码
             buffer.put(model.getWifiPWD());
+            //用户id
+            buffer.put(Commons.USER.getUserIdBytes());
             //crc16校验码
             buffer.put(model.getCrc16_code());
             //tcp连接域名
@@ -288,6 +288,8 @@ public class ModelCodec {
             buffer.put(model.getSsid_name());
             //wifi密码
             buffer.put(model.getSsid_password());
+            //用户id
+            buffer.put(Commons.USER.getUserIdBytes());
             //crc16校验码
             buffer.put(model.getCrc16_code());
             //tcp连接域名
@@ -439,7 +441,7 @@ public class ModelCodec {
         } else if (Check_code == 25) {
             return decodexuanduo_get(buf);
         }
-        //switch语句
+        //todo switch语句
         switch (length) {
             //长度为20,绑定wifi的反馈
             case 20: {