lizhanwei
2020-03-18 0cb037fc3774b76cb89e507f04fa46c86847c522
调整代码
4个文件已修改
39 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/MainActivity.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusDao.java
@@ -17,7 +17,7 @@
    LiveData<AppStatus> getAppStatus();
    @Query("update app_status set rtk_login_code=:rtklogin_code where id=0")
    void updateRTKLoginCode(int rtklogin_code);
    void  updateRTKLoginCode(int rtklogin_code);
    @Query("update app_status set rtk_connect_status=:connStatus where id=0")
    void updateRTKConnectStatus(int connStatus);
    //更新业务平台连接状态
app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -19,12 +19,10 @@
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
import me.yokeyword.fragmentation.SupportActivity;
import safeluck.drive.evaluation.DB.Student;
import safeluck.drive.evaluation.DB.WokViewModel;
import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigViewModel;
import safeluck.drive.evaluation.DB.signalConfigdb.SignalConfigViewModel;
@@ -37,8 +35,6 @@
import com.anyun.exam.lib.AYSdk;
import com.anyun.exam.lib.MyLog;
import com.anyun.exam.lib.util.ByteUtil;
import com.anyun.exam.lib.util.Speaker;
import com.anyun.im_lib.listener.IMSConnectStatusCallback;
import com.google.gson.Gson;
import com.safeluck.aykj.utils.BytesUtils;
@@ -46,11 +42,8 @@
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
import safeluck.drive.evaluation.im.MessageProcessor;
@@ -63,9 +56,6 @@
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.viewmodels.ExamPlatformModel;
import safeluck.drive.evaluation.viewmodels.MainViewModel;
import safeluck.drive.evaluation.viewmodels.RTKConnAndLogin;
import safeluck.drive.evaluation.viewmodels.RTKConnAndLoginViewModel;
public class MainActivity extends SupportActivity implements IMSConnectStatusCallback {
@@ -335,4 +325,5 @@
        MyLog.i(TAG,"TCP连接失败");
    }
}
app/src/main/java/safeluck/drive/evaluation/app.java
@@ -315,14 +315,8 @@
                    int qf = jsonObject.getInt("qf");
                    int satNum = jsonObject.getInt("sat_num");
                    if (lastSatEqualNow(satNum)&&lastQfEqualNow(qf)){
                    }else{
                        String[] rtk_strs = new String[2];
                        rtk_strs[0] = Constant.RTK_INFO_SAT_QF;
                        rtk_strs[1] = json;
                        Data rtkInfoData = new Data.Builder().putStringArray(Constant.APP_STATUS,rtk_strs).build();
                        OneTimeWorkRequest appStatusWorker = new OneTimeWorkRequest.Builder(AppStatusWorker.class).setInputData(rtkInfoData).build();
                        WorkManager.getInstance(getApplicationContext()).enqueue(appStatusWorker);
                        ExamPlatformData.getInstance().setQfAndSatNum(qf,satNum);
                    }
                } catch (JSONException e) {
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -324,4 +324,18 @@
    public String getRtkIP() {
        return rtkIP;
    }
    public void setQfAndSatNum(int qf,int satNum){
        String[] rtk_strs = new String[2];
        rtk_strs[0] = Constant.RTK_INFO_SAT_QF;
        rtk_strs[1] = "{qf:"+qf+","+"sat_num:"+satNum+"}";
        Data rtkInfoData = new Data.Builder().putStringArray(Constant.APP_STATUS,rtk_strs).build();
        OneTimeWorkRequest appStatusWorker = new OneTimeWorkRequest.Builder(AppStatusWorker.class).setInputData(rtkInfoData).build();
        WorkManager.getInstance(app.getAppContext()).enqueue(appStatusWorker);
    }
//  //清空app_status qf和sat tcp状态
    public void whenAppExitResetStatus(){
        setQfAndSatNum(0,0);
        setExamplatformStatus(0);
    }
}