xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改布局适配bug(部分)

Browse Source
This commit is contained in:
md
2021-07-29 20:09:05 +08:00
parent d45be0360e
commit 440fd90a5f
14 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 29
buildToolsVersion '29.0.2'
//ndkVersion '23.0.7123448'
ndkVersion '23.0.7123448'
defaultConfig {
applicationId "com.navinfo.outdoor"

1
app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
View File

@@ -64,6 +64,7 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
}
}
handler.sendEmptyMessage(0x105);
}
}).start();
}

2
app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
View File

@@ -957,6 +957,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}
private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList<File> chargingStationList) {
showLoadingDialog();
if (poiEntity == null || poiEntity.getBodyId() == 0) {
Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show();
Log.e("TAG", "poiUploadByNetWork: " + poiEntity.getBodyId() + chargingStationList);
@@ -979,6 +980,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
OkGo
// 请求方式和请求url
.<PoiUploadBean>post(HttpInterface.C_TASK_UP_LOAD_PIC)

1
app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
View File

@@ -454,6 +454,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
Log.e("TAG", "poiUploadByNetWork: " + body + otherUploadList);
return;
}
showLoadingDialog();
OkGo
// 请求方式和请求url
.<PoiUploadBean>post(HttpInterface.OTHER_TASK_UPLOAD_PIC)

1
app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
View File

@@ -725,6 +725,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
Log.e("TAG", "poiUploadByNetWork: " + body + poiPicList);
return;
}
showLoadingDialog();
OkGo
// 请求方式和请求url
.<OtherUploadPicBean>post(HttpInterface.POI_TASK_UPLOAD_PIC)

9
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@@ -220,7 +220,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
ivPoiVideoPicture.setTag(videoFile);
}
}else {
Toast.makeText(getContext(), "请先录像", Toast.LENGTH_SHORT).show();
}
}
//判断是否是已做完任务并保存成功
@@ -236,6 +236,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
tvPictures.setEnabled(false);
etDesc.setEnabled(false);
btnRoadSave.setEnabled(false);
rbCar.setEnabled(false);
rbWalking.setEnabled(false);
rbManual.setEnabled(false);
rbBicycle.setEnabled(false);
}
@Override
@@ -441,6 +445,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show();
return;
}
showLoadingDialog();
OkGo
// 请求方式和请求url
.<OtherUploadPicBean>post(HttpInterface.POI_VIDEO_UPLOAD_PIC)
@@ -520,7 +525,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}).start();
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(), "没有获取到具体位置", Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), ""+poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show();
}
}

2
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@@ -196,6 +196,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
}
}
}
if (showPoiEntity.getTaskStatus() == 3){
disables();
}
@@ -414,6 +415,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
Toast.makeText(getContext(), "未压缩完成", Toast.LENGTH_SHORT).show();
return;
}
showLoadingDialog();
OkGo
// 请求方式和请求url
.<OtherUploadPicBean>post(HttpInterface.ROAD_TASK_UPLOAD_PIC)

2
app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
View File

@@ -202,6 +202,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
staySubmitAdapter.setAllCheckedDelete();
staySubmitAdapter.notifyDataSetChanged();
return false;
}
});
@@ -252,6 +253,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
}
Log.d("TAG", "run: " + roadEntities.toString());
staySubmitAdapter.setAllRoad(roadEntities);
staySubmitAdapter.notifyDataSetChanged();
}
});
}

2
app/src/main/res/layout/charging_pile_fragment.xml
View File

@@ -107,6 +107,8 @@
android:layout_toRightOf="@id/tv_name"
android:background="@color/white"
android:text="充电桩"
android:inputType="text"
android:maxLines="1"
android:layout_toEndOf="@id/tv_name"
android:textSize="15sp"
android:textColor="#333" />

2
app/src/main/res/layout/charging_station_fragment.xml
View File

@@ -108,6 +108,8 @@
android:layout_toRightOf="@id/tv_name"
android:background="@color/white"
android:hint="名称"
android:inputType="text"
android:maxLines="1"
android:layout_toEndOf="@id/tv_name"
android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp"

2
app/src/main/res/layout/fragment_other.xml
View File

@@ -150,6 +150,8 @@
android:layout_marginLeft="15dp"
android:background="@null"
android:hint="任务名称"
android:inputType="text"
android:maxLines="1"
android:textColor="@color/test_color_selector"
android:textSize="12sp" />
</LinearLayout>

8
app/src/main/res/layout/fragment_road.xml
View File

@@ -34,11 +34,13 @@
<LinearLayout
android:id="@+id/ll_name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:orientation="horizontal"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
app:layout_constraintStart_toStartOf="@+id/tv_message"
app:layout_constraintTop_toBottomOf="@+id/tv_message">
@@ -53,10 +55,12 @@
<EditText
android:id="@+id/et_road_name"
android:layout_width="200dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="match_parent"
android:textSize="14sp"
android:inputType="text"
android:maxLines="1"
android:background="@null" />
</LinearLayout>

4
app/src/main/res/layout/poi_fragment.xml
View File

@@ -103,12 +103,14 @@
<EditText
android:id="@+id/tv_name_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_toRightOf="@id/tv_name"
android:background="@color/white"
android:hint="poi名称"
android:inputType="text"
android:maxLines="1"
android:layout_toEndOf="@id/tv_name"
android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp"

8
app/src/main/res/layout/poi_video_fragment.xml
View File

@@ -30,11 +30,13 @@
<LinearLayout
android:id="@+id/ll_name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:orientation="horizontal"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
app:layout_constraintStart_toStartOf="@+id/tv_message"
app:layout_constraintTop_toBottomOf="@+id/tv_message">
@@ -49,8 +51,10 @@
<EditText
android:id="@+id/et_poi_video_name"
android:layout_width="200dp"
android:layout_width="match_parent"
android:textSize="14sp"
android:inputType="text"
android:maxLines="1"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="@null" />