main
huangwei 9 months ago
parent 22531334bb
commit 1e816330ca
  1. 4
      app/src/main/AndroidManifest.xml
  2. 6
      app/src/main/java/com/project/survey/adapter/LoftingListAdapter.java
  3. 1159
      app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
  4. 5
      app/src/main/res/drawable/icon_triangle_left.xml
  5. 5
      app/src/main/res/drawable/icon_triangle_right.xml
  6. 521
      app/src/main/res/layout/activity_point_staking.xml
  7. 7
      app/src/main/res/values/strings.xml

@ -142,6 +142,10 @@
android:name=".ui.instrument.mobilestationmode.base.RtkPointCorrectActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize|stateHidden" />
<activity
android:name=".ui.lofting.pointlofting.PointStakingActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize|stateHidden" />
</application>

@ -9,15 +9,18 @@ import com.project.survey.adapter.base.BaseAdapter;
import com.project.survey.adapter.viewholder.LoftingListViewHolder;
import com.project.survey.databinding.ItemLoftingListBinding;
import com.project.survey.model.LoftingListBean;
import com.project.survey.ui.lofting.pointlofting.PointStakingActivity;
/**
* 放样列表
*/
public class LoftingListAdapter extends BaseAdapter<LoftingListViewHolder, LoftingListBean> {
private final Context context;
public LoftingListAdapter(Context context) {
super(context);
this.context = context;
}
@NonNull
@ -29,6 +32,9 @@ public class LoftingListAdapter extends BaseAdapter<LoftingListViewHolder, Lofti
@Override
protected void onBindViewHolderDo(LoftingListViewHolder holder, int position) {
holder.mBinding.tvProjectMeasured.setOnClickListener(v -> {
PointStakingActivity.start(context);
});
}
}

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="32dp"
android:viewportHeight="1024" android:viewportWidth="1024"
android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#333333" android:pathData="M210,456.4L602.3,104.3A87.4,87.4 0,0 1,660.6 82C708.9,82 748,121.2 748,169.4v704.1a87.5,87.5 0,0 1,-22.3 58.4c-32.2,36 -87.5,39 -123.4,6.7L210,586.6a87.4,87.4 0,0 1,-6.7 -6.7c-32.2,-36 -29.2,-91.2 6.7,-123.5z"/>
</vector>

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="32dp"
android:viewportHeight="1024" android:viewportWidth="1024"
android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#333333" android:pathData="M765,456.4L372.7,104.3A87.4,87.4 0,0 0,314.4 82C266.1,82 227,121.2 227,169.4v704.1a87.5,87.5 0,0 0,22.3 58.4c32.2,36 87.5,39 123.4,6.7l392.2,-352.1a87.4,87.4 0,0 0,6.7 -6.7c32.2,-36 29.2,-91.2 -6.7,-123.5z"/>
</vector>

