diff --git a/app/build.gradle b/app/build.gradle index d3987bb..e01e3cf 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 7a21ef3..cde22bd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,6 +47,7 @@ android:supportsRtl="true" android:theme="@style/Theme.WhiteScreen" tools:targetApi="n"> + @@ -96,16 +97,19 @@ - + - + + role; - private int needGuide; - - public int getNeedGuide() { - return needGuide; - } - - public void setNeedGuide(int needGuide) { - this.needGuide = needGuide; - } + private Integer needGuide; public int getPid() { return pid; @@ -162,6 +155,14 @@ public class UserDetailBean { this.fatherid = fatherid; } + public Object getFatherusername() { + return fatherusername; + } + + public void setFatherusername(Object fatherusername) { + this.fatherusername = fatherusername; + } + public Object getRegisterTime() { return registerTime; } @@ -234,6 +235,14 @@ public class UserDetailBean { this.userAuth = userAuth; } + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + public List getRole() { return role; } @@ -242,6 +251,14 @@ public class UserDetailBean { this.role = role; } + public Integer getNeedGuide() { + return needGuide; + } + + public void setNeedGuide(Integer needGuide) { + this.needGuide = needGuide; + } + public static class UserBankcardBean { /** * userid : 1 @@ -514,6 +531,10 @@ public class UserDetailBean { private int id; private String name; private String description; + private Object createId; + private Object createTime; + private Object updateId; + private Object updateTime; public int getId() { return id; @@ -538,6 +559,38 @@ public class UserDetailBean { public void setDescription(String description) { this.description = description; } + + public Object getCreateId() { + return createId; + } + + public void setCreateId(Object createId) { + this.createId = createId; + } + + public Object getCreateTime() { + return createTime; + } + + public void setCreateTime(Object createTime) { + this.createTime = createTime; + } + + public Object getUpdateId() { + return updateId; + } + + public void setUpdateId(Object updateId) { + this.updateId = updateId; + } + + public Object getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Object updateTime) { + this.updateTime = updateTime; + } } } } 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 7b9f63b..00ecb31 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -39,6 +39,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { private TextView tvMoney; private TextView mainGrade; + private TextView tvMainGrade; public static MineFragment newInstance(Bundle bundle) { MineFragment fragment = new MineFragment(); @@ -93,6 +94,10 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { Button btnQuit = findViewById(R.id.btn_quit); btnQuit.setOnClickListener(this); mainGrade = (TextView) findViewById(R.id.main_grade); + tvMainGrade = findViewById(R.id.tv_main_grade); + if (Constant.LEVEL != 0) { + tvMainGrade.setText(Constant.LEVEL); + } initNetWork(); } 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 8d1c214..4cf1e44 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -287,7 +287,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe //拍照长按删除 private void onLongDel() { - if (ivPanorama.getTag() != null || ivName.getTag() != null || ivElse.getTag() != null || ivInternal.getTag() != null || ivCard.getTag() != null) { + rlPanorama.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { @@ -361,7 +361,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } }); } - } + private void initShowPoi() { // 添加信息： @@ -650,7 +650,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe case R.id.rl_panorama: Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); file = PhotoUtils.showPhotoFile("a", latLng); - ; intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); startActivityForResult(intentPanorama, 101); break; diff --git a/app/src/main/res/layout/activity_poi_picture.xml b/app/src/main/res/layout/activity_poi_picture.xml new file mode 100644 index 0000000..04aa410 --- /dev/null +++ b/app/src/main/res/layout/activity_poi_picture.xml @@ -0,0 +1,46 @@ + + + + + +