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

修改marker图标样式和提出的bug

Browse Source
This commit is contained in:
md
2021-08-13 22:05:43 +08:00
parent 974ad50612
commit 777e3737fe
29 changed files with 579 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
View File

@@ -7,6 +7,7 @@ import android.content.res.Configuration;
import android.os.Message;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
@@ -43,6 +44,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
private SharedPreferences navInfo;
private SharedPreferences.Editor navInfoEditor;
private TextView tvStatement;
private CheckBox cbStatement;
@Override
public void onStart() {
@@ -82,6 +84,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
etLoginName = findViewById(R.id.et_login_name);
etLoginPaw = findViewById(R.id.et_login_paw);
tvForgetPaw = findViewById(R.id.tv_forget_paw);
cbStatement = findViewById(R.id.iv_login_check);
btnLogin = findViewById(R.id.btn_login);
btnLogin.setOnClickListener(this::onClick);
tvStatement = findViewById(R.id.tv_statement);
@@ -125,11 +128,18 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show();
return;
}
initLogIn(name, paw);
if (!cbStatement.isChecked()){
Toast.makeText(this, "请先同意免责协议", Toast.LENGTH_SHORT).show();
return;
}else {
initLogIn(name, paw);
}
break;
case R.id.tv_statement:
Intent stateIntent = new Intent(this, StatementActivity.class);
startActivity(stateIntent);
break;
}
}

27
app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java
View File

@@ -3,14 +3,33 @@ package com.navinfo.outdoor.activity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.widget.ImageView;
import android.widget.TextView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.base.BaseActivity;
public class StatementActivity extends AppCompatActivity {
public class StatementActivity extends BaseActivity {
private android.widget.TextView tvTextStatement;
private android.widget.ImageView ivStatement;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_statement);
protected int getLayout() {
return R.layout.activity_statement;
}
@Override
protected void initView() {
super.initView();
tvTextStatement = (TextView) findViewById(R.id.tv_textStatement);
ivStatement = (ImageView) findViewById(R.id.iv_statement);
}
@Override
protected void initData() {
super.initData();
}
}

10
app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
View File

@@ -111,8 +111,14 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
@Override
public void onSuccess(TaskPrefectureBean response, int id) {
dismissLoadingDialog();
capacityEvaluationAdapter.setCapacityList(response.getBody().getList());
capacityPage++;
if (response.getCode() == 200){
capacityEvaluationAdapter.setCapacityList(response.getBody().getList());
capacityPage++;
}else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + response.getMessage() + "sssssssssssss");
}

7
app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java
View File

@@ -97,7 +97,12 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On
@Override
public void onSuccess(TaskPrefectureBean response, int id) {
dismissLoadingDialog();
capacityItemAdapter.setCapItemList(response.getBody().getList());
if (response.getCode() == 200){
capacityItemAdapter.setCapItemList(response.getBody().getList());
}else {
Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + response.getMessage() + "sssssssssssss");
}

20
app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
View File

@@ -455,7 +455,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivAvailable.setImageDrawable(null);
@@ -469,7 +469,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivUsable.setImageDrawable(null);
@@ -483,7 +483,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivScutcheon.setImageDrawable(null);
@@ -497,7 +497,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivParking.setImageDrawable(null);
@@ -511,7 +511,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivPanorama.setImageDrawable(null);
@@ -525,7 +525,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivNumber.setImageDrawable(null);
@@ -539,7 +539,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivFacility.setImageDrawable(null);
@@ -553,7 +553,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivEquipment.setImageDrawable(null);
@@ -567,7 +567,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivDevice.setImageDrawable(null);
@@ -581,7 +581,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivCoding.setImageDrawable(null);

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

