diff --git a/app/build.gradle b/app/build.gradle index d1bb336..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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b9581b5..af34ca1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,24 +4,20 @@ package="com.navinfo.outdoor"> - - + - - - - - - - - + tools:ignore="ProtectedPermissions" /> + + + + + @@ -44,25 +40,22 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:requestLegacyExternalStorage="true" - android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" + android:networkSecurityConfig="@xml/network_security_config" + android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.WhiteScreen"> - - - + + + android:launchMode="singleTop" /> - + android:value="EWWBZ-2PB62-6JXUL-CEX7G-N7UE6-XRB4V" /> @@ -70,7 +63,8 @@ android:name="design_height_in_dp" android:value="640" /> - @@ -78,37 +72,37 @@ - - - + - + android:screenOrientation="portrait" /> + - - - + android:screenOrientation="portrait" + android:windowSoftInputMode="adjustPan" /> + + + android:exported="false" + android:grantUriPermissions="true"> - - - \ No newline at end of file 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 79e1811..f348bc3 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -42,6 +42,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener private Button btnLogin; private SharedPreferences navInfo; private SharedPreferences.Editor navInfoEditor; + private TextView tvStatement; @Override public void onStart() { @@ -51,6 +52,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } } + @Override protected int getLayout() { return R.layout.activity_login; @@ -64,12 +66,13 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @Subscribe public void onEvent(Message data) { if (data.what == Constant.REGISTER_WORD) { - if ((boolean)data.obj){ - etLoginName.setText(Constant.USER_NAME); - etLoginPaw.setText(Constant.PASS_WORD); + if ((boolean) data.obj) { + etLoginName.setText(Constant.USER_NAME); + etLoginPaw.setText(Constant.PASS_WORD); } } } + @Override protected void initView() { super.initView(); @@ -77,19 +80,21 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener navInfo = getSharedPreferences("navInfo", Context.MODE_PRIVATE); tvRegister = findViewById(R.id.tv_register); etLoginName = findViewById(R.id.et_login_name); - etLoginPaw = findViewById(R.id.et_login_paw); + etLoginPaw = findViewById(R.id.et_login_paw); tvForgetPaw = findViewById(R.id.tv_forget_paw); - btnLogin = findViewById(R.id.btn_login); + btnLogin = findViewById(R.id.btn_login); btnLogin.setOnClickListener(this::onClick); + tvStatement = findViewById(R.id.tv_statement); + tvStatement.setOnClickListener(this::onClick); tvRegister.setOnClickListener(this); tvForgetPaw.setOnClickListener(this); String user_name = navInfo.getString("user_name", null); - if (user_name!=null&&!user_name.equals("")){ + if (user_name != null && !user_name.equals("")) { etLoginName.setText(user_name); } String pass_word = navInfo.getString("pass_word", null); - if (pass_word!=null&&!pass_word.equals("")){ - etLoginPaw.setText(pass_word); + if (pass_word != null && !pass_word.equals("")) { + etLoginPaw.setText(pass_word); } } @@ -108,16 +113,20 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener break; case R.id.btn_login: String name = etLoginName.getText().toString().trim(); - if (name == null||name.equals("")) { + if (name == null || name.equals("")) { Toast.makeText(this, "请输入账号", Toast.LENGTH_SHORT).show(); return; } String paw = etLoginPaw.getText().toString().trim(); - if (paw == null||paw.equals("")) { + if (paw == null || paw.equals("")) { Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show(); return; } - initLogIn(name,paw); + initLogIn(name, paw); + break; + + case R.id.tv_statement: + break; } } @@ -125,11 +134,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener private void initLogIn(String name, String paw) { try { HttpParams httpParams = new HttpParams(); - httpParams.put("username",name); - long time=System.currentTimeMillis(); - httpParams.put("password",Base64.desEncrypt(time + Md5Util.toMD5(paw))); - httpParams.put("grant_type","password"); - httpParams.put("datetime",time); + httpParams.put("username", name); + long time = System.currentTimeMillis(); + httpParams.put("password", Base64.desEncrypt(time + Md5Util.toMD5(paw))); + httpParams.put("grant_type", "password"); + httpParams.put("datetime", time); showLoadingDialog(); OkGoBuilder.getInstance().Builder(this) .url(HttpInterface.USER_LOGIN_OAUTH_TOKEN) @@ -140,31 +149,33 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onSuccess(LoginOauthTokenBean response, int id) { dismissLoadingDialog(); - if (response.getCode()==200){ + if (response.getCode() == 200) { LoginOauthTokenBean.BodyBean body = response.getBody(); - navInfoEditor.putString("access_token",body.getAccess_token()); - navInfoEditor.putString("refresh_token",body.getRefresh_token()); - navInfoEditor.putString("userId",body.getUserId()); + navInfoEditor.putString("access_token", body.getAccess_token()); + navInfoEditor.putString("refresh_token", body.getRefresh_token()); + navInfoEditor.putString("userId", body.getUserId()); navInfoEditor.commit(); - if (body.getUserId()!=null&&!body.getUserId().equals("")){ + if (body.getUserId() != null && !body.getUserId().equals("")) { Constant.initRootFolder(body.getUserId()); } - Constant.ACCESS_TOKEN=body.getAccess_token(); - Constant.REFRESH_TOKEN=body.getRefresh_token(); - Constant.USERID=body.getUserId(); - Constant.PASS_WORD=paw; + Constant.ACCESS_TOKEN = body.getAccess_token(); + Constant.REFRESH_TOKEN = body.getRefresh_token(); + Constant.USERID = body.getUserId(); + Constant.PASS_WORD = paw; initGetUserInfo();//获取用户信息 - Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); - }else { + Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); dismissLoadingDialog(); } } + @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(LoginActivity.this, e.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(LoginActivity.this, e.getMessage() + "", Toast.LENGTH_SHORT).show(); } }); } catch (Exception e) { @@ -183,50 +194,50 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @Override public void onSuccess(UserDetailBean response, int id) { dismissLoadingDialog(); - if (response.getCode()==200){ + if (response.getCode() == 200) { UserDetailBean.BodyBean body = response.getBody(); - if (body!=null){ - navInfoEditor.putString("username",body.getUsername()); - Constant.USER_NAME=body.getUsername(); - navInfoEditor.putString("mobile",body.getMobile()); - Constant.MOBILE=body.getMobile(); - navInfoEditor.putInt("sex",body.getSex());//0:女 1：男 - Constant.SEX=body.getSex(); - navInfoEditor.putString("qq",body.getQq()); - Constant.QQ=body.getQq(); - navInfoEditor.putString("wechat",body.getWechat()); - Constant.WECHAT=body.getWechat(); + if (body != null) { + navInfoEditor.putString("username", body.getUsername()); + Constant.USER_NAME = body.getUsername(); + navInfoEditor.putString("mobile", body.getMobile()); + Constant.MOBILE = body.getMobile(); + navInfoEditor.putInt("sex", body.getSex());//0:女 1：男 + Constant.SEX = body.getSex(); + navInfoEditor.putString("qq", body.getQq()); + Constant.QQ = body.getQq(); + navInfoEditor.putString("wechat", body.getWechat()); + Constant.WECHAT = body.getWechat(); UserDetailBean.BodyBean.UserBankcardBean userBankcard = body.getUserBankcard(); - if (userBankcard!=null){//存储银行卡信息 - navInfoEditor.putString("bankAccount",userBankcard.getBankAccount());//银行卡编号 - Constant.BANKACCOUNT=userBankcard.getBankAccount(); - navInfoEditor.putString("idNumber",userBankcard.getIdNumber());//银行卡账号 - Constant.ID_NUMBER=userBankcard.getIdNumber(); + if (userBankcard != null) {//存储银行卡信息 + navInfoEditor.putString("bankAccount", userBankcard.getBankAccount());//银行卡编号 + Constant.BANKACCOUNT = userBankcard.getBankAccount(); + navInfoEditor.putString("idNumber", userBankcard.getIdNumber());//银行卡账号 + Constant.ID_NUMBER = userBankcard.getIdNumber(); } UserDetailBean.BodyBean.UserAuthBean userAuth = body.getUserAuth(); - if (userAuth!=null){//存储身份证信息 - navInfoEditor.putString("name",userAuth.getName());//身份证姓名 - Constant.NAME=userAuth.getName(); - navInfoEditor.putString("idnum",userAuth.getIdnum());//身份证号码 - Constant.ID_NUM=userAuth.getIdnum(); - navInfoEditor.putInt("auditstatus",userAuth.getAuditstatus());//审核状态 - Constant.AUDITSTATUS=userAuth.getAuditstatus(); - navInfoEditor.putString("auditmsg",userAuth.getAuditmsg());//审核信息 - Constant.AUDITMSG=userAuth.getAuditmsg(); + if (userAuth != null) {//存储身份证信息 + navInfoEditor.putString("name", userAuth.getName());//身份证姓名 + Constant.NAME = userAuth.getName(); + navInfoEditor.putString("idnum", userAuth.getIdnum());//身份证号码 + Constant.ID_NUM = userAuth.getIdnum(); + navInfoEditor.putInt("auditstatus", userAuth.getAuditstatus());//审核状态 + Constant.AUDITSTATUS = userAuth.getAuditstatus(); + navInfoEditor.putString("auditmsg", userAuth.getAuditmsg());//审核信息 + Constant.AUDITMSG = userAuth.getAuditmsg(); } navInfoEditor.commit(); } Intent intent = new Intent(LoginActivity.this, HomeActivity.class); startActivity(intent); finish(); - }else { + } else { Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { - dismissLoadingDialog(); + dismissLoadingDialog(); Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show(); } }); @@ -238,6 +249,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); } + @Override public void onDestroy() { if (EventBus.getDefault().isRegistered(this))//加上判断 diff --git a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java new file mode 100644 index 0000000..39c67de --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java @@ -0,0 +1,16 @@ +package com.navinfo.outdoor.activity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import com.navinfo.outdoor.R; + +public class StatementActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_statement); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java index 18a59d4..94ce74d 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java @@ -48,6 +48,7 @@ public class PoiTaskAdapter extends RecyclerView.Adapter taskExplainBean; private EventPrefectureAdapter eventPrefectureAdapter; + private int eventPage = 1; public static EventPrefectureFragment newInstance(Bundle bundle) { @@ -63,12 +64,12 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic private void initNetwork() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); - httpParams.put("fid", "1"); - httpParams.put("pageNum", "1"); - httpParams.put("pageSize", "10"); + httpParams.put("fid", "2"); + httpParams.put("pageNum", eventPage); + httpParams.put("pageSize", "20"); OkGoBuilder.getInstance() .Builder(getActivity()) - .url(HttpInterface.MSG_LISt) + .url(HttpInterface.LIST_EVENT) .cls(TaskPrefectureBean.class) .params(httpParams) .token(Constant.ACCESS_TOKEN) @@ -78,6 +79,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic dismissLoadingDialog(); eventPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList()); Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "sssssssssssss"); + eventPage++; //initEventPrefecture(eventPrefectureBean,b); } @@ -142,8 +144,8 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic eventRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); eventRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上拉加载，刷新功能。 - eventRecycler.setPullRefreshEnabled(false); - eventRecycler.setLoadingMoreEnabled(false); +// eventRecycler.setPullRefreshEnabled(false); +// eventRecycler.setLoadingMoreEnabled(false); eventPrefectureAdapter = new EventPrefectureAdapter(getActivity()); eventRecycler.setAdapter(eventPrefectureAdapter); eventRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕"); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java index d5059f1..fbedb2a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java @@ -87,7 +87,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene private void initNetwork() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); - httpParams.put("fid", "1"); + httpParams.put("fid", "5"); httpParams.put("pageNum", "1"); httpParams.put("pageSize", "10"); OkGoBuilder.getInstance() 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 41b5c92..dd1dbe4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -77,9 +77,9 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene ivPoiTaskFinish.setOnClickListener(this::onClick); poiTaskXrv = (XRecyclerView) findViewById(R.id.poiTask_xrv); poiTaskXrv.setLayoutManager(new LinearLayoutManager(getActivity())); - poiTaskXrv.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); poiTaskXrv.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); poiTaskXrv.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); + poiTaskXrv.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); poiTaskXrv.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { 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 5c9a6ab..2079f48 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -35,6 +35,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis private XRecyclerView taskExplainRecycle; private TaskExplainAdapter taskExplainAdapter; + private int taskPage = 1; public static TaskExplainFragment newInstance(Bundle bundle) { @@ -62,8 +63,8 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上啦加载下拉刷新 - taskExplainRecycle.setPullRefreshEnabled(false); - taskExplainRecycle.setLoadingMoreEnabled(false); +// taskExplainRecycle.setPullRefreshEnabled(false); +// taskExplainRecycle.setLoadingMoreEnabled(false); taskExplainAdapter = new TaskExplainAdapter(getActivity()); taskExplainRecycle.setAdapter(taskExplainAdapter); taskExplainRecycle.getDefaultFootView().setNoMoreHint("加载完毕"); @@ -98,12 +99,12 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis private void initNetWork() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); - httpParams.put("fid", "1"); - httpParams.put("pageNum", "1"); - httpParams.put("pageSize", "10"); + httpParams.put("fid", "3"); + httpParams.put("pageNum", taskPage); + httpParams.put("pageSize", "20"); OkGoBuilder.getInstance() .Builder(getActivity()) - .url(HttpInterface.MSG_LISt) + .url(HttpInterface.LIST_TASK_EXPLAIN) .cls(TaskPrefectureBean.class) .params(httpParams) .token(Constant.ACCESS_TOKEN) @@ -112,6 +113,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis public void onSuccess(TaskPrefectureBean response, int id) { dismissLoadingDialog(); taskExplainAdapter.setExplainList(response.getBody().getList()); + taskPage++; Log.d("TAG", "onSuccess: " + response.getMessage() + ""); } 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 7cbe61f..0a4ca94 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -39,6 +39,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick private XRecyclerView taskRecycler; private List dataBeanList; private TaskPrefectureAdapter taskPrefectureAdapter; + private int taskPage = 1; public static TaskPrefectureFragment newInstance(Bundle bundle) { @@ -63,8 +64,8 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick taskRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); taskRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上拉加载，刷新功能。 - taskRecycler.setPullRefreshEnabled(false); - taskRecycler.setLoadingMoreEnabled(false); +// taskRecycler.setPullRefreshEnabled(false); +// taskRecycler.setLoadingMoreEnabled(false); taskPrefectureAdapter = new TaskPrefectureAdapter(getActivity()); taskRecycler.setAdapter(taskPrefectureAdapter); taskRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕"); @@ -100,11 +101,11 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("fid", "1"); - httpParams.put("pageNum", "1"); + httpParams.put("pageNum", taskPage); httpParams.put("pageSize", "20"); OkGoBuilder.getInstance() .Builder(getActivity()) - .url(HttpInterface.MSG_LISt) + .url(HttpInterface.LIST_TASK) .cls(TaskPrefectureBean.class) .params(httpParams) .token(Constant.ACCESS_TOKEN) @@ -113,6 +114,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { dismissLoadingDialog(); taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList()); + taskPage++; 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 6b0bd43..ab27cc6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -598,7 +598,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen otherMarker.setClickable(true); break; case 6://面状任务 - BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg); + BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bg1); Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f) .flat(true) .clockwise(false)); @@ -707,7 +707,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } else if (poiEntity.getType() == 5) { descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bag); } else if (poiEntity.getType() == 6) { - descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bag); + descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bag); } if (bigMarker == null) { bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(descriptor).alpha(0.9f) @@ -901,9 +901,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen case 6://面状任务 BitmapDescriptor Descriptor = null; if (poiEntity.getTaskStatus() == 1) { - Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg); + Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet_bg1); } else { - Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bag); + Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayfacet); } Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f) .clockwise(false) diff --git a/app/src/main/res/drawable-hdpi/graycharge.png b/app/src/main/res/drawable-hdpi/graycharge.png index 1da65b3..1df1089 100644 Binary files a/app/src/main/res/drawable-hdpi/graycharge.png and b/app/src/main/res/drawable-hdpi/graycharge.png differ diff --git a/app/src/main/res/drawable-hdpi/grayfacet.png b/app/src/main/res/drawable-hdpi/grayfacet.png new file mode 100644 index 0000000..655ef3d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/grayfacet.png differ diff --git a/app/src/main/res/drawable-hdpi/grayother.png b/app/src/main/res/drawable-hdpi/grayother.png index 02409e3..a299f12 100644 Binary files a/app/src/main/res/drawable-hdpi/grayother.png and b/app/src/main/res/drawable-hdpi/grayother.png differ diff --git a/app/src/main/res/drawable-hdpi/graypoi.png b/app/src/main/res/drawable-hdpi/graypoi.png index d1752de..377386c 100644 Binary files a/app/src/main/res/drawable-hdpi/graypoi.png and b/app/src/main/res/drawable-hdpi/graypoi.png differ diff --git a/app/src/main/res/drawable-hdpi/grayroad.png b/app/src/main/res/drawable-hdpi/grayroad.png index efe3c21..e4d9985 100644 Binary files a/app/src/main/res/drawable-hdpi/grayroad.png and b/app/src/main/res/drawable-hdpi/grayroad.png differ diff --git a/app/src/main/res/drawable-hdpi/marker_charge_bg1.png b/app/src/main/res/drawable-hdpi/marker_charge_bg1.png index 44560d8..9124f69 100644 Binary files a/app/src/main/res/drawable-hdpi/marker_charge_bg1.png and b/app/src/main/res/drawable-hdpi/marker_charge_bg1.png differ diff --git a/app/src/main/res/drawable-hdpi/marker_facet_bg1.png b/app/src/main/res/drawable-hdpi/marker_facet_bg1.png new file mode 100644 index 0000000..d64c4d0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/marker_facet_bg1.png differ diff --git a/app/src/main/res/drawable-hdpi/marker_other_bg1.png b/app/src/main/res/drawable-hdpi/marker_other_bg1.png index 16665b4..5718837 100644 Binary files a/app/src/main/res/drawable-hdpi/marker_other_bg1.png and b/app/src/main/res/drawable-hdpi/marker_other_bg1.png differ diff --git a/app/src/main/res/drawable-hdpi/marker_poi_bg1.png b/app/src/main/res/drawable-hdpi/marker_poi_bg1.png index da8941e..7092783 100644 Binary files a/app/src/main/res/drawable-hdpi/marker_poi_bg1.png and b/app/src/main/res/drawable-hdpi/marker_poi_bg1.png differ diff --git a/app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png b/app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png index cf7b893..65f183a 100644 Binary files a/app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png and b/app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png differ diff --git a/app/src/main/res/drawable-hdpi/marker_road_bg.png b/app/src/main/res/drawable-hdpi/marker_road_bg.png index 90adc8d..73a9b99 100644 Binary files a/app/src/main/res/drawable-hdpi/marker_road_bg.png and b/app/src/main/res/drawable-hdpi/marker_road_bg.png differ diff --git a/app/src/main/res/drawable-hdpi/poi_video_have_bg1.png b/app/src/main/res/drawable-hdpi/poi_video_have_bg1.png index 6f483c2..db64b09 100644 Binary files a/app/src/main/res/drawable-hdpi/poi_video_have_bg1.png and b/app/src/main/res/drawable-hdpi/poi_video_have_bg1.png differ diff --git a/app/src/main/res/drawable/marker_charge_bags.png b/app/src/main/res/drawable/marker_charge_bags.png index 686bea6..bb409ec 100644 Binary files a/app/src/main/res/drawable/marker_charge_bags.png and b/app/src/main/res/drawable/marker_charge_bags.png differ diff --git a/app/src/main/res/drawable/marker_charge_bg.png b/app/src/main/res/drawable/marker_charge_bg.png deleted file mode 100644 index 5e72703..0000000 Binary files a/app/src/main/res/drawable/marker_charge_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_charge_centre_bg.png b/app/src/main/res/drawable/marker_charge_centre_bg.png deleted file mode 100644 index 9f69cb4..0000000 Binary files a/app/src/main/res/drawable/marker_charge_centre_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_charge_have_bag.png b/app/src/main/res/drawable/marker_charge_have_bag.png deleted file mode 100644 index 41a5440..0000000 Binary files a/app/src/main/res/drawable/marker_charge_have_bag.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_charge_have_bg.png b/app/src/main/res/drawable/marker_charge_have_bg.png deleted file mode 100644 index 07eb886..0000000 Binary files a/app/src/main/res/drawable/marker_charge_have_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_facet_bag.png b/app/src/main/res/drawable/marker_facet_bag.png new file mode 100644 index 0000000..c3d8beb Binary files /dev/null and b/app/src/main/res/drawable/marker_facet_bag.png differ diff --git a/app/src/main/res/drawable/marker_other_bag.png b/app/src/main/res/drawable/marker_other_bag.png index d083f31..f611c32 100644 Binary files a/app/src/main/res/drawable/marker_other_bag.png and b/app/src/main/res/drawable/marker_other_bag.png differ diff --git a/app/src/main/res/drawable/marker_other_bg.png b/app/src/main/res/drawable/marker_other_bg.png deleted file mode 100644 index bd657b4..0000000 Binary files a/app/src/main/res/drawable/marker_other_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_other_have_bag.png b/app/src/main/res/drawable/marker_other_have_bag.png deleted file mode 100644 index 3f9d470..0000000 Binary files a/app/src/main/res/drawable/marker_other_have_bag.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_pile_bag.png b/app/src/main/res/drawable/marker_pile_bag.png deleted file mode 100644 index dcde294..0000000 Binary files a/app/src/main/res/drawable/marker_pile_bag.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_pile_bg.png b/app/src/main/res/drawable/marker_pile_bg.png deleted file mode 100644 index abba110..0000000 Binary files a/app/src/main/res/drawable/marker_pile_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_pile_centre_bg.png b/app/src/main/res/drawable/marker_pile_centre_bg.png deleted file mode 100644 index 043039e..0000000 Binary files a/app/src/main/res/drawable/marker_pile_centre_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_pile_have_bg.png b/app/src/main/res/drawable/marker_pile_have_bg.png deleted file mode 100644 index f678b97..0000000 Binary files a/app/src/main/res/drawable/marker_pile_have_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_poi_bag.png b/app/src/main/res/drawable/marker_poi_bag.png deleted file mode 100644 index bfc05f9..0000000 Binary files a/app/src/main/res/drawable/marker_poi_bag.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_poi_bags.png b/app/src/main/res/drawable/marker_poi_bags.png index 879770e..73e4415 100644 Binary files a/app/src/main/res/drawable/marker_poi_bags.png and b/app/src/main/res/drawable/marker_poi_bags.png differ diff --git a/app/src/main/res/drawable/marker_poi_bg.png b/app/src/main/res/drawable/marker_poi_bg.png deleted file mode 100644 index 7502c02..0000000 Binary files a/app/src/main/res/drawable/marker_poi_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_poi_have_bag.png b/app/src/main/res/drawable/marker_poi_have_bag.png deleted file mode 100644 index 530fa5d..0000000 Binary files a/app/src/main/res/drawable/marker_poi_have_bag.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_poi_have_bg.png b/app/src/main/res/drawable/marker_poi_have_bg.png deleted file mode 100644 index cd90eb3..0000000 Binary files a/app/src/main/res/drawable/marker_poi_have_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_road_bag.png b/app/src/main/res/drawable/marker_road_bag.png index ed92c3f..c5bff52 100644 Binary files a/app/src/main/res/drawable/marker_road_bag.png and b/app/src/main/res/drawable/marker_road_bag.png differ diff --git a/app/src/main/res/drawable/marker_road_have_bag.png b/app/src/main/res/drawable/marker_road_have_bag.png deleted file mode 100644 index cab9fc8..0000000 Binary files a/app/src/main/res/drawable/marker_road_have_bag.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_road_have_bg.png b/app/src/main/res/drawable/marker_road_have_bg.png deleted file mode 100644 index fe556d9..0000000 Binary files a/app/src/main/res/drawable/marker_road_have_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/poi_video_bag.png b/app/src/main/res/drawable/poi_video_bag.png index bfc05f9..027f489 100644 Binary files a/app/src/main/res/drawable/poi_video_bag.png and b/app/src/main/res/drawable/poi_video_bag.png differ diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 645066f..b10b825 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -118,7 +118,7 @@ app:layout_constraintTop_toBottomOf="@id/et_login_paw" /> diff --git a/app/src/main/res/layout/activity_statement.xml b/app/src/main/res/layout/activity_statement.xml new file mode 100644 index 0000000..90bf4fd --- /dev/null +++ b/app/src/main/res/layout/activity_statement.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml index 8bba08f..26b9e6f 100644 --- a/app/src/main/res/layout/activity_web.xml +++ b/app/src/main/res/layout/activity_web.xml @@ -23,7 +23,7 @@ android:id="@+id/tv_title" style="@style/text_style_toolbar_title" android:layout_width="wrap_content" - android:text="webView" + android:text="详情页面" android:layout_toRightOf="@id/iv_icon" android:textColor="#fff" /> diff --git a/app/src/main/res/layout/has_sumit_item.xml b/app/src/main/res/layout/has_sumit_item.xml index 5069660..b60c9e7 100644 --- a/app/src/main/res/layout/has_sumit_item.xml +++ b/app/src/main/res/layout/has_sumit_item.xml @@ -45,7 +45,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="10dp" - android:text="2222" app:layout_constraintRight_toLeftOf="@+id/tv_auditStatus" app:layout_constraintTop_toTopOf="@+id/tv_createTime" /> diff --git a/app/src/main/res/layout/icon.xml b/app/src/main/res/layout/icon.xml index 35c1a5e..925379d 100644 --- a/app/src/main/res/layout/icon.xml +++ b/app/src/main/res/layout/icon.xml @@ -11,7 +11,7 @@ android:layout_height="match_parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:background="@drawable/marker_poi_bg" + android:background="@drawable/marker_poi_bags" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/mine_fragment.xml b/app/src/main/res/layout/mine_fragment.xml index 1df7beb..ce68e56 100644 --- a/app/src/main/res/layout/mine_fragment.xml +++ b/app/src/main/res/layout/mine_fragment.xml @@ -151,7 +151,6 @@ style="@style/main_text_style" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="我的等级" /> - navinfo + 地图寻宝 HomeActivity First Fragment