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

修改13日的bug

Browse Source
This commit is contained in:
md 2021-08-13 15:39:41 +08:00
parent 3863f6e1ad
commit 2f3b1cbeae
54 changed files with 168 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

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

58
app/src/main/AndroidManifest.xml
View File

@ -4,20 +4,16 @@
package="com.navinfo.outdoor">
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.READ_CALENDAR" />
<!-- <uses-permission android:name="android.permission.WRITE_CALENDAR" />-->
<uses-permission android:name="android.permission.READ_CALENDAR" /> <!-- <uses-permission android:name="android.permission.WRITE_CALENDAR" /> -->
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" /> <!-- <uses-sdk android:minSdkVersion="8"></uses-sdk> -->
<!-- 在SDCard中创建与删除文件权限 -->
<uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions" />
<!-- 安装APK权限 -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<!-- 友盟检测bug -->
tools:ignore="ProtectedPermissions" /> <!-- 安装APK权限 -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- 友盟检测bug -->
<!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
<!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
<!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" /> -->
@ -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">
<activity android:name=".activity.PicturesActivity"
>
</activity>
<activity android:name=".activity.StatementActivity"></activity>
<activity android:name=".activity.PicturesActivity"></activity>
<activity
android:name=".activity.PictureActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|navigation"
android:launchMode="singleTop"></activity>
android:launchMode="singleTop" />
<meta-data
android:name="TencentMapSDK"
android:value="EWWBZ-2PB62-6JXUL-CEX7G-N7UE6-XRB4V" />
<!--今日头屏幕适配-->
android:value="EWWBZ-2PB62-6JXUL-CEX7G-N7UE6-XRB4V" /> <!-- 今日头屏幕适配 -->
<meta-data
android:name="design_width_in_dp"
android:value="360" />
@ -70,7 +63,8 @@
android:name="design_height_in_dp"
android:value="640" />
<activity android:name=".activity.MainActivity"
<activity
android:name=".activity.MainActivity"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -78,37 +72,37 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".activity.LoginActivity"
<activity
android:name=".activity.LoginActivity"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait"/>
<!--|screenSize-->
<activity android:name=".activity.HomeActivity"
android:screenOrientation="portrait" /> <!-- |screenSize -->
<activity
android:name=".activity.HomeActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="portrait" />
<activity android:name=".activity.WebActivity"
<activity
android:name=".activity.WebActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.FragmentManagement"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".activity.ImageShowActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.ImageShowActivity"
<activity
android:name=".activity.UserActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.UserActivity"
android:screenOrientation="portrait"/>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.navinfo.outdoor.fileprovider"
android:grantUriPermissions="true"
android:exported="false">
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
</manifest>

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

@ -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;
@ -70,6 +72,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
}
}
@Override
protected void initView() {
super.initView();
@ -81,6 +84,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
tvForgetPaw = findViewById(R.id.tv_forget_paw);
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);
@ -119,6 +124,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
initLogIn(name, paw);
break;
case R.id.tv_statement:
break;
}
}
@ -158,9 +167,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
initGetUserInfo();//获取用户信息
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();
@ -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))//加上判断

16
app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java Normal file
View File

@ -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);
}
}

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

@ -48,6 +48,7 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
}else if (listBean.getAuditStatus() == -1){
holder.tvAuditStatus.setText("待审核");
}
holder.tvMany.setText("￥0.0");
}

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

