update name,update comments

@@ -12,7 +12,7 @@ import java.util.Hashtable;
 /**
 /**
  * @author Ryan Tang
  * @author Ryan Tang
  */
  */
-public final class QRCodeUitls {
+public final class QRCodeUtils {
     private static final int BLACK = 0xff000000;
     private static final int BLACK = 0xff000000;
 
 
     public static Bitmap createQRCode(String str, int widthAndHeight) throws WriterException {
     public static Bitmap createQRCode(String str, int widthAndHeight) throws WriterException {

@@ -59,12 +59,13 @@ public class SocketService extends Service {
     private static final int ROOM_NOT_EXIST_M = 1002;
     private static final int ROOM_NOT_EXIST_M = 1002;
     private static final int HEAT_BEAT_RTN = 1003;
     private static final int HEAT_BEAT_RTN = 1003;
 
 
-//    public static final String HOST = "10.10.4.6";// "192.168.1.21";//
-//    public static final int PORT = 9501;
+//    develop
+//    public static final String SERVER_HOST = "10.10.4.6";// "192.168.1.21";//
+//    public static final int SERVER_PORT = 9501;
 
 
-    public static final String HOST = "10.10.4.6";// "192.168.1.21";//
-    public static final int PORT = 8899;
-//    public static final int PORT = 9501;
+//    test
+    public static final String SERVER_HOST = "10.10.4.6";// "192.168.1.21";//
+    public static final int SERVER_PORT = 8899;
 
 
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
     //    public String testRoomSn = "R170413034374";
     //    public String testRoomSn = "R170413034374";
@@ -168,7 +169,7 @@ public class SocketService extends Service {
     }
     }
 
 
     private void initSocket() throws IOException {//初始化Socket
     private void initSocket() throws IOException {//初始化Socket
-        Socket so = new Socket(HOST, PORT);
+        Socket so = new Socket(SERVER_HOST, SERVER_PORT);
         mSocket = new WeakReference<Socket>(so);
         mSocket = new WeakReference<Socket>(so);
         mReadThread = new ReadThread(so);
         mReadThread = new ReadThread(so);
         mReadThread.start();
         mReadThread.start();

@@ -1069,6 +1069,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 bleOpenRecord.setLockmac(lockMac);
                 bleOpenRecord.setLockmac(lockMac);
                 bleOpenRecord.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(new Date()));
                 bleOpenRecord.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(new Date()));
                 Intent intent = new Intent();
                 Intent intent = new Intent();
+
+
                 intent.setAction(GREENBluetoothLeService.ACTION_OPEN_SUCCESS);
                 intent.setAction(GREENBluetoothLeService.ACTION_OPEN_SUCCESS);
                 intent.putExtra("openrecord", bleOpenRecord);
                 intent.putExtra("openrecord", bleOpenRecord);
                 sendBroadcast(intent);
                 sendBroadcast(intent);

@@ -2,10 +2,13 @@ package com.xgimi.gimicinema.activity;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Bundle;
+import android.os.Handler;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.MessageEvent;
-import com.gimi.common.cinema.utils.QRCodeUitls;
+import com.gimi.common.cinema.utils.QRCodeUtils;
+import com.gimi.common.cinema.utils.SystemUtils;
 import com.google.zxing.WriterException;
 import com.google.zxing.WriterException;
+import com.qnbar.smc.utils.LightOperationUtils;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.R;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
@@ -13,6 +16,7 @@ import org.greenrobot.eventbus.ThreadMode;
 
 
 public class QrCodeShowActivity extends Activity {
 public class QrCodeShowActivity extends Activity {
     public static final int KILL_SELF = 0x9983;
     public static final int KILL_SELF = 0x9983;
+    private Handler handler = new Handler();
 
 
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
@@ -23,10 +27,18 @@ public class QrCodeShowActivity extends Activity {
         final String qr = getIntent().getStringExtra("qr");
         final String qr = getIntent().getStringExtra("qr");
         ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
         ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
         try {
         try {
-            iv.setImageBitmap(QRCodeUitls.createQRCode(qr, 400));
+            iv.setImageBitmap(QRCodeUtils.createQRCode(qr, 400));
         } catch (WriterException e) {
         } catch (WriterException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                LightOperationUtils.close();
+                LightOperationUtils.setLightValue(5);
+                new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
+            }
+        }, 20 * 60 * 1000);
     }
     }
 
 
     @Override
     @Override

@@ -27,7 +27,7 @@ import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.model.UserInfo;
 import com.gimi.common.cinema.model.UserInfo;
 import com.gimi.common.cinema.utils.Des3;
 import com.gimi.common.cinema.utils.Des3;
 import com.gimi.common.cinema.utils.NetStatusUtils;
 import com.gimi.common.cinema.utils.NetStatusUtils;
-import com.gimi.common.cinema.utils.QRCodeUitls;
+import com.gimi.common.cinema.utils.QRCodeUtils;
 import com.gimi.common.cinema.utils.Utils;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.R;
@@ -64,7 +64,7 @@ public class MainModelImpl implements IMainModel {
             String msg = new Gson().toJson(userInfo);
             String msg = new Gson().toJson(userInfo);
             //sub thread ?
             //sub thread ?
             String decrypt = Des3.encode(msg);
             String decrypt = Des3.encode(msg);
-            Bitmap control = QRCodeUitls.create2DCode(decrypt);
+            Bitmap control = QRCodeUtils.create2DCode(decrypt);
             listener.onGetControlImageSuccess(control);
             listener.onGetControlImageSuccess(control);
         } catch (SocketException e) {
         } catch (SocketException e) {
             e.printStackTrace();
             e.printStackTrace();