From 777e3737fed8a995cf4b1fcdce4f83fa254aa26f Mon Sep 17 00:00:00 2001 From: md Date: Fri, 13 Aug 2021 22:05:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9marker=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E6=8F=90=E5=87=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/LoginActivity.java | 14 +- .../outdoor/activity/StatementActivity.java | 27 ++- .../fragment/CapacityEvaluationFragment.java | 10 +- .../fragment/CapacityEvaluationFragment2.java | 7 +- .../fragment/ChargingPileFragment.java | 20 +- .../fragment/ChargingStationFragment.java | 24 ++- .../fragment/EventPrefectureFragment.java | 10 +- .../outdoor/fragment/HasSubmitFragment.java | 77 +++++--- .../outdoor/fragment/MineFragment.java | 13 +- .../outdoor/fragment/OtherFragment.java | 147 ++++++++------- .../navinfo/outdoor/fragment/PoiFragment.java | 178 ++++++++++-------- .../outdoor/fragment/PoiTaskFragment.java | 9 +- .../outdoor/fragment/PoiVideoFragment.java | 41 ++-- .../outdoor/fragment/RegisterFragment.java | 3 +- .../outdoor/fragment/RoadFragment.java | 44 +++-- .../outdoor/fragment/TaskExplainFragment.java | 17 +- .../fragment/TaskExplainFragment2.java | 16 +- .../fragment/TaskPrefectureFragment.java | 9 +- .../outdoor/fragment/TreasureFragment.java | 35 ++-- .../navinfo/outdoor/util/PoiSaveUtils.java | 21 ++- app/src/main/res/drawable/other_text.xml | 2 +- app/src/main/res/drawable/poi_video_bg.png | Bin 873 -> 0 bytes .../main/res/drawable/poi_video_have_bag.png | Bin 2841 -> 0 bytes app/src/main/res/layout/activity_login.xml | 2 +- .../main/res/layout/activity_statement.xml | 47 ++++- .../res/layout/charging_station_fragment.xml | 4 +- app/src/main/res/layout/poi_fragment.xml | 2 +- app/src/main/res/values/strings.xml | 87 +++++++++ 29 files changed, 579 insertions(+), 289 deletions(-) delete mode 100644 app/src/main/res/drawable/poi_video_bg.png delete mode 100644 app/src/main/res/drawable/poi_video_have_bag.png diff --git a/app/build.gradle b/app/build.gradle index 81cf51b..5e04152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java index 8e9cfad..1c1fc59 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -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; } } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java index 39c67de..3617c64 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java @@ -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(); } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java index 05fc5e8..1f0b6ad 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java @@ -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"); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java index 9e8f245..1c241b3 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java @@ -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"); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index 527d5b6..0a505dc 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -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); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index fa7725a..019b175 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -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(); } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java index e8c0abc..f825b7b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java @@ -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); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java index efc92ec..216eb59 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java @@ -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 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index 1377d93..cdb3681 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -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"); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 4de4f0f..0391ef2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -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 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() { - @Override - public void onSuccess(PoiUploadBean response, int id) { - dismissLoadingDialog(); - - new Thread(new Runnable() { + .postFileAsynchronous(new Callback() { @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; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 7d71072..f39db70 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -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 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() { - @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; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java index dd1dbe4..f8d826a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -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 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index 75d9000..1fa1947 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -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 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java index 2419480..1cf2cde 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -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) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index 67dd7ce..267e81e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -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 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 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java index 2079f48..e72eaeb 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -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 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() + ""); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java index dc57d73..6692c13 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java @@ -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"); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java index 0a4ca94..4b6d9b5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -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); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index ba6b765..ec96f89 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -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); diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java index b47f400..6187d45 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java @@ -245,15 +245,20 @@ public class PoiSaveUtils { } } } - if (poiEntity.getPhoto() != null && !poiEntity.getPhoto().equals("")) { - ArrayList 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 videoFileList = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(poiEntity.getId()); + if (videoFileList!=null&&!videoFileList.isEmpty()) { + List 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) { diff --git a/app/src/main/res/drawable/other_text.xml b/app/src/main/res/drawable/other_text.xml index aab4f66..44849b6 100644 --- a/app/src/main/res/drawable/other_text.xml +++ b/app/src/main/res/drawable/other_text.xml @@ -2,5 +2,5 @@ + android:color="#D1D0CF"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/poi_video_bg.png b/app/src/main/res/drawable/poi_video_bg.png deleted file mode 100644 index 905d1c10c32aedd181289c50edf41bf0e7bd4a24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 873 zcmV-v1D5=WP)Px#1ZP1_K>z@;j|==^1poj86G=otR5(wKlv_wtK^VusnX_m2Y;JZjqbQ^cD%*{U z(6T7jdW@tXy894R*h5hi)o(#- z%rrAjnpxHl&gK9A=9_Qk%*;XX8`CGC+1X1hIT=puN*s>H1iPW*#e3qu`p77_|B{r- zW`f>in+moA>(%4yGL=mjAuR1)DC6NPQoikUY(sk&1h^-XtroDI-)${fFjZO1^h|s{x`-rJ%Rf^t+H^W7iNM(EuO> z2xCxi#uV%l-7zfjsi1eh1HiT(0$BY9?eKg!Sj*loc29VLk@1JBWHni)Lc+U z%z)_ECtw@12x6@j%u5I3dp$&&?tu}k6UpHy?MAQ9Xn_$9lpq|2ec~Dje<}u~I)Jjd zBQ+kV5rVjs&1}x6Wh;PhLF&hKUh-CI0aEPjPFPhJ#3gTHRoUmDCPaM?dKyUHHIi4j z>^Zq3bw99e6ol%}f)bY`v}Kr6JbzMBW!^wT?J(@gQLUb>Um`ah&K+Wy*2Hv(`Q4&& zEKnuBc315Qk=W8ky$g3mQpFC-ny0KjxmCT47$Q0dgitd(FSe9z)iSZeJYM?7FhQR` z1!oS{0pH(;t{A&-J~c0JEs{A^9#UZvF!;Lvt%K_oX3>#iV~>=5$s9N9AbA{erjEzc zq}9uZ7UJ1>ESAMbC@mOp^!66&IsQ)SlTyHkn_Hl73CEyYT7m(|ogrw?yP@xwQczY+ zZdcZlM^X-ss(@OZuX()}?X>ZNMy9d9iwyN+KxK~3=5_6{QN-VCK2Z0Y2Kqt-e&dhH zoYHFZ7C*QA&`WCoe@$-i(R#zA`m;LoskHu&eQVXckA+%<&-wFt&A60nEqB-szXGEB>+DFx8q0sjhZlk00000NkvXXu0mjf3{{%2 diff --git a/app/src/main/res/drawable/poi_video_have_bag.png b/app/src/main/res/drawable/poi_video_have_bag.png deleted file mode 100644 index 038858807ce36cd86f458183db7b0d4e5b60aa8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2841 zcmV+!3+D8RP)Px#1ZP1_K>z@;j|==^1pojF!%0LzRA@uhn+a4?R~pAJF9}K5S7izNj(`i|O6zFx zIMu3ktfN+2J*chiI6b4YbWZ2=oOb4%&dizVbhdVCb+n3(RR`;a7DYt`L_k(q0|Y|Y z34s6!AqmX=o>wJ8l9%Kmo!>b*y!+2fxZl0s_ucPa9(IT&TwL7(fJqy3>w+EmceEXmVoGy~-0R%4R^&dx5rvlElH z$IY3y#mCn#!Oo82*kQ=qMj6BCv|4q8xHhY-xadS}RmDY}PNyMnTZB~xczVrJI!tu4|* zV@6DB00#%?>pSG&H9ah=L-Zbr1`xAydq`w+D`;R2X`VpT?g<&wR(H% z+n1TRPSV^2l(H-t2N*k%Y&sdg%kWraKFMwP)Y{Tv1@~ zB50e!)x{aTo4Ot4+%H0nO;V!T#_U-!C^9?*eSSC%X>~fH8V6SB&;IanIIeINbPNOr zhb~=~vg$)7qrYhWTwH}Zp>vlrk#b-V4Ga$1{Ay~Ep(RO)sDEGpb#=?hZ!!*##}oD` z6wPfiX%X!Mc%@~Wb)v&V(Zi}*s9A_&J6f#{i5r_x6#j0e%t=go1AbCmE>92@8@G;D z&ESGZ-pkViH8!^pg*_zF78E4%huVuMrtuR6&Ubck^`rbm0rR2mAi7CrdV8T!Jn~&V z=BL?G+B>_EP$-}Wi3w0-28V{dNCkz2E@kRI;QMNvF|=AOQP^V;#{vwFvy&rHOap!P z4+vU7&BR+lqM3!lcH*rcX&Exv7#JIt$?hE;9fi%nr0*HS%X>y71*;orn`KC)LXM6O zh|4jo0hcaJMB83lPg+mew0;d*o@|(z!N=cwYX^!93n9uQz;)m~mf?P|ChOi&rHsmrIYV zB^hHXfMXb{yQ{N?wEyqu>}V_J2!%qo*!VfG;n8F~oZh&chzJWt`9&oYTu8v@qb)yL zi(Xo`1T9XQN57!_c5o1)CaH|v^%VF#e4n^cf|G)psOG_+8_T(s^+&2%(wKu65%V=H zLxKYQk;u;nW!=t2*KXaRUo|+G7vn0{7#F|GVpN5WN2?uCNt-2k6zudN7>I5&6lI6> z`cYI>TaVMFn0`UlF*U(%u9j~C>uYN=M>LuNdL=0n0rx3= zP;eZsX#*-s9-M;nd$@kyP<9lZN;%JzC#L9?_te+bR9%5<+5oj$)mwBw?+{!w1&S{S zK-(F!=zC!F^X}aG%cx#Ym&8wsk=*PXe^N7?1^9( z^+Aa@^yVljynpoDGbd9?lV-w5d(ZTVee0(O@^Pu^Or-AxJ-A{x_>WH)X@-aUi9|CY z^i@NH-Ee#tGb>@eC9CsPGCZvAPdohO>i#~(goCI_b6013Te&^Y-Z3CJWXW_Jq1Wq1 z&ZHgvv9zf%mq-Q}O}>rwbvGTIoV?-qV!DhN9o6eDoISOxvZ5@VNE0x%dW_-4;wt!D zSa@U#&J<7gf6oEP_nDW^|Dq^A?<*orirM8)CT+@>_wHkiGi4WRS6w{QOW zc2?%^h-4H-9fHRLVBdg^SdWe15_zf^tHLgGDgE?bxPBxVhw+GZcXm|uDdbHs6F4NM z%$?d>Wu^Z)cIZ_-!$%J+atX*zTCG+Me?Oawz*Y?n$&VlU*Q&t*We1VWVzE!RG)wNm zF^sRDXfB&ZK$(z!>iBkeiiJpwu*Ma}GQK^#uT3T`ByF34pe@L|`$hG`^7BMuj8(p@ z)9HrKo;AtrA1SuMngIZumZ?-jCJ#AbZ!2bL^Z`~47}013%ZrOnlIElo+{^ib z&BJ6?4FDb#+&hfD#PG0)z{EgHVch^+a#wV;wU&{l0X3Bs7uc$w9>cl;KxKL9S#tRV z2;Q<1c1ItW5(8?hA7(u3Mo|30Ne5}N#*`S))zMM;>?4x!2MMOzL`#?w1MuMMWzuGY z8mF$Nl0MI8n<+5>=;~;%B$sr}FR2&bB289dr4|~Gi>sR`G(2)eNO;7G89u(VK*JSl zpS-)XhO(nLYL!X>GeqCa0<3Jx;aEOlZsOLY#mVpZivs3T9L}U?N05osc%>HOcql2% zKT3kyrjo*D1K^3;tvmLd_w~2zlmd)tsH?el=H%B~;psynTa3*v1pgEf9vN-%IT73s zPYUaFdQDSL*bW=B5kmh1?XKARQ33aQ00000NkvXXu0mjf0qs%1 diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index b10b825..a5bb38d 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -163,5 +163,5 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/et_login_paw" app:layout_constraintStart_toStartOf="@+id/et_login_paw" - app:layout_constraintTop_toBottomOf="@+id/textView" /> + app:layout_constraintTop_toBottomOf="@+id/tv_statement" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_statement.xml b/app/src/main/res/layout/activity_statement.xml index 90bf4fd..8cfc435 100644 --- a/app/src/main/res/layout/activity_statement.xml +++ b/app/src/main/res/layout/activity_statement.xml @@ -1,9 +1,52 @@ - + + - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/charging_station_fragment.xml b/app/src/main/res/layout/charging_station_fragment.xml index 70bbe61..97de85a 100644 --- a/app/src/main/res/layout/charging_station_fragment.xml +++ b/app/src/main/res/layout/charging_station_fragment.xml @@ -118,7 +118,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginLeft="18dp" - android:layout_toStartOf="@id/tv_examine" + android:layout_toStartOf="@id/tv_station_examine" android:layout_toEndOf="@id/tv_name_pic" android:layout_toRightOf="@id/tv_name_pic" android:background="@color/white" @@ -128,7 +128,7 @@ android:textSize="15sp" /> Hello blank fragment + + + 一、地图寻宝活动说明 + + 1.1.关于活动：地图寻宝活动（以下简称“活动”）是图新、其子公司和关联公司等（以下统称为“图新”）举办的一个以“实景互动，展风土人情”为主题的活动，本活动的参加对象为具有完全民事行为能力和民事权利能力并且自愿参加本活动的自然人、法人 +（以下统称为“参与者”或”您”）。参与者安装图新提供的地图寻宝软件后，可以通过拍任务照片、输入任务名称并将信息上传到网站的方式完成活动。 + 1.2.关于奖励：参与者完成活动任务并且通过图新审核后，会获取相应奖励。具体的奖励方式和标准由图新根据活动的实际情况制定和调整，并在图新地图寻宝软件中公布。 + 1.3.关于活动软件：地图寻宝软件（以下简称“软件”或“本软件”）是图新为配合活动专门定制的一款移动设备应用程序。 +1.4活动的最终解释权归图新所有。 + + 二、活动规则的确认和接受 + 2.1.图新在此特别提醒：请您（ 即“参与者”，下同）务必认真阅读并透彻理解地图寻宝活动规则（以下简称“本规则”）中各项具体规则，特别是关于活动规范、注意事项、奖励方式和标准、免责声明、知识产权、争议解决等条款。（未成年人阅读本规则时应得到法定监护人的陪同）。 + 2.2.为了参与活动并使用软件，您应当点击“同意”按钮以同意本规则下的全部规则。如果您点击“拒绝”按钮，您将无权参与活动及使用软件。一旦您点击“同意”按钮即表示您已经完全理解并接受本规则下的全部条款，本规则即构成对您具有法律约束力的法律文件。 + 2.3.为了确保奖品兑换的公正有效，参与者应当向本软件提供真实准确的认证信息，包括但不限于您的真实姓名、有效期内的二代身份证号码及正反面照片和手持身份证照片、联系电话、地址、邮政编码、银行卡号、支付宝帐号等。同时，您也应当在上述资料实际变更时及时更新相关注册资料。对于您提供的上述资料，您了解并确认由图新保留，且图新在此承诺除法定或约定的事由外，不公开或编辑或透露您的前述资料，以及保证对于您保存在本公司的非公开内容不用于其他任何商业目的。 + 2.4.图新保留随时修订本规则的权利，且无须另行事先通知您。本规则一旦发生变动，图新将会在相关应用中公布重新修订后的规则。您理解并同意如果您在本规则修订后继续使用软件或参与活动，图新将把您的上述行为视为对修订后的本规则的接受。如果您不能接受修订后的本规则，您可以通过停止使用软件且不参与本活动。 + +三、软件使用须知及规则 + 3.1.本软件是参与者参与活动的应用程序，主要功能包括拍摄任务照片，获取任务信息等，并由图新提供技术支持。 + 3.2.本软件仅适用于本软件可支持的操作系统，如果参与者在安装本软件后因任何原因欲放弃使用，可卸载本软件。参与者可从图新地图寻宝管理团队提供的网址获取本软件，如果您从未得到图新授权的第三方获取本软件或与本软件名称相同或类似的其他软件，图新无法保证该软件能正常使用，请参与者务必根据您的设备型号和操作系统版本，选择安装正确版本的本软件。图新保留发布本软件后续版本以及要求您获得并使用本软件最新版本的权利，请您随时查询并下载本软件的最新版本。 + 3.3.下载、安装和使用：本软件为免费软件，参与者可以非商业目的下载、安装及使用本软件。 + 3.4.复制、分发和传播：参与者可以非商业目的、无限制数量地复制、分发和传播本软件。参与者必须保证每一份复制、分发和传播都是完整和真实的,应包括与本软件有关的电子文档、版权和商标以及本规则等所有相关内容。 + 3.5.保留权利：本规则未明示授权的其他一切权利仍归图新所有，参与者使用其他权利时必须事先获得图新的书面同意。 + 3.6.软件账号：参与者必须拥有本软件的账号才可以使用本软件并参加活动，没有取得账号的无权使用本软件和参加活动。 + 3.7.参与者理解并同意，本软件及具体功能由图新根据实际情况提供。图新保留随时变更、中断、暂停或终止部分或全部本软件和功能的权利，并无须因此对参与者或第三方承担任何责任。如因本软件维护或升级的需要而暂停本软件，将尽可能事先进行通告。本软软件和活动由于任何原因终止时，你根据本条款所获取的一切权利或许可全部终止，您将无法使用本软，包括但不限于您的账户、注册资料等。 + 3.8.本软件仅提供相关功能及服务，除此之外与使用本软件有关的设备及所需的费用均由参与者自行负担。除非本规则另有明确规定，本软件的任何功能的增加或强化，包括所推出的升级或新版本，均受到本规则的规范。 + 3.9.参与者不得自行或允许或协助或以任何其他方式对本软件的任何部分进行修改、改编、更改、拆分、分解、反向工程或二次开发，或获取本软件包含的或被使用时形成的相关数据等。 + 3.10.参与者不得对本软件或者本软件运行过程中释放出的任何数据及本软件运行过程中与服务器端的交互数据进行复制、更改、修改、挂接运行或创作任何衍生作品，形式包括但不限于使用插件、外挂或非经授权的第三方工具或服务接入本软件和相关系统。 + + 四、活动注意事项 + 4.1.参与者明确了解并同意，参加活动、完成活动任务、使用本软件时，应谨慎注意不进入国家法律法规禁止进入的区域，亦不得在这些区域外部进行拍照等行为，包括但不限于以下区域： + 4.1.1.直接服务于军事目的的各种军事设施：指挥机关、地面和地下的指挥工程、作战工程；军用机场、港口、码头；营区、训练场、试验场；军用洞库、仓库；军用通信、侦察、导航、观测台站和测量、导航、助航标志；军用公路、铁路专用线，军用通信、输电线路，军用输油、输水管道； + 4.1.2.军事禁区、军事管理区及其内部的所有单位与设施； + 4.1.3.与公共安全相关的单位及设施：人民武装部、监狱、刑事拘留所、劳动教养管理所、戒毒所（站）和收容教育所、武器弹药、爆炸物品、剧毒物品、危险（化工）品存储长库区、铀矿床和放射性物品的集中存放地； + 4.1.4.涉及国家经济命脉，对人民生产、生活有重大影响的民用设施：大型水利设施、电力设施、通讯设施、石油与燃气（天然气、煤气）设施、粮库、棉花库（站）、气象台站、降雨雷达站和水文观测站（网）； + 4.1.5.专用铁路及站内火车线路、铁路编组站，专用公路； + 4.1.6.桥梁的限高、限宽、净空、载重量和坡度属性；隧道的高度和宽度属性；公路的路面铺设材料属性； + 4.1.7.江河的通航能力、水深、流速、底质和岸质属性；水库的库容属性； + 4.1.8.任何存放和保管国家保密信息的机构、单位、部门或公司等区域； + 4.1.9.其他国家法律法规禁止进入的区域。 + 4.2. 除以上国家禁止进入的区域外，参与者亦不得以翻越、擅自进入等任何非法方式进入设置了管理或限制进入措施的小区、单位等任何区域。 + 4.3. 本活动的拍照地域范围为中国境内。 + 4.4.参与者明确了解并同意，参与者进入任何区域均是经过其自行判断的，而不是按照图新的任何要求进入。如果参与者违反上述4.1和4.2的规定擅自进入上述区域的，由此导致的任何责任、处罚等均由参与者自行承担，图新对此不承担任何责任。 + 4.5.参与者明确了解并同意，参与者应以正当、合法的方式参与活动和使用软件，遵守所有法律、法规、规章、规范等法律文件；参与者在参与活动和使用软件时，应注意密切和随时观察道路、建筑等周边环境情况，谨慎保护自己和他人的人身和财产安全。如因参与活动或使用软件造成任何人员伤亡或者财产损失，或因违法被处罚等，均由参与者自负相应的经济、法律责任，图新对此不承担任何责任。参与者应自行承担相应人员的医疗费、意外事故保险等各项费用，图新不承担任何费用。 + 4.6.参与者明确了解并同意，应严格按照本规则和软件中的要求完成活动任务，不得以任何违法方式拍照、提交虚假信息或违法信息，否则图新有权对参与者采取扣除积分、关闭账户、取消活动参与资格等措施进行处理。 + 4.7.本软件在使用时必须启用手机的GPS功能以获取位置信息，并且手机应具备拍照功能，否则无法完成任务。由于参与者的手机不具备相应功能导致无法完成任务的，图新不承担任何责任。 + +五、帐号注册和维护 +5.1 参与者在使用本软件前必须注册号，注册帐号后登录本软件才可以使用本软件参加活动。请您按照注册页面上的提示完成全部的注册程序。您在注册成功后，图新将给予您一个帐号，该用户帐号和密码由参与者自行负责保管。用户帐号的所有权归图新，您完成注册申请手续后，获得用户帐号的使用权。 +5.2 在用户帐号注册过程中，图新会要求您提供帐号注册所需要的个人资料，如手机号码、密码，帐号等资料（以下统称为“注册资料”）。您还需要通过本软件向图新提供个人身份证认证所需要的信息，包括您的真实姓名、有效期内的二代身份证号码及身份证正反面照片、银行卡卡号、开户行、微信号等信息（以下统称为“认证信息”），以供图新进行个人身份核实和认证、奖励兑换和发放以及纳税申报使用。 +5.3 您同意并保证您提供给图新的任何注册资料和认证信息均是真实、准确、完整和最新的。如注册资料或认证信息有任何变动时，您需及时更新。否则，由此造成的无法获取奖励或奖励兑换失败等损失均由您自行承担。 +5.4 您应妥善保管自己的帐号、密码及其他注册资料，并对您的帐号进行的所有活动和事件承担责任。如果由于您未能保管好自己的帐号和密码及其他注册资料而遭受的任何损失或对图新、其他用户或任何第三方造成损害的，您应自行承担后果或责任。 +5.5 上述用户帐号的使用权仅属于通过个人身份认证的申请注册人，请不要赠与、借用、租用、转让或售卖给他人，以免因帐号问题发生纠纷。如果图新发现使用者并非通过个人身份证认证的申请注册人，图新有权在未经通知的情况下暂停该帐号。您需要自行承担违反上述要求导致的后果和损失，同时图新保留追究相关行为人法律责任的权利。 +5.6 如果您的帐号或密码遭到未获授权的使用，或者发生其它任何安全问题时，您应立即修改密码或通知图新。对于非图新的原因导致的他人利用您的帐号和密码所进行的任何行为及因此产生的损失或损害，请您向相应责任人索赔。 +5.7 您在帐号丢失或遗忘密码后，须遵照图新的相应途径及时申请找回帐号或修改密码。您可以凭初始注册资料向图新申请找回帐号或修改密码。图新仅可识别您在申请时所填资料与系统记录资料的一致性，而无法识别申请人是否系真正的帐号使用权拥有人。 +5.8 您的注册资料和认证信息对于使用本软件及找回丢失的帐号密码至关重要。如您提供虚假注册资料、认证信息或由于您的原因导致您的注册资料别他人知悉，都可能会导致您无法取回丢失的帐号、无法修改密码。您知晓您应妥善保管您的帐号和密码，图新并不承诺帐号丢失或遗忘密码后您一定能通过上述方式找回帐号或修改密码。 +5.9 基于图新对于用户帐号整体管理的需求，如果出现您连续六个月未登录用户帐号，或图新认为您已经违反本条款，或图新停止提供服务等情况，图新有可能暂停、关闭、删除您的帐号、删除您帐号中所有相关信息及文件或禁止使用前述文件，因此产生的后果由您自行承担。 + +六、活动奖励兑现 +6.1 图新有权依据活动的阶段以及参与者在活动众的级别、活跃程度、任务贡献、活动排名等因素，确定及适时调整活动奖励内容和标准以及兑换方式。 +6.2 活动奖励发放和兑现遵循国家相关法律法规，并保障活动参与者的合法权益。图新对于满足个人所得税纳税条件的奖励，将按照国家法律法规的规定代扣代缴个人所得税。 +6.3 本软件依据参与者的活动基本不同，设置不同的奖励标准、结算和支付方式，参与者须按照相应的奖励标准、结算和支付方式完成奖励兑现操作。 +6.4 参与者可以选择奖励支付，活动参与者兑现奖励后，本软件将从参与者的活动帐号中扣除相应奖励。如参与者的活动帐号奖励不足，兑现申请自动失效。 +6.5 如您作为图新授权的代理帐号参与本活动，您不能向您发展的本软件用户做出任何超出本条款内容的承诺或许可，否则由您自行承担该等承诺或许可导致的后果。 +6.6 您理解并同意，图新仅按照本条款内容向您兑现有关奖励，除本条款外，高德未向您做出任何其他承诺和许可，因信任其他承诺和许可而导致的任何损失由您自行承担或向相应责任人主张。 + +七、通知和送达 +7.1 您在此同意，图新关于本软件、本活动。本条款内容变化的所有通知均可以通过本软件界面、微信公众/服务号公告等方式进行。 +7.2 上述通知于公布或发送之日起即视为已送达收件人（及您）。您有责任通过上述方式查看任何此类通知。 + + 八、知识产权 + 8.1.本活动、软件以及相关内容的一切版权、商标权、专利权、商业秘密等知识产权，均受中华人民共和国著作权法、商标法、专利法、反不正当竞争法和相应的国际条约以及其他知识产权法律法规的保护，除涉及第三方授权的软件、技术或其他内容之外，图新享有上述全部知识产权。 + 8.2.参与者只有在获得图新或其他相关权利人的授权之后才能使用本规则5.1条载明的内容。参与者不能擅自复制、再造、改编、修改、翻译、发布、公开实施、公开展示或者以其他未经许可的方式使用本规则5.1条载明的内容、或创造与内容有关的派生产品，也不能出售、交易、转售或将其应用于其他商业用途。 + 8.3.参与者明确了解并同意，将其在参与活动中拍到的照片、获取的位置等所有信息和内容的著作权等全部知识产权及其他可转让的权利在其提交时无偿且独家的转让给图新。参与者明确了解并同意，除用于向图新提交上述照片和信息之外，不以任何其他形式使用或向任何第三方提供。 + 8.4.因参与者上传的照片、位置等信息，涉及侵犯他人知识产权或其他合法权益导致的纠纷，图新不承担任何责任。由此产生的责任和损失由参与者自行承担。因此给图新造成损失的，图新有权要求参与者赔偿相应的损失。图新如果收到正式投诉，将会删除前述未经授权的内容。 + +九、免责声明 + 9.1.参与者明确了解并同意，参与本活动、使用本软件或从本软件下载或以其他方式获得任何资料的任何风险和后果（包括但不限于受到第三方侵权或对第三方造成侵权或因任何资料的下载而导致的参与者设备、电脑系统的任何损坏或数据丢失等后果）由参与者独自承担，图新及其许可人不承担任何责任。 + 9.2.图新及其许可人对本活动、本软件不提供任何明示或默示的担保或保证，包含但不限于商业适售性、特定目的的适用性及不侵权等担保或保证。 + 十、法律适用与争议解决 + 10.1.本规则的执行和解释及争议的解决均适用中华人民共和国法律，且不考虑任何冲突法。 + 10.2.参与者和图新就参加活动、软件使用、本规则内容或其执行发生任何争议的，双方应尽量友好协商解决；协商不成时，双方同意向北京仲裁委员会提交仲裁并按其当时的仲裁规则仲裁。该仲裁裁决是终局的，双方应无条件履行该仲裁裁决。 + + 十一、其他规定 + 11.1.如本规则中的任何规则无论因何种原因无效或不具有执行力，则该规则应在不影响其他规则的情况下从本规则中被移除。本规则的其余规则仍有效并且具有法律约束力。 + 11.2.为了图新及其继承人和受让人的利益，本规则、活动、软件可以被图新转让。 + 11.3.参与者对活动、软件的意见及建议可通过本软件或直接与活动运营人员进行联系。 + 11.4如果出现您对本条款的违反行为，图新保留针对该违反行为采取法律所能提供的所有补救手段的权利。如果您在使用本软件或参与本活动期间发现有任何在您看来属于不正当或在其它方面违反本条款的内容，您应及时向图新举报。 \ No newline at end of file