yy1717
2020-01-08 2cba05dbec1324230771c3699e02c079f99afbf9
Merge branch 'master' of https://gitee.com/endian11/DriveJudge
8个文件已修改
3个文件已添加
242 ■■■■■ 已修改文件
app/src/main/assets/rtk_config.json 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/Constant.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/RTKConfig.java 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_ftp_setting.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/strings.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/assets/rtk_config.json
New file
@@ -0,0 +1,15 @@
  {
    "ip":"47.93.80.84",
    "port": 12125,
    "province":23,
    "city":1,
    "model":"123",
    "sn":"2019101500000001",
    "imei":"460123874561",
    "phone":"2019101500000001",
    "password":"123456789",
    "registered":1,
    "interval":1
  }
app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -44,4 +44,7 @@
    //17.评判信息[{"wrong_id":0},{"wrong_id":3}]
    public static final int JUDGE_INFO = 0x000c;
    public static final String RTK_CONFIG_JSON = "rtk_config.json";
    public static final String BIND_DRIVING_TOPIC = "driving";
    public static final long TEST_STU_ID = 1001;
}
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java
@@ -30,6 +30,7 @@
    @ColumnInfo(name = "stu_id")
    private long  stu_id;
// =1 I类考场   ==2 II类考场
    @ColumnInfo(name = "subject")
    private int  subject;
app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
@@ -20,7 +20,7 @@
 * All Rights Saved! Chongqing AnYun Tech co. LTD
 */
