lizhanwei
2020-01-15 60816f4d7a07aa16779d92b3221ba1f2ae85ba1f
修改my profile
6个文件已修改
2个文件已添加
128 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatus.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusWorker.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/antennaxml.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/gps.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/profile_layout.xml 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/strings.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatus.java
@@ -68,4 +68,16 @@
    public void setDefault_boserve2(int default_boserve2) {
        this.default_boserve2 = default_boserve2;
    }
    @Override
    public String toString() {
        return "AppStatus{" +
                "rtk_login_code=" + rtk_login_code +
                ", rtk_connect_status=" + rtk_connect_status +
                ", id=" + id +
                ", work_platform=" + work_platform +
                ", default_observe1=" + default_observe1 +
                ", default_boserve2=" + default_boserve2 +
                '}';
    }
}
app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusWorker.java
@@ -49,7 +49,7 @@
                    int workconn =jsonObject.getInt("work_platform");
                    appStatusDao.updatework_platformStatus(workconn);
                    break;
            }
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -10,6 +10,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@@ -33,6 +34,8 @@
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatus;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusViewModel;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProjViewModel;
@@ -68,8 +71,9 @@
    private int item_id;//扣分分数总和
    private ExamStatusViewModel examStatusViewModel;
    private static final int ADD_DATA = 1;
    private TextView tv_speed,tv_total_score;
    private TextView tv_speed,tv_total_score,tv_sat_num;
    private double speed=0.0;
    private ImageView iv_rtk_status;
    private int currTotalScore = 100;
    private List<ScoreBean> mArrayList = new ArrayList<>();
@@ -158,6 +162,18 @@
        });
        AppStatusViewModel appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
        appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
            @Override
            public void onChanged(AppStatus appStatus) {
                if (appStatus != null){
                    Log.i(TAG, "onChanged: "+appStatus.toString());
                    iv_rtk_status.getDrawable().setLevel(appStatus.getRtk_connect_status());
                    tv_sat_num.setText(String.valueOf(appStatus.getDefault_observe1()));
                }
            }
        });
        return view;
    }
@@ -216,6 +232,8 @@
        av_zhijiao = view.findViewById(R.id.av4);
        houseView = view.findViewById(R.id.hv);
        iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
        tv_sat_num = view.findViewById(R.id.tv_sat_num);
        tv_speed = view.findViewById(R.id.tv_speed);
        tv_total_score = view.findViewById(R.id.tv_total_score);
        tv_speed.setText(getResources().getString(R.string.speed,speed));
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -17,6 +17,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@@ -35,6 +36,8 @@
import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.DB.Student;
import safeluck.drive.evaluation.DB.WokViewModel;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatus;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusViewModel;
import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
@@ -70,10 +73,11 @@
    private ExamStatusViewModel examStatusViewModel;
    private static final int ADD_DATA = 1;
    private static final int SPEED_DATA = 2;
    private ImageView iv_rtk_status;
    private List<ScoreBean> mArrayList = new ArrayList<>();
    private View tv_stop;
    private TextView tv_speed,tv_total_score;
    private TextView tv_speed,tv_total_score,tv_sat_num;
    private int currTotalScore = 100;
    private double speed=0.0;
@@ -165,6 +169,20 @@
            }
        });
        AppStatusViewModel appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
        appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
            @Override
            public void onChanged(AppStatus appStatus) {
                if (appStatus != null){
                    Log.i(TAG, "onChanged: "+appStatus.toString());
                    iv_rtk_status.getDrawable().setLevel(appStatus.getRtk_connect_status());
                    tv_sat_num.setText(String.valueOf(appStatus.getDefault_observe1()));
                }
            }
        });
        return view;
    }
    private void initView(View view) {
@@ -176,6 +194,9 @@
        houseView = view.findViewById(R.id.hv);
        tv_speed = view.findViewById(R.id.tv_speed);
        iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
        tv_sat_num = view.findViewById(R.id.tv_sat_num);
        tv_total_score = view.findViewById(R.id.tv_total_score);
        tv_speed.setText(getResources().getString(R.string.speed,speed));
        view.findViewById(R.id.btn_return).setOnClickListener(this);
app/src/main/res/drawable/antennaxml.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:maxLevel="0" android:drawable="@drawable/antenna_red" />
    <item android:maxLevel="1" android:drawable="@drawable/antenna" />
</level-list>
app/src/main/res/drawable/gps.png
app/src/main/res/layout/profile_layout.xml
@@ -11,7 +11,7 @@
        android:id="@+id/iv_head"
        android:layout_width="0dp"
        android:layout_height="70dp"
        android:layout_weight="0.5"
        android:layout_weight="1"
        android:scaleType="fitXY"
        android:src="@drawable/header" />
@@ -20,7 +20,7 @@
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginLeft="10dp"
        android:layout_weight="3.5"
        android:layout_weight="3"
        android:orientation="vertical">
        <LinearLayout
@@ -51,6 +51,7 @@
                android:textColor="@android:color/white"/>
            <TextView
                android:visibility="gone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_toRightOf="@+id/tv_sex"
@@ -72,17 +73,19 @@
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_below="@+id/tv_name"
                android:layout_weight="1"
                android:layout_weight="2"
                android:text="@string/user_id"
                android:textColor="@android:color/white" />
            <TextView
                android:id="@+id/inspect"
                android:id="@+id/tv_use_time"
                android:layout_width="0dp"
                android:layout_weight="1"
                android:layout_height="wrap_content"
                android:text="@string/inspector"
                android:textColor="@android:color/white"/>
                android:visibility="gone"
                android:text="用时:"
                android:textColor="@android:color/white" />
        </LinearLayout>
        <LinearLayout
@@ -95,20 +98,10 @@
                android:id="@+id/tv_start_time"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:text="开始时间:"
                android:text="开始时间:"
                android:layout_weight="1"
                android:textColor="@android:color/white"/>
            <TextView
                android:id="@+id/tv_use_time"
                android:layout_width="0dp"
                android:layout_weight="1"
                android:layout_height="wrap_content"
                android:text="用时:"
                android:textColor="@android:color/white" />
            <TextView
                android:id="@+id/view_map"
@@ -117,25 +110,53 @@
                android:layout_weight="1"
                android:text="查看地图"
                android:textColor="@android:color/white"/>
        </LinearLayout>
    </LinearLayout>
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="100dp"
        android:layout_weight="0.5"
        android:gravity="center"
        android:orientation="horizontal"
    >
        <ImageView
            android:layout_width="20dp"
            android:layout_height="20dp"
            android:id="@+id/iv_gps"
            android:src="@drawable/gps" />
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textColor="@android:color/white"
            android:id="@+id/tv_sat_num"
            android:gravity="center"
            android:text="10"  />
    </LinearLayout>
    <LinearLayout
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_weight="0.5"
        android:layout_weight="1"
        android:gravity="center"
        android:orientation="vertical"
    >
        >
        <ImageView
            android:layout_width="wrap_content"
            android:layout_height="0dp"
            android:layout_weight="1"
            android:src="@drawable/antenna" />
            android:id="@+id/iv_rtk_connect"
            android:src="@drawable/antennaxml" />
        <TextView
            android:layout_width="wrap_content"
app/src/main/res/values/strings.xml
@@ -27,4 +27,5 @@
    <string name="speed">车速:%1$.2fkm/h</string>
    <string name="licheng">已行驶:451km</string>
    <string name="total_score">%1$d</string>
    <string name="sat_num">卫星数量</string>
</resources>