@ -37,6 +37,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
private ImageView ivEvaluationTaskFinish;
private XRecyclerView capacityEvaluationRecycler;
private CapacityEvaluationAdapter capacityEvaluationAdapter;
private int capacityPage = 1;
public static CapacityEvaluationFragment newInstance(Bundle bundle) {
@ -61,8 +62,8 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
capacityEvaluationRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
capacityEvaluationRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
//取消上拉加载，刷新功能
capacityEvaluationRecycler.setPullRefreshEnabled(false);
capacityEvaluationRecycler.setLoadingMoreEnabled(false);
// capacityEvaluationRecycler.setPullRefreshEnabled(false);
// capacityEvaluationRecycler.setLoadingMoreEnabled(false);
capacityEvaluationAdapter = new CapacityEvaluationAdapter(getActivity());
capacityEvaluationRecycler.setAdapter(capacityEvaluationAdapter);
capacityEvaluationRecycler.getDefaultFootView().setNoMoreHint("加载成功");
@ -97,8 +98,8 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
private void initNewWork() {
showLoadingDialog();
HttpParams httpParams = new HttpParams();
httpParams.put("fid", "1");
httpParams.put("pageNum", "1");
httpParams.put("fid", "4");
httpParams.put("pageNum", capacityPage);
httpParams.put("pageSize", "10");
OkGoBuilder.getInstance()
.Builder(getActivity())
@ -111,6 +112,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
public void onSuccess(TaskPrefectureBean response, int id) {
dismissLoadingDialog();
capacityEvaluationAdapter.setCapacityList(response.getBody().getList());
capacityPage++;
Log.d("TAG", "onSuccess: " + response.getMessage() + "sssssssssssss");
}

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

@ -38,6 +38,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic
private XRecyclerView eventRecycler;
private List<TaskPrefectureBean.BodyBean.ListBean> 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("已全部加载完毕");

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

@ -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()

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

@ -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() {

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

@ -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() + "");
}

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

@ -39,6 +39,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
private XRecyclerView taskRecycler;
private List<TaskPrefectureBean.BodyBean.ListBean> 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);
}

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

@ -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)

BIN
app/src/main/res/drawable-hdpi/graycharge.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable-hdpi/grayfacet.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-hdpi/grayother.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-hdpi/graypoi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-hdpi/grayroad.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-hdpi/marker_charge_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-hdpi/marker_facet_bg1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-hdpi/marker_other_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable-hdpi/marker_poi_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-hdpi/marker_road_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable-hdpi/poi_video_have_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable/marker_charge_bags.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable/marker_charge_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 928 B

BIN
app/src/main/res/drawable/marker_charge_centre_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 937 B

BIN
app/src/main/res/drawable/marker_charge_have_bag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
app/src/main/res/drawable/marker_charge_have_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 893 B

BIN
app/src/main/res/drawable/marker_facet_bag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable/marker_other_bag.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable/marker_other_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 888 B

BIN
app/src/main/res/drawable/marker_other_have_bag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 894 B

BIN
app/src/main/res/drawable/marker_pile_bag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
app/src/main/res/drawable/marker_pile_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 802 B

BIN
app/src/main/res/drawable/marker_pile_centre_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 806 B

BIN
app/src/main/res/drawable/marker_pile_have_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 832 B

BIN
app/src/main/res/drawable/marker_poi_bag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable/marker_poi_bags.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable/marker_poi_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 844 B

BIN
app/src/main/res/drawable/marker_poi_have_bag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable/marker_poi_have_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 844 B

BIN
app/src/main/res/drawable/marker_road_bag.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable/marker_road_have_bag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/src/main/res/drawable/marker_road_have_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
app/src/main/res/drawable/poi_video_bag.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -118,7 +118,7 @@
app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
<TextView
android:id="@+id/textView"
android:id="@+id/tv_statement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"

1
app/src/main/res/layout/activity_picture.xml
View File

@ -86,6 +86,7 @@
app:layout_constraintTop_toTopOf="@+id/btn_switch"
android:background="@color/whiteAlpha50"
android:padding="@dimen/default_widget_padding"
android:textColor="@color/colorRead"
android:format="00:00:00"
android:layout_marginTop="@dimen/default_widget_padding"></TextView>
</androidx.constraintlayout.widget.ConstraintLayout>

9
app/src/main/res/layout/activity_statement.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.StatementActivity">
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -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" />
</RelativeLayout>

1
app/src/main/res/layout/has_sumit_item.xml
View File

@ -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" />

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

@ -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" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/mine_fragment.xml
View File

@ -151,7 +151,6 @@
style="@style/main_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="我的等级" />
<TextView

2
app/src/main/res/values/strings.xml
View File

@ -1,5 +1,5 @@
<resources>
<string name="app_name">navinfo</string>
<string name="app_name">地图寻宝</string>
<string name="title_activity_home">HomeActivity</string>
<!-- Strings used for fragments for navigation -->
<string name="first_fragment_label">First Fragment</string>