@@ -225,7 +225,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
btnUploading.setOnClickListener(this::onClick);
editNameContent = findViewById(R.id.tv_name_content);
editSiteContent = findViewById(R.id.tv_site_content);
tvExamine = findViewById(R.id.tv_examine);
tvExamine = findViewById(R.id.tv_station_examine);
tvExamine.setOnClickListener(this::onClick);
editDescribe = findViewById(R.id.edit_describe);
ivPanorama = findViewById(R.id.iv_panorama);
@@ -384,7 +384,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivElse.setImageDrawable(null);
@@ -398,7 +398,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivScutcheon.setImageDrawable(null);
@@ -412,7 +412,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivPanorama.setImageDrawable(null);
@@ -426,7 +426,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivName.setImageDrawable(null);
@@ -440,7 +440,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivInternal.setImageDrawable(null);
@@ -464,6 +464,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
if (name != null && !name.equals("")) {
editNameContent.setText(name + "");
}
editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
if (!hasFocus){
findingDuplicateByWork();
}
}
});
String address = showPoiEntity.getAddress();//地址
if (address != null && !address.equals("")) {
editSiteContent.setText(address);
@@ -776,7 +784,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}
}).start();
break;
case R.id.tv_examine:
case R.id.tv_station_examine:
findingDuplicateByWork();
break;
case R.id.rl_panorama:
@@ -1184,6 +1192,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}else {
Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
}
}else {
Toast.makeText(getContext(), taskNameBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
}

10
app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java
View File

@@ -77,9 +77,15 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic
@Override
public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) {
dismissLoadingDialog();
eventPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
if (taskPrefectureBean.getCode() == 200){
eventPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
eventPage++;
}else {
Toast.makeText(getContext(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "sssssssssssss");
eventPage++;
//initEventPrefecture(eventPrefectureBean,b);
}

77
app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
View File

@@ -115,12 +115,17 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
@Override
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
if (hasSubmitBean.getCode() == 200){
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
}else {
Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
}
@@ -148,12 +153,17 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
@Override
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
chargingAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
if (hasSubmitBean.getCode() == 200){
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
chargingAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
}else {
Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
}
@@ -181,12 +191,17 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
@Override
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
if (hasSubmitBean.getCode() == 200){
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
}else {
Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
}
@@ -214,12 +229,17 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
@Override
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
if (hasSubmitBean.getCode() == 200){
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
}
}else {
Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
}
@@ -247,14 +267,19 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
@Override
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
dismissLoadingDialog();
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
auditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
auditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
if (hasSubmitBean.getCode() == 200){
HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
if (hasSubmitBeanBody!=null){
auditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
auditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
}
}else {
Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
}
@Override

13
app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
View File

@@ -115,12 +115,17 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
public void onSuccess(GetPriceBean response, int id) {
dismissLoadingDialog();
// Toast.makeText(getContext(), "获取成功", Toast.LENGTH_SHORT).show();
GetPriceBean.BodyBean body = response.getBody();
if (body!=null){
Double userPrice =body.getUserPrice();
tvMoney.setText(userPrice + "");
if (response.getCode() == 200){
GetPriceBean.BodyBean body = response.getBody();
if (body!=null){
Double userPrice =body.getUserPrice();
tvMoney.setText(userPrice + "");
}
}else {
Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt");
}

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

@@ -130,7 +130,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
public void onResume() {
super.onResume();
View header =mView.findViewById(R.id.other_header);
View header = mView.findViewById(R.id.other_header);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -153,11 +153,11 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), FragmentManagement.class);
intent.putExtra("tag",8);
intent.putExtra("tag", 8);
startActivity(intent);
}
});
moveLatlng(latLng,null);
moveLatlng(latLng, null);
}
@Override
@@ -221,7 +221,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
}
});
nestedScrollView = findViewById(R.id.nested_scroll_view);
if (slidingPaneLayout!=null) {
if (slidingPaneLayout != null) {
slidingPaneLayout.setScrollableView(nestedScrollView);
}
editTaskName = findViewById(R.id.et_task_name);
@@ -252,7 +252,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivPicture.setImageDrawable(null);
@@ -267,7 +267,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivPictures.setImageDrawable(null);
@@ -318,18 +318,18 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
markerOther = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor));
markerOther.setZIndex(4);
moveLatlng(latLng,null);
moveLatlng(latLng, null);
}
String describe = showPoiEntity.getMemo();//任务描述
if (describe != null && !describe.equals("")) {
editOtherDescribe.setText(describe);
}
int station_type = showPoiEntity.getStation_type();
if (station_type==5){
if (station_type == 5) {
spinnerOther.setSelection(0, true);
}else if (station_type==6){
} else if (station_type == 6) {
spinnerOther.setSelection(1, true);
}else if (station_type==7){
} else if (station_type == 7) {
spinnerOther.setSelection(2, true);
}
if (showPoiEntity.getPhotoInfo() != null) {
@@ -347,7 +347,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
}
}
//判断是否是已完成作业并保存成功
if (showPoiEntity.getTaskStatus()==3){
if (showPoiEntity.getTaskStatus() == 3) {
disables();
}
}
@@ -363,7 +363,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
break;
case R.id.rl_pictures:
Intent intentPictures = new Intent("android.media.action.IMAGE_CAPTURE");
file = PhotoUtils.showPhotoFile("b",latLng);
file = PhotoUtils.showPhotoFile("b", latLng);
intentPictures.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentPictures, 102);
break;
@@ -399,9 +399,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null||poiDaoPoiEntity.getTaskStatus()==1||poiDaoPoiEntity.getTaskStatus()==2||poiDaoPoiEntity.getTaskStatus()==0||poiDaoPoiEntity.getTaskStatus()==5){
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0 || poiDaoPoiEntity.getTaskStatus() == 5) {
initPoiSaveLocal(true);
}else {
} else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -415,6 +415,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
break;
}
}
public void initPoiSaveLocal(boolean isLocal) {
XXPermissions.with(this)
//读写权限
@@ -427,7 +428,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity);
if (poiCheckResult.getCode() == 1) {
Toast.makeText(getActivity(), poiCheckResult.getMsg()+"", Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show();
return;
}
new Thread(new Runnable() {
@@ -437,7 +438,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
otherSaveByNetWork(poiEntity,isLocal);
otherSaveByNetWork(poiEntity, isLocal);
}
});
@@ -459,6 +460,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
}
});
}
private void otherUploadByNet(int body, List<File> otherUploadList) {
if (body == 0) {
Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show();
@@ -466,9 +468,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
return;
}
HttpParams httpParams=new HttpParams();
httpParams.put("auditId",body);
showLoadingDialog();
HttpParams httpParams = new HttpParams();
httpParams.put("auditId", body);
showLoadingDialog();
setLoadingDialogText("上传中...");
OkGoBuilder.getInstance()
.Builder(getActivity())
@@ -477,42 +479,46 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
.token(Constant.ACCESS_TOKEN)
.params(httpParams)
.cls(PoiUploadBean.class)
.postFileAsynchronous( new Callback<PoiUploadBean>() {
@Override
public void onSuccess(PoiUploadBean response, int id) {
dismissLoadingDialog();
new Thread(new Runnable() {
.postFileAsynchronous(new Callback<PoiUploadBean>() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
}
public void onSuccess(PoiUploadBean response, int id) {
dismissLoadingDialog();
if (response.getCode() == 200) {
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
} else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
}
@Override
public void onError(Throwable e, int id) {
dismissLoadingDialog();
Toast.makeText(getActivity(), e.getMessage()+ "", Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + e.getMessage() + "");
}
});
}
@Override
public void onError(Throwable e, int id) {
dismissLoadingDialog();
Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + e.getMessage() + "");
}
});
dismissDialog();
}
private void otherSaveByNetWork(PoiEntity poiEntity,boolean isLocal) {
private void otherSaveByNetWork(PoiEntity poiEntity, boolean isLocal) {
showLoadingDialog();
setLoadingDialogText("保存中...");
HttpParams httpParams = new HttpParams();
@@ -532,9 +538,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
public void onSuccess(PoiSaveBean poiSaveBean, int id) {
dismissLoadingDialog();
if (poiSaveBean.getCode()==200){
if (poiSaveBean.getCode() == 200) {
Integer body = poiSaveBean.getBody();
if (body!=null&&body!=0){
if (body != null && body != 0) {
poiEntity.setBodyId(body);
poiEntity.setTaskStatus(3);
new Thread(new Runnable() {
@@ -544,26 +550,26 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
if (isLocal){
otherUploadByNet(body,otherUploadList);
}else {
if (isLocal) {
otherUploadByNet(body, otherUploadList);
} else {
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity(). onBackPressed();
getActivity().onBackPressed();
}
}
});
}
}).start();
}else {
Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
}else {
Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
@@ -584,6 +590,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
super.onSaveInstanceState(outState);
initOtherSharePre();
}
/**
* 防止当页面崩溃后出现数据丢失
*/
@@ -612,22 +619,22 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return;
}else {
} else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivPicture);
tvPicture.setTag(s);
}
file=null;
file = null;
} else if (requestCode == 102 && resultCode == RESULT_OK) {
//照片路径
if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return;
}else {
} else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivPictures);
tvPictures.setTag(s);
}
file=null;
file = null;
}
}
@@ -636,7 +643,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
if (EventBus.getDefault().isRegistered(this))//加上判断
EventBus.getDefault().unregister(this);
super.onDestroy();
if (showPoiEntity!=null){
if (showPoiEntity != null) {
new Thread(new Runnable() {
@Override
public void run() {
@@ -650,7 +657,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
}
}).start();
}
if (markerOther!=null){
if (markerOther != null) {
markerOther.remove();
}
}
@@ -696,22 +703,22 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
protected PoiCheckResult checkPoiEntity(PoiEntity entity) {
PoiCheckResult poiCheckResult = new PoiCheckResult();
if (entity.getName()==null){
if (entity.getName() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请输入 名称");
return poiCheckResult;
}
if (tvPicture.getTag()==null){
if (tvPicture.getTag() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请 拍照");
return poiCheckResult;
}
if ( tvPictures.getTag()==null){
if (tvPictures.getTag() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请 拍照");
return poiCheckResult;
}
if (entity.getX()==null&&entity.getY()==null){
if (entity.getX() == null && entity.getY() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请确定点位");
return poiCheckResult;

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

@@ -140,7 +140,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public void onResume() {
super.onResume();
View header =mView.findViewById(R.id.poi_header);
View header = mView.findViewById(R.id.poi_header);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -163,11 +163,11 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), FragmentManagement.class);
intent.putExtra("tag",8);
intent.putExtra("tag", 8);
startActivity(intent);
}
});
moveLatlng(latLng,null);
moveLatlng(latLng, null);
}
@Override
@@ -209,7 +209,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
});
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
nestedScrollView = findViewById(R.id.nested_scroll_view);
if (slidingPaneLayout!=null) {
if (slidingPaneLayout != null) {
slidingPaneLayout.setScrollableView(nestedScrollView);
}
checkBoxRight.setVisibility(View.GONE);
@@ -285,7 +285,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivPanorama.setImageDrawable(null);
@@ -299,7 +299,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivName.setImageDrawable(null);
@@ -313,7 +313,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivElse.setImageDrawable(null);
@@ -327,7 +327,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivInternal.setImageDrawable(null);
@@ -341,7 +341,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
ivCard.setImageDrawable(null);
@@ -365,6 +365,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (name != null && !name.equals("")) {
editNameContent.setText(name + "");
}
editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
if (!hasFocus) {
findingDuplicateByWork();
}
}
});
String address = showPoiEntity.getAddress();//地址
if (address != null && !address.equals("")) {
editSiteContent.setText(address);
@@ -379,7 +387,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor));
markerPoi.setZIndex(4);
moveLatlng(latLng,null);
moveLatlng(latLng, null);
}
//得到区号
initPhone();
@@ -538,7 +546,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}
@Subscribe
public void onEvent(Message data) {
if (data.what == Constant.POI_WORD) {
@@ -591,12 +598,11 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (tagCard != null) {
poiPicList.add(new File(tagCard));
}
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0||poiDaoPoiEntity.getTaskStatus()==5) {
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0 || poiDaoPoiEntity.getTaskStatus() == 5) {
initPoiSaveLocal(true);
} else {
getActivity().runOnUiThread(new Runnable() {
@@ -614,31 +620,32 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
break;
case R.id.rl_panorama:
Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE");
file = PhotoUtils.showPhotoFile("a", latLng);;
file = PhotoUtils.showPhotoFile("a", latLng);
;
intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentPanorama, 101);
break;
case R.id.rl_name:
Intent intentName = new Intent("android.media.action.IMAGE_CAPTURE");
file =PhotoUtils.showPhotoFile("b", latLng);
file = PhotoUtils.showPhotoFile("b", latLng);
intentName.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentName, 102);
break;
case R.id.rl_internal_photos:
Intent intentInternal = new Intent("android.media.action.IMAGE_CAPTURE");
file =PhotoUtils.showPhotoFile("c", latLng);
file = PhotoUtils.showPhotoFile("c", latLng);
intentInternal.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentInternal, 103);
break;
case R.id.rl_card:
Intent intentCard = new Intent("android.media.action.IMAGE_CAPTURE");
file =PhotoUtils.showPhotoFile("d", latLng);
file = PhotoUtils.showPhotoFile("d", latLng);
intentCard.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentCard, 104);
break;
case R.id.rl_else:
Intent intentElse = new Intent("android.media.action.IMAGE_CAPTURE");
file =PhotoUtils.showPhotoFile("e",latLng);
file = PhotoUtils.showPhotoFile("e", latLng);
intentElse.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentElse, 105);
break;
@@ -661,21 +668,23 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public void onSuccess(TaskNameBean taskNameBean, int id) {
dismissLoadingDialog();
if (taskNameBean.getCode()==200){
if (taskNameBean.getCode() == 200) {
List<String> body = taskNameBean.getBody();
if (body!=null){
if (body != null) {
for (int i = 0; i < body.size(); i++) {
str +=body.get(i) + ",";
str += body.get(i) + ",";
}
if (str!=null){
Toast.makeText(getContext(), "存在类似名称---"+str, Toast.LENGTH_SHORT).show();
if (str != null) {
Toast.makeText(getContext(), "存在类似名称---" + str, Toast.LENGTH_SHORT).show();
str = "";
}else {
} else {
Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
}
}else {
} else {
Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
}
} else {
Toast.makeText(getContext(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show();
}
}
@@ -702,7 +711,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity);
if (poiCheckResult.getCode() == 1) {
Toast.makeText(getActivity(), poiCheckResult.getMsg()+"", Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show();
return;
}
new Thread(new Runnable() {
@@ -740,10 +749,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
Log.e("TAG", "poiUploadByNetWork: " + body + poiPicList);
return;
}
showLoadingDialog();
showLoadingDialog();
setLoadingDialogText("上传中...");
HttpParams httpParams=new HttpParams();
httpParams.put("auditId",body);
HttpParams httpParams = new HttpParams();
httpParams.put("auditId", body);
OkGoBuilder.getInstance()
.url(HttpInterface.POI_TASK_UPLOAD_PIC)
.cls(OtherUploadPicBean.class)
@@ -751,35 +760,40 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
.fileList(poiPicList)
.params(httpParams)
.postFileAsynchronous(new Callback<OtherUploadPicBean>() {
@Override
public void onSuccess(OtherUploadPicBean response, int id) {
dismissLoadingDialog();
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
}
public void onSuccess(OtherUploadPicBean response, int id) {
dismissLoadingDialog();
if (response.getCode() == 200) {
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
} else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
}
@Override
public void onError(Throwable e, int id) {
dismissLoadingDialog();
Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show();
}
});
}
@Override
public void onError(Throwable e, int id) {
dismissLoadingDialog();
Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show();
}
});
dismissDialog();
}
@@ -806,9 +820,9 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public void onSuccess(PoiSaveBean poiSaveBean, int id) {
dismissLoadingDialog();
if (poiSaveBean.getCode()==200){
if (poiSaveBean.getCode() == 200) {
Integer body = poiSaveBean.getBody();
if (body!=null&&body!=0){
if (body != null && body != 0) {
poiEntity.setBodyId(body);
poiEntity.setTaskStatus(3);
new Thread(new Runnable() {
@@ -832,11 +846,11 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
});
}
}).start();
}else {
Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
}else {
Toast.makeText(getActivity(), ""+poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
@@ -878,14 +892,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 101 && resultCode == RESULT_OK) {
if (file==null||!file.exists()){
if (file == null || !file.exists()) {
Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
return;
}else {
} else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivPanorama);
tvPanorama.setTag(s);
}
file=null;
file = null;
/* int height = bitmap.getHeight();
int width = bitmap.getWidth();
if (height > width) {
@@ -903,14 +917,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}*/
} else if (requestCode == 102 && resultCode == RESULT_OK) {
if (file==null||!file.exists()){
if (file == null || !file.exists()) {
Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
return;
}else {
} else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivName);
tvPoiNamePic.setTag(s);
}
file=null;
file = null;
/* int height = bitmap.getHeight();
int width = bitmap.getWidth();
@@ -928,14 +942,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}*/
} else if (requestCode == 103 && resultCode == RESULT_OK) {
if (file==null||!file.exists()){
if (file == null || !file.exists()) {
Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
return;
}else {
} else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivInternal);
tvInternal.setTag(s);
}
file=null;
file = null;
/*int height = bitmap.getHeight();
int width = bitmap.getWidth();
if (height > width) {
@@ -952,10 +966,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}*/
} else if (requestCode == 104 && resultCode == RESULT_OK) {
if (file==null||!file.exists()){
if (file == null || !file.exists()) {
Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
return;
}else {
} else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivCard);
tvCard.setTag(s);
}
@@ -976,10 +990,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}*/
} else if (requestCode == 105 && resultCode == RESULT_OK) {
if (file==null||!file.exists()){
if (file == null || !file.exists()) {
Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
return;
}else {
} else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivElse);
tvElse.setTag(s);
}
@@ -1013,7 +1027,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (EventBus.getDefault().isRegistered(this))//加上判断
EventBus.getDefault().unregister(this);
super.onDestroy();
if (showPoiEntity!=null){
if (showPoiEntity != null) {
new Thread(new Runnable() {
@Override
public void run() {
@@ -1027,7 +1041,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}
}).start();
}
if (markerPoi!=null){
if (markerPoi != null) {
markerPoi.remove();
}
}
@@ -1095,27 +1109,27 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
protected PoiCheckResult checkPoiEntity(PoiEntity entity) {
PoiCheckResult poiCheckResult = new PoiCheckResult();
if (entity.getName()==null){
if (entity.getName() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请输入 名称");
return poiCheckResult;
}
if (tvPanorama.getTag()==null){
if (tvPanorama.getTag() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请 拍照");
return poiCheckResult;
}
if (tvPoiNamePic.getTag()==null){
if (tvPoiNamePic.getTag() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请 拍照");
return poiCheckResult;
}
if (entity.getX()==null&&entity.getY()==null){
if (entity.getX() == null && entity.getY() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请确定 点位");
return poiCheckResult;
}
if (entity.getTelPhone()==null){
if (entity.getTelPhone() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请输入 手机号");
return poiCheckResult;

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

@@ -121,9 +121,14 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
@Override
public void onSuccess(HasSubmitBean hasSubmitBean, int id) {
dismissLoadingDialog();
if (hasSubmitBean.getBody()!=null){
initHasSubmitBean(hasSubmitBean,aBoolean);
if (hasSubmitBean.getCode() == 200){
if (hasSubmitBean.getBody()!=null){
initHasSubmitBean(hasSubmitBean,aBoolean);
}
}else {
Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
}
@Override

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

@@ -424,24 +424,29 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
@Override
public void onSuccess(OtherUploadPicBean response, int id) {
dismissLoadingDialog();
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
if (response.getCode() == 200){
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
}else {
Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show();
}
}
@Override

3
app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
View File

@@ -203,8 +203,9 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().finish();
}else {
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
}
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
}
@Override
public void onError(Throwable e, int id) {

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

@@ -204,7 +204,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
@@ -239,7 +239,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
latLng = new LatLng();
latLng.setLongitude(Double.parseDouble(x));
latLng.setLatitude(Double.parseDouble(y));
BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bag);
markerRoad = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor));
markerRoad.setZIndex(4);
moveLatlng(latLng,null);
@@ -428,24 +428,28 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override
public void onSuccess(OtherUploadPicBean response, int id) {
dismissLoadingDialog();
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
if (response.getCode()==200){
new Thread(new Runnable() {
@Override
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
poiDao.deletePoiEntity(poiDaoPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().onBackPressed();//回退
}
});
}
}).start();
}else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
}
}
@Override

17
app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
View File

@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.Toast;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -26,6 +27,7 @@ import com.jcodecraeer.xrecyclerview.XRecyclerView;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
/**
* 发现-任务说明
@@ -36,6 +38,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
private TaskExplainAdapter taskExplainAdapter;
private int taskPage = 1;
private Integer fId;
public static TaskExplainFragment newInstance(Bundle bundle) {
@@ -112,8 +115,18 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
@Override
public void onSuccess(TaskPrefectureBean response, int id) {
dismissLoadingDialog();
taskExplainAdapter.setExplainList(response.getBody().getList());
taskPage++;
if (response.getCode() == 200){
taskExplainAdapter.setExplainList(response.getBody().getList());
TaskPrefectureBean.BodyBean body = response.getBody();
List<TaskPrefectureBean.BodyBean.ListBean> list = body.getList();
for (int i = 0; i < list.size(); i++) {
fId = list.get(i).getId();
}
taskPage++;
}else {
Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + response.getMessage() + "");
}

16
app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java
View File

@@ -61,8 +61,8 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
taskExplain2Recycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
taskExplain2Recycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
//取消上拉加载，刷新功能。
taskExplain2Recycler.setPullRefreshEnabled(false);
taskExplain2Recycler.setLoadingMoreEnabled(false);
// taskExplain2Recycler.setPullRefreshEnabled(false);
// taskExplain2Recycler.setLoadingMoreEnabled(false);
taskExplainAdapter2 = new TaskExplainAdapter2(getActivity());
taskExplain2Recycler.setAdapter(taskExplainAdapter2);
@@ -84,6 +84,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
Intent intent = new Intent(getActivity(), WebActivity.class);
intent.putExtra("int",pos);
startActivity(intent);
}
});
}
@@ -91,14 +92,18 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
protected void initData() {
super.initData();
dataBeans2 = new ArrayList<>();
initNetWork2(true);
initNetWork2();
}
private void initNetWork2(boolean b) {
private void initNetWork2() {
showLoadingDialog();
HttpParams httpParams = new HttpParams();
httpParams.put("fid", "3");
httpParams.put("pageNum", "1");
httpParams.put("pageSize", "20");
OkGoBuilder.getInstance()
.Builder(getActivity())
.url(HttpInterface.MSG_LISt)
.url(HttpInterface.LIST_TASK_EXPLAIN)
.cls(TaskExplainInfo.class)
.params(new HttpParams())
.token(Constant.ACCESS_TOKEN)
@@ -106,6 +111,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
@Override
public void onSuccess(TaskExplainInfo response, int id) {
dismissLoadingDialog();
taskExplainAdapter2.setExplainList2(response.getBody().getData());
Log.d("TAG", "onSuccess: " + response.getMsg() + "sssssssssssss");
}

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

@@ -113,8 +113,13 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
@Override
public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) {
dismissLoadingDialog();
taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
taskPage++;
if (taskPrefectureBean.getCode() == 200){
taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
taskPage++;
}else {
Toast.makeText(getContext(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}
Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "");
//initTaskSpecification(taskSpecificationBean,start);
}

35
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@@ -547,7 +547,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
case 1://poi
BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg1);
poiDescriptor.getFormater().setScale(50);
Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor)
.anchor(0.5f,1f)
.flat(true)
.clockwise(false));
poiMarker.setZIndex(MARKER_DOT);
@@ -557,7 +558,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break;
case 2://充电站
BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg1);
Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f)
Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor)
.flat(true)
.clockwise(false));
stationMarker.setZIndex(MARKER_DOT);
@@ -568,7 +569,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break;
case 3://poi录像
BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_video_bg1);
Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.9f)
Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor)
.flat(true)
.clockwise(false));
poiVideoMarker.setTag(listBean);
@@ -578,7 +579,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break;
case 4://道路录像
BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg);
Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.9f)
Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor)
.flat(true)
.clockwise(false));
roadMarker.setZIndex(MARKER_DOT);
@@ -589,7 +590,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break;
case 5://其他
BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg1);
Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.9f)
Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor)
.flat(true)
.clockwise(false));
otherMarker.setZIndex(MARKER_DOT);
@@ -599,7 +600,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break;
case 6://面状任务
BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bg1);
Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f)
Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor)
.flat(true)
.clockwise(false));
planarMarker.setZIndex(MARKER_DOT);
@@ -708,7 +709,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bag);
}
if (bigMarker == null) {
bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(descriptor).alpha(0.9f)
bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(descriptor)
.anchor(0.5f,1f)
.flat(true)
.clockwise(false));
} else {
@@ -827,13 +829,15 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else {
poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.graypoi);
}
Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor)
.flat(true)
.anchor(0.5f,1f)
.clockwise(false));
poiMarker.setClickable(true);
poiMarker.setZIndex(MARKER_DOT);
poiMarker.setTitle(poiEntity.getName() + "");
poiMarker.setTag(poiEntity);
removablesLocality.add(poiMarker);
break;
case 2://充电站
@@ -843,8 +847,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else {
chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.graycharge);
}
Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f)
Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor)
.flat(true)
.anchor(0.5f,1f)
.clockwise(false));
stationMarker.setClickable(true);
stationMarker.setZIndex(MARKER_DOT);
@@ -859,7 +864,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else {
poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_have_bg1);
}
Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.5f)
Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor)
.anchor(0.5f,1f)
.flat(true)
.clockwise(false));
poiVideoMarker.setClickable(true);
@@ -875,7 +881,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else {
roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayroad);
}
Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.9f)
Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor)
.anchor(0.5f,1f)
.flat(true)
.clockwise(false));
roadMarker.setClickable(true);
@@ -891,7 +898,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else {
otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayother);
}
Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.9f)
Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor)
.anchor(0.5f,1f)
.flat(true)
.clockwise(false));
otherMarker.setClickable(true);
@@ -907,7 +915,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else {
Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayfacet);
}
Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f)
Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor)
.anchor(0.5f,1f)
.clockwise(false)
.flat(true));
planarMarker.setClickable(true);

21
app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
View File

@@ -245,15 +245,20 @@ public class PoiSaveUtils {
}
}
}
if (poiEntity.getPhoto() != null && !poiEntity.getPhoto().equals("")) {
ArrayList<File> videoFileList = new ArrayList<>();
videoFileList.add(new File(poiEntity.getPhoto()));
File file = new File(poiEntity.getPhoto() + ".txt");
videoFileList.add(file);
File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
ZipUtil.zipFiles(videoFileList, fileZip, null);
photoFile.add(fileZip);
List<File> videoFileList = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(poiEntity.getId());
if (videoFileList!=null&&!videoFileList.isEmpty()) {
List<File> txtFileList = new ArrayList<>();
for (File videoFile: videoFileList) {
File file = new File(videoFile.getAbsolutePath() + ".txt");
txtFileList.add(file);
}
videoFileList.addAll(txtFileList);
}
File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
ZipUtil.zipFiles(videoFileList, fileZip, null);
photoFile.add(fileZip);
String url = null;
//1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
if (poiEntity.getType() == 1) {