Merge branch 'master' of https://gitee.com/endian11/DriveJudge

yy1717

2019-12-30 9e1097ca3eff1c25df69990fc1098144c7cbcb56

 app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java

@@ -10,6 +10,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;

import androidx.appcompat.widget.AppCompatEditText;
@@ -31,6 +32,8 @@
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.tcp.ConnectThread;

/**
@@ -45,9 +48,9 @@
    private static final String TAG = TcpFragment.class.getSimpleName();
    private TextInputEditText ip;
    private TextInputEditText port;
    private TextView tv_content;
    private Button btn_connect;
    private Button btn_send;
    private      ConnectThread connectThread;
    private AppCompatEditText sendEditText;
    private CriteriaIViewModel workViewModel;
    private int item_id=0;
@@ -61,7 +64,7 @@
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.layout_tcpclient, container, false);
        initView(view);
        workViewModel =ViewModelProviders.of(this).get(CriteriaIViewModel.class);
//        workViewModel =ViewModelProviders.of(this).get(CriteriaIViewModel.class);

  
        return view;
@@ -71,6 +74,7 @@
        ip = view.findViewById(R.id.input_ip);
        port = view.findViewById(R.id.input_port);
        sendEditText = view.findViewById(R.id.sendtxt);
        tv_content = view.findViewById(R.id.content);

        btn_connect = view.findViewById(R.id.btn_connect);
        btn_send = view.findViewById(R.id.btn_send);
@@ -83,22 +87,37 @@
    public void onClick(View v) {
        switch (v.getId()){
            case R.id.btn_connect:

//                String serverIp = ip.getText().toString().trim();
//                String serverPort = port.getText().toStrirng().trim();
//            connectThread = new ConnectThread(serverIp,Integer.parseInt(serverPort));
//            connectThread.start();
                    Random random = new Random();
                r = random.nextInt(30)+1;
                Log.i(TAG, "onClick: 随机数="+r);
                WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
                    @Override
                    public void run() {

                WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getFailProjDao().insert(new FailedProj(flag?1:2, r,flag?1001:1000));
                flag = !flag;
                    }
                });
                /**======================以下用于测试数据库==================*/
//                Random random = new Random();
//                r = random.nextInt(30)+1;
//                Log.i(TAG, "onClick: 随机数="+r);
//                WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
//                    @Override
//                    public void run() {
//
//                WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getFailProjDao().insert(new FailedProj(flag?1:2, r,flag?1001:1000));
//                flag = !flag;
//                    }
//                });
                /**======================测试数据库结束==================*/







                String userId = "100002";
                String token = "token_" + userId;
                String hosts = "[{\"host\":\"192.168.10.234\", \"port\":8855}]";

                IMSClientBootstrap.getInstance().init(userId,token,hosts,1);
                break;
            case R.id.btn_send:
//                if (connectThread != null){
@@ -106,6 +125,11 @@
////                    sendEditText.getText().clear();
////                }



                MessageProcessor.getInstance().sendMessage(sendEditText.getText().toString().trim());
                sendEditText.getText().clear();

                break;
        }
    }