public class SimpleFragmentAdapter  extends FragmentPagerAdapter {
    private String[] mTitles = new String[]{"基础数据","FTP配置","驾校信息"};
    private String[] mTitles = new String[]{"基础数据","RTK配置","驾校信息"};
    public SimpleFragmentAdapter(FragmentManager fm) {
        super(fm);
    }
app/src/main/java/safeluck/drive/evaluation/app.java
@@ -2,6 +2,7 @@
import android.app.Application;
import android.util.Log;
import android.widget.Toast;
import androidx.annotation.NonNull;
@@ -14,8 +15,13 @@
import com.anyun.exam.lib.MyLog;
import com.anyun.exam.lib.crash.CrashHandler;
import com.facebook.stetho.Stetho;
import com.google.gson.Gson;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SystemUtil;
/**
@@ -27,6 +33,7 @@
public class app extends Application implements IAYExamListener {
    private static final String TAG = "app";
    private Gson gson;
    @Override
    public void onCreate() {
@@ -68,9 +75,24 @@
    @Override
    public void callBackMsg(int cmd, String json) {
        MyLog.d(TAG, "收到==" + json);
        CEventCenter.dispatchEvent("train",0,0,json);
        MyLog.d(TAG,  String.format("收到命令[%d],Json内容为%s",cmd,json));
        switch (cmd){
            case Constant.NDK_START:
                Toast.makeText(this, "NDK start", Toast.LENGTH_SHORT).show();
                break;
            case Constant.FETCH_RTK_PLATFORM_INFO:
                StringBuffer stringBuffer = FileUtil.readAssetTxtFile(getApplicationContext(),Constant.RTK_CONFIG_JSON);
                MyLog.i(TAG, "RTK配置信息:"+stringBuffer.toString());
                AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO,stringBuffer.toString());
                break;
            case Constant.JUDGE_INFO:
                FailedProjRepository failedProjRepository = new FailedProjRepository(this);
                failedProjRepository.insert(new FailedProj(1,cmd,Constant.TEST_STU_ID));
                break;
        }
    }
}
app/src/main/java/safeluck/drive/evaluation/bean/RTKConfig.java
New file
@@ -0,0 +1,124 @@
package safeluck.drive.evaluation.bean;
/**
 * MyApplication2
 * Created by lzw on 2020/1/8. 10:53:25
 * 邮箱:632393724@qq.com
 * All Rights Saved! Chongqing AnYun Tech co. LTD
 */
public class RTKConfig {
    /**
     * ip : 192.168.10.234
     * port : 8989
     * province : 23
     * city : 1
     * model : 123
     * sn : 13634757865
     * imei : 460123874561
     * phone : 13634757865
     * password : 123456789
     * registered : 1
     * interval : 1
     */
    private String ip;
    private int port;
    private int province;
    private int city;
    private String model;
    private String sn;
    private String imei;
    private String phone;
    private String password;
    private int registered;
    private int interval;
    public String getIp() {
        return ip;
    }
    public void setIp(String ip) {
        this.ip = ip;
    }
    public int getPort() {
        return port;
    }
    public void setPort(int port) {
        this.port = port;
    }
    public int getProvince() {
        return province;
    }
    public void setProvince(int province) {
        this.province = province;
    }
    public int getCity() {
        return city;
    }
    public void setCity(int city) {
        this.city = city;
    }
    public String getModel() {
        return model;
    }
    public void setModel(String model) {
        this.model = model;
    }
    public String getSn() {
        return sn;
    }
    public void setSn(String sn) {
        this.sn = sn;
    }
    public String getImei() {
        return imei;
    }
    public void setImei(String imei) {
        this.imei = imei;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    public int getRegistered() {
        return registered;
    }
    public void setRegistered(int registered) {
        this.registered = registered;
    }
    public int getInterval() {
        return interval;
    }
    public void setInterval(int interval) {
        this.interval = interval;
    }
}
app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java
@@ -61,7 +61,7 @@
                break;
            case R.id.btn_sure:
                String pwd = editText.getText().toString().trim();
                if (!TextUtils.isEmpty(pwd) && pwd.equals("123456")) {
                if (!TextUtils.isEmpty(pwd) && pwd.equals("1")) {
                    BaseSettingFragment sysSetingFragment = findFragment(BaseSettingFragment.class);
                    if (sysSetingFragment == null) {
                        sysSetingFragment = (BaseSettingFragment) BaseSettingFragment.newInstance();
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -21,9 +21,9 @@
import java.util.List;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.DB.Student;
import safeluck.drive.evaluation.DB.WokViewModel;
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.DB.failitems.FailedProjViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
import safeluck.drive.evaluation.R;
@@ -91,7 +91,7 @@
        FailedProjViewModel failedProjViewModel =ViewModelProviders.of(this).get(FailedProjViewModel.class);
        failedProjViewModel.getFailedProjectsForI(1001).observe(this, new Observer<List<FailedProj_select>>() {
        failedProjViewModel.getFailedProjectsForI(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
            @Override
            public void onChanged(List<FailedProj_select> failedProj_selects) {
                item_id = 0;
app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
New file
@@ -0,0 +1,46 @@
package safeluck.drive.evaluation.util;
import android.app.Application;
import android.content.Context;
import android.content.res.Resources;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
public class FileUtil {
    /**
     * 读取assert目录下 txt文本文件内容
     * @param context
     * @param assetFileName
     * @return
     */
    public static StringBuffer readAssetTxtFile(Context context, String assetFileName) {
        String lineTxt = null;
        StringBuffer stringBuffer = new StringBuffer();
        try {
            InputStream inputStream = null;
            try {
                inputStream = context.getAssets()
                        .open(assetFileName);
            } catch (IOException e) {
                e.printStackTrace();
            }
            InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
            while((lineTxt = bufferedReader.readLine()) != null){
                System.out.println(lineTxt);
                stringBuffer.append(lineTxt);
            }
            inputStreamReader.close();
            bufferedReader.close();
        } catch (IOException e) {
            e.printStackTrace();
        }
        return stringBuffer;
    }
}
app/src/main/res/layout/layout_ftp_setting.xml
@@ -14,7 +14,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textColor="@android:color/black"
            android:text="服务器地址:"/>
            android:text="@string/rtk_addr_des"/>
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -23,6 +23,7 @@
        <EditText
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/rtk_addr_ip"
            android:text="192.168.23.12"
            android:background="@android:drawable/editbox_background_normal"/>
        <TextView
@@ -33,6 +34,7 @@
        <EditText
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/rtk_addr_port"
            android:text="8080"
            android:background="@android:drawable/editbox_background_normal"/>
    </LinearLayout>
@@ -56,22 +58,25 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="15dp"
            android:text="用户名:"/>
            android:text="省ID:"/>
        <EditText
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="GpsExam"
            android:id="@+id/et_provice_id"
            android:text="12"
            android:inputType="numberDecimal"
            android:background="@android:drawable/editbox_background_normal"/>
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="10dp"
            android:text="密码:"/>
            android:text="市ID:"/>
        <EditText
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="192.168.23.12"
            android:inputType="textPassword"
            android:id="@+id/et_city_id"
            android:text="192"
            android:inputType="numberDecimal"
            android:background="@android:drawable/editbox_background_normal"/>
    </LinearLayout>
    <View
@@ -84,5 +89,6 @@
    <Button
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:id="@+id/btn_save_rtk"
        android:text="保存"/>
</LinearLayout>
app/src/main/res/values/strings.xml
@@ -17,4 +17,5 @@
    <string name="description_info">Info</string>
    <string name="request_permission">This sample needs camera permission.</string>
    <string name="camera_error">This device doesn\'t support Camera2 API.</string>
    <string name="rtk_addr_des">RTK平台地址:</string>
</resources>