@ -0,0 +1,521 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/rectangle_radius_left_right_down_10_white_full"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal">
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<include
android:id="@+id/layout_pole_hr_height"
layout="@layout/layout_pole_hr_height" />
</FrameLayout>
<TextView
android:id="@+id/tv_staking_point_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:text="@string/staking_point_name"
android:textColor="@color/color_666666"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical">
<RelativeLayout
android:id="@+id/pointLibrary"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="5dp"
android:background="@mipmap/ic_library_bg">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/point_library_select_point"
android:textColor="@color/color_8a8a8a"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_hide_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="5dp">
<com.bingce.surveyor.ui.RotateLayout
android:id="@+id/dir_compass"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ic_compass_out_white"
android:scaleType="centerInside" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center"
android:background="@drawable/ic_compass_inner"
android:scaleType="centerInside" />
</FrameLayout>
</com.bingce.surveyor.ui.RotateLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_weight="2"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_distance"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/distance"
android:textColor="@color/color_575757"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold"
app:showUnit="true" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_dig_fill"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/dig_fill"
android:textColor="@color/color_575757"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold"
app:showUnit="true" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:orientation="horizontal">
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_top_three"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/to_west"
android:textColor="@color/color_575757"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold"
app:showUnit="true" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_top_four"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/to_south"
android:textColor="@color/color_575757"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold"
app:showUnit="true" />
</LinearLayout>
<LinearLayout
android:id="@+id/top_five_six_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:orientation="horizontal"
android:visibility="gone">
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_top_five"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/station_angle"
android:textColor="@color/color_575757"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold"
app:showUnit="true" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_top_six"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/station_angle_diff"
android:textColor="@color/color_575757"
android:textSize="@dimen/NormalTextSize"
android:textStyle="bold"
app:showUnit="true" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
<LinearLayout
android:id="@+id/ll_last_point"
android:layout_width="0dp"
android:layout_height="28dp"
android:layout_weight="1"
android:clickable="true"
android:elevation="3dp"
android:focusable="true"
android:gravity="center">
<ImageView
android:id="@+id/iv_last_point"
android:layout_width="10dp"
android:layout_height="10dp"
android:src="@drawable/icon_triangle_left" />
<TextView
android:id="@+id/tv_last_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:text="@string/last_point"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_recently_point"
android:layout_width="0dp"
android:layout_height="28dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:gravity="center">
<TextView
android:id="@+id/tv_recently_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/recently_point"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_next_point"
android:layout_width="0dp"
android:layout_height="28dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:clickable="true"
android:elevation="3dp"
android:focusable="true"
android:gravity="center">
<TextView
android:id="@+id/tv_next_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dp"
android:text="@string/next_point"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/iv_next_point"
android:layout_width="10dp"
android:layout_height="10dp"
android:src="@drawable/icon_triangle_right" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<lecho.hellocharts.view.LineChartView
android:id="@+id/line_chart_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/base_survey_staking_setting"
layout="@layout/layout_base_survey_staking_setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp" />
<LinearLayout
android:id="@+id/ll_scale"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:layout_alignParentRight="true"
android:layout_gravity="right"
android:layout_marginTop="5dp"
android:layout_marginRight="13dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_scale"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:textColor="#333333"
android:textSize="10sp"
tools:text="0m" />
<ImageView
android:id="@+id/iv_scale"
android:layout_width="33dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
android:scaleType="centerInside"
android:src="@drawable/ic_scale" />
</LinearLayout>
<TextView
android:id="@+id/tv_move_method"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_below="@+id/ll_scale"
android:layout_alignParentRight="true"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:background="@drawable/rectangle_radius_all_5_white_full"
android:gravity="center"
android:text="@string/move_way"
android:textColor="@color/black"
android:textSize="9sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_staking_record"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_below="@+id/tv_move_method"
android:layout_alignParentRight="true"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:background="@drawable/rectangle_radius_all_5_white_full"
android:gravity="center"
android:text="@string/collect_record"
android:textColor="@color/black"
android:textSize="9sp"
android:textStyle="bold" />
</RelativeLayout>
<LinearLayout
android:id="@+id/bottomLayout"
android:layout_width="match_parent"
android:layout_height="130dp"
android:background="@drawable/rectangle_radius_left_righ_up_10_white_full"
android:paddingBottom="5dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:paddingLeft="15dp">
<TextView
android:id="@+id/tv_target_coordinate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:text="@string/target_coordinate"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_target_x"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="X"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_target_y"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Y"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_target_z"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Z"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_measured_coordinate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:text="@string/measured_coordinate"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_survey_x"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="X"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_survey_y"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Y"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
<com.bingce.device.ui.widget.BingCeTextView
android:id="@+id/tv_survey_z"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Z"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<include
android:id="@+id/layout_drag_button"
layout="@layout/layout_dragging_button" />
</RelativeLayout>

@ -256,6 +256,13 @@
<string name="want_to_empty_code_library">确定要清空编码库所有的编码吗?</string>
<string name="code_model_library">编码模板库</string>
<string name="import_successful">导入成功</string>
<string name="staking_point_name">放样点名</string>
<string name="point_library_select_point">点库选点</string>
<string name="last_point">上一点</string>
<string name="recently_point">最近点</string>
<string name="next_point">下一点</string>
<string name="collect_record">采集\n记录</string>
<string name="measured_coordinate">实测坐标</string>
</resources>
Loading…
Cancel
Save