修改引导页,以及修改颜色
This commit is contained in:
parent
72dd2af310
commit
1f4b71362f
@ -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"
|
||||
|
@ -1,21 +1,19 @@
|
||||
package com.navinfo.outdoor.activity;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
|
||||
import com.kongzue.dialog.util.BaseDialog;
|
||||
import com.kongzue.dialog.v3.MessageDialog;
|
||||
import androidx.annotation.NonNull;
|
||||
import com.lzy.okgo.model.HttpParams;
|
||||
import com.navinfo.outdoor.R;
|
||||
import com.navinfo.outdoor.api.Constant;
|
||||
import com.navinfo.outdoor.base.BaseActivity;
|
||||
import com.navinfo.outdoor.bean.BaseBean;
|
||||
import com.navinfo.outdoor.bean.UserBean;
|
||||
import com.navinfo.outdoor.http.Callback;
|
||||
import com.navinfo.outdoor.http.HttpInterface;
|
||||
import com.navinfo.outdoor.http.OkGoBuilder;
|
||||
@ -25,8 +23,62 @@ import com.navinfo.outdoor.http.OkGoBuilder;
|
||||
*/
|
||||
public class GuidanceActivity extends BaseActivity {
|
||||
private FrameLayout frameLayout;
|
||||
|
||||
|
||||
private View loginTaskItem, taskItem, refreshItem, screenItem, locationItem, gatherItem, submitItem, submittedItem, discoverItem, myHeadItem, dataItem, withdrawItem;
|
||||
private Handler handler = new Handler(new Handler.Callback() {
|
||||
@Override
|
||||
public boolean handleMessage(@NonNull Message msg) {
|
||||
switch (msg.what) {
|
||||
case 0x101:
|
||||
frameLayout.removeView(loginTaskItem);
|
||||
frameLayout.addView(taskItem);
|
||||
break;
|
||||
case 0x102:
|
||||
frameLayout.removeView(taskItem);
|
||||
frameLayout.addView(refreshItem);
|
||||
break;
|
||||
case 0x103:
|
||||
frameLayout.removeView(refreshItem);
|
||||
frameLayout.addView(screenItem);
|
||||
break;
|
||||
case 0x104:
|
||||
frameLayout.removeView(screenItem);
|
||||
frameLayout.addView(locationItem);
|
||||
break;
|
||||
case 0x105:
|
||||
frameLayout.removeView(locationItem);
|
||||
frameLayout.addView(gatherItem);
|
||||
break;
|
||||
case 0x106:
|
||||
frameLayout.removeView(gatherItem);
|
||||
frameLayout.addView(submitItem);
|
||||
break;
|
||||
case 0x107:
|
||||
frameLayout.removeView(submitItem);
|
||||
frameLayout.addView(submittedItem);
|
||||
break;
|
||||
case 0x108:
|
||||
frameLayout.removeView(submittedItem);
|
||||
frameLayout.addView(discoverItem);
|
||||
break;
|
||||
case 0x109:
|
||||
frameLayout.removeView(discoverItem);
|
||||
frameLayout.addView(myHeadItem);
|
||||
break;
|
||||
case 0x110:
|
||||
frameLayout.removeView(myHeadItem);
|
||||
frameLayout.addView(dataItem);
|
||||
break;
|
||||
case 0x111:
|
||||
frameLayout.removeView(dataItem);
|
||||
frameLayout.addView(withdrawItem);
|
||||
break;
|
||||
case 0x112:
|
||||
initGuide();
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
@Override
|
||||
protected int getLayout() {
|
||||
return R.layout.activity_guidance;
|
||||
@ -41,97 +93,125 @@ public class GuidanceActivity extends BaseActivity {
|
||||
@Override
|
||||
protected void initData() {
|
||||
super.initData();
|
||||
View taskItem = LayoutInflater.from(this).inflate(R.layout.guidance_task_item, null);
|
||||
View refreshItem = LayoutInflater.from(this).inflate(R.layout.guidance_refresh_item, null);
|
||||
View screenItem = LayoutInflater.from(this).inflate(R.layout.guidance_screen_item, null);
|
||||
View locationItem = LayoutInflater.from(this).inflate(R.layout.guidance_location_item, null);
|
||||
View gatherItem = LayoutInflater.from(this).inflate(R.layout.guidance_gather_item, null);
|
||||
View submitItem = LayoutInflater.from(this).inflate(R.layout.guidance_submit_item, null);
|
||||
View submittedItem = LayoutInflater.from(this).inflate(R.layout.guidance_submitted_item, null);
|
||||
View discoverItem = LayoutInflater.from(this).inflate(R.layout.guidance_discover_item, null);
|
||||
View myHeadItem = LayoutInflater.from(this).inflate(R.layout.guidance_my_head_item, null);
|
||||
View dataItem = LayoutInflater.from(this).inflate(R.layout.guidance_data_item, null);
|
||||
View withdrawItem = LayoutInflater.from(this).inflate(R.layout.guidance_withdraw_item, null);
|
||||
|
||||
frameLayout.addView(taskItem);
|
||||
loginTaskItem = LayoutInflater.from(this).inflate(R.layout.login_task_item, null);
|
||||
taskItem = LayoutInflater.from(this).inflate(R.layout.guidance_task_item, null);
|
||||
refreshItem = LayoutInflater.from(this).inflate(R.layout.guidance_refresh_item, null);
|
||||
screenItem = LayoutInflater.from(this).inflate(R.layout.guidance_screen_item, null);
|
||||
locationItem = LayoutInflater.from(this).inflate(R.layout.guidance_location_item, null);
|
||||
gatherItem = LayoutInflater.from(this).inflate(R.layout.guidance_gather_item, null);
|
||||
submitItem = LayoutInflater.from(this).inflate(R.layout.guidance_submit_item, null);
|
||||
submittedItem = LayoutInflater.from(this).inflate(R.layout.guidance_submitted_item, null);
|
||||
discoverItem = LayoutInflater.from(this).inflate(R.layout.guidance_discover_item, null);
|
||||
myHeadItem = LayoutInflater.from(this).inflate(R.layout.guidance_my_head_item, null);
|
||||
dataItem = LayoutInflater.from(this).inflate(R.layout.guidance_data_item, null);
|
||||
withdrawItem = LayoutInflater.from(this).inflate(R.layout.guidance_withdraw_item, null);
|
||||
frameLayout.addView(loginTaskItem);
|
||||
loginTaskItem.findViewById(R.id.btn_login).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
Message message = new Message();
|
||||
message.what = 0x101;
|
||||
handler.sendMessageDelayed(message, 1000);
|
||||
v.setEnabled(false);
|
||||
}
|
||||
});
|
||||
taskItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(taskItem);
|
||||
frameLayout.addView(refreshItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x102;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
refreshItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(refreshItem);
|
||||
frameLayout.addView(screenItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x103;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
screenItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(screenItem);
|
||||
frameLayout.addView(locationItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x104;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
locationItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(locationItem);
|
||||
frameLayout.addView(gatherItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x105;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
gatherItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(gatherItem);
|
||||
frameLayout.addView(submitItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x106;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
submitItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(submitItem);
|
||||
frameLayout.addView(submittedItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x107;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
submittedItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(submittedItem);
|
||||
frameLayout.addView(discoverItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x108;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
discoverItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(discoverItem);
|
||||
frameLayout.addView(myHeadItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x109;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
myHeadItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(myHeadItem);
|
||||
frameLayout.addView(dataItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x110;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
|
||||
}
|
||||
});
|
||||
dataItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
frameLayout.removeView(dataItem);
|
||||
frameLayout.addView(withdrawItem);
|
||||
v.setEnabled(false);
|
||||
Message message = new Message();
|
||||
message.what = 0x111;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
withdrawItem.findViewById(R.id.btn_to_learn).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
initGuide();
|
||||
// Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中,进行再次学习哦", Toast.LENGTH_SHORT).show();
|
||||
Intent intent = new Intent(GuidanceActivity.this, HomeActivity.class);
|
||||
startActivity(intent);
|
||||
finish();
|
||||
Message message = new Message();
|
||||
message.what = 0x112;
|
||||
handler.sendMessageDelayed(message, 500);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -152,7 +232,6 @@ public class GuidanceActivity extends BaseActivity {
|
||||
dismissLoadingDialog();
|
||||
if (response.getCode() == 200) {
|
||||
Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中,进行再次学习哦", Toast.LENGTH_LONG).show();
|
||||
|
||||
Intent intent = new Intent(GuidanceActivity.this, HomeActivity.class);
|
||||
startActivity(intent);
|
||||
finish();
|
||||
@ -163,7 +242,7 @@ public class GuidanceActivity extends BaseActivity {
|
||||
public void onError(Throwable e, int id) {
|
||||
dismissLoadingDialog();
|
||||
Toast.makeText(GuidanceActivity.this, e.getMessage()+"", Toast.LENGTH_SHORT).show();
|
||||
Log.e("TAG", "onError: 错错错"+e.getMessage()+"");
|
||||
Log.e("TAG", "onError: "+e.getMessage()+"");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -4,8 +4,15 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Point;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
import android.os.Message;
|
||||
import android.view.Display;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.Button;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.EditText;
|
||||
@ -13,6 +20,7 @@ import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import com.github.lazylibrary.util.MD5;
|
||||
@ -241,17 +249,30 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
||||
navInfoEditor.commit();
|
||||
int needGuide = body.getNeedGuide();//0不需要 1需要
|
||||
if (needGuide==1){
|
||||
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
|
||||
MessageDialog.show((AppCompatActivity) LoginActivity.this, "提示", "请查看APP使用说明", "确定").setOkButton(new OnDialogButtonClickListener() {
|
||||
Intent intent = new Intent(LoginActivity.this, GuidanceActivity.class);
|
||||
startActivity(intent);
|
||||
/* AlertDialog alertDialog = new AlertDialog.Builder(LoginActivity.this,R.style.dialog).create();
|
||||
alertDialog.show();
|
||||
WindowManager windowManager = getWindowManager();
|
||||
Display defaultDisplay = windowManager.getDefaultDisplay();
|
||||
Point point = new Point();
|
||||
defaultDisplay.getSize(point);
|
||||
Window window = alertDialog.getWindow();
|
||||
assert window != null;
|
||||
WindowManager.LayoutParams lp = ((Window) window).getAttributes();
|
||||
lp.width = point.x; // 设置宽度和高度
|
||||
lp.height = point.y;
|
||||
getWindow().getDecorView().setPadding( 0 , 0 , 0 , 0 );
|
||||
window.setAttributes(lp);
|
||||
window.setContentView(R.layout.login_task_item);
|
||||
window.findViewById(R.id.btn_login).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public boolean onClick(BaseDialog baseDialog, View v) {
|
||||
public void onClick(View v) {
|
||||
Intent intent = new Intent(LoginActivity.this, GuidanceActivity.class);
|
||||
startActivity(intent);
|
||||
finish();
|
||||
return false;
|
||||
alertDialog.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
});*/
|
||||
}else {
|
||||
Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show();
|
||||
Intent intent = new Intent(LoginActivity.this, HomeActivity.class);
|
||||
|
@ -220,6 +220,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
|
||||
uiSettings.setLogoScale(0.7f);
|
||||
uiSettings.setRotateGesturesEnabled(false);//禁止地图旋转手势.
|
||||
uiSettings.setTiltGesturesEnabled(false);//禁止倾斜手势.
|
||||
|
||||
// uiSettings.setAllGesturesEnabled(false);
|
||||
setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE);
|
||||
|
||||
|
@ -209,8 +209,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
|
||||
videoIndex = Integer.parseInt(file.getName().replace(".jpg", ""));
|
||||
finalVideoPath = Objects.requireNonNull(file.getParentFile()).getAbsolutePath() + "/" + (videoIndex + 1) + ".jpg";
|
||||
}
|
||||
initMarkerPaper();
|
||||
Message message = new Message();
|
||||
initMarkerPaper();
|
||||
if (type == 3) {
|
||||
message.what = 0x103;
|
||||
handler.sendMessageDelayed(message, 0);
|
||||
|
@ -17,6 +17,7 @@ import com.bumptech.glide.request.RequestOptions;
|
||||
import com.lzy.okgo.model.HttpParams;
|
||||
import com.navinfo.outdoor.R;
|
||||
import com.navinfo.outdoor.activity.FragmentManagement;
|
||||
import com.navinfo.outdoor.activity.LoginActivity;
|
||||
import com.navinfo.outdoor.activity.UserActivity;
|
||||
import com.navinfo.outdoor.api.Constant;
|
||||
import com.navinfo.outdoor.base.BaseFragment;
|
||||
@ -193,6 +194,8 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
|
||||
startActivity(intentAbout);
|
||||
break;
|
||||
case R.id.btn_quit://退出登录
|
||||
Intent intent = new Intent(getContext(), LoginActivity.class);
|
||||
startActivity(intent);
|
||||
Objects.requireNonNull(getActivity()).finish();
|
||||
break;
|
||||
}
|
||||
|
@ -748,7 +748,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
.addAll(latLineString)
|
||||
// 折线设置圆形线头
|
||||
.lineCap(true)
|
||||
.color(Color.parseColor("#FFC107"))
|
||||
.color(Color.parseColor("#FFE70C"))
|
||||
// 折线宽度为5像素
|
||||
.width(10)
|
||||
.arrow(true)
|
||||
@ -812,7 +812,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
poiMarker.setZIndex(MARKER_DOT);
|
||||
poiMarker.setTitle(poiEntity.getName() + "");
|
||||
poiMarker.setTag(poiEntity);
|
||||
|
||||
removablesLocality.add(poiMarker);
|
||||
break;
|
||||
case 2://充电站
|
||||
@ -933,8 +932,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putSerializable("poiEntity", poiEntity);
|
||||
PoiFragment poiFragment = PoiFragment.newInstance(bundle);
|
||||
LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX()));
|
||||
// showPoiMarkerByType(1, newPoiLatLng);
|
||||
showSlidingFragment(poiFragment);
|
||||
initRemovePoiSharePre();
|
||||
return false;
|
||||
@ -949,8 +946,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putSerializable("poiEntity", poiEntity);
|
||||
ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
|
||||
LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX()));
|
||||
// showPoiMarkerByType(4, newPoiLatLng);
|
||||
showSlidingFragment(chargingStationFragment);
|
||||
initRemovePoiSharePre();
|
||||
return false;
|
||||
@ -965,8 +960,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putSerializable("poiEntity", poiEntity);
|
||||
PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
|
||||
LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX()));
|
||||
// showPoiMarkerByType(2, newPoiLatLng);
|
||||
showSlidingFragment(poiVideoFragment);
|
||||
initRemovePoiSharePre();
|
||||
return false;
|
||||
@ -981,8 +974,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putSerializable("poiEntity", poiEntity);
|
||||
RoadFragment roadFragment = RoadFragment.newInstance(bundle);
|
||||
LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX()));
|
||||
// showPoiMarkerByType(3, newPoiLatLng);
|
||||
showSlidingFragment(roadFragment);
|
||||
initRemovePoiSharePre();
|
||||
return false;
|
||||
@ -997,8 +988,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putSerializable("poiEntity", poiEntity);
|
||||
OtherFragment otherFragment = OtherFragment.newInstance(bundle);
|
||||
LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX()));
|
||||
// showPoiMarkerByType(5, newPoiLatLng);
|
||||
showSlidingFragment(otherFragment);
|
||||
initRemovePoiSharePre();
|
||||
return false;
|
||||
@ -1160,6 +1149,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
removablesLocality.get(i).remove();
|
||||
}
|
||||
removablesLocality.clear();
|
||||
for (int i = 0; i < removableScreenMarker.size(); i++) {
|
||||
removableScreenMarker.get(i).remove();
|
||||
}
|
||||
removableScreenMarker.clear();
|
||||
refreshFilterData();
|
||||
}
|
||||
} else if (data.what == Constant.EVENT_WHAT_COMPLETE_TASK) {
|
||||
@ -1612,20 +1605,24 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
String geo = listBean.getGeo();
|
||||
poiListEntity.setGeoWkt(geo);
|
||||
Geometry geometry = GeometryTools.createGeometry(geo);
|
||||
if (geometry.getGeometryType().equals("Point")) {//点
|
||||
LatLng latLng = GeometryTools.createLatLng(geo);
|
||||
poiListEntity.setX(latLng.longitude + "");
|
||||
poiListEntity.setY(latLng.latitude + "");
|
||||
} else if (geometry.getGeometryType().equals("LineString")) {//线
|
||||
List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
|
||||
assert latLineString != null;
|
||||
poiListEntity.setX(latLineString.get(0).longitude + "");
|
||||
poiListEntity.setY(latLineString.get(0).latitude + "");
|
||||
} else if (geometry.getGeometryType().equals("Polygon")) {//面
|
||||
List<LatLng> latPolygon = GeometryTools.getLatLngs(geo);
|
||||
assert latPolygon != null;
|
||||
poiListEntity.setX(latPolygon.get(0).longitude + "");
|
||||
poiListEntity.setY(latPolygon.get(0).latitude + "");
|
||||
switch (geometry.getGeometryType()) {
|
||||
case "Point": //点
|
||||
LatLng latLng = GeometryTools.createLatLng(geo);
|
||||
poiListEntity.setX(latLng.longitude + "");
|
||||
poiListEntity.setY(latLng.latitude + "");
|
||||
break;
|
||||
case "LineString": //线
|
||||
List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
|
||||
assert latLineString != null;
|
||||
poiListEntity.setX(latLineString.get(0).longitude + "");
|
||||
poiListEntity.setY(latLineString.get(0).latitude + "");
|
||||
break;
|
||||
case "Polygon": //面
|
||||
List<LatLng> latPolygon = GeometryTools.getLatLngs(geo);
|
||||
assert latPolygon != null;
|
||||
poiListEntity.setX(latPolygon.get(0).longitude + "");
|
||||
poiListEntity.setY(latPolygon.get(0).latitude + "");
|
||||
break;
|
||||
}
|
||||
initMarker(poiListEntity, true);
|
||||
switch (listBean.getType()){
|
||||
@ -1634,7 +1631,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
case 5:
|
||||
marker.remove();
|
||||
break;
|
||||
|
||||
case 3:
|
||||
case 4:
|
||||
case 6:
|
||||
|
@ -4,8 +4,11 @@ import com.navinfo.outdoor.api.Constant;
|
||||
|
||||
public class HttpInterface {
|
||||
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
|
||||
public static final String TEST_IP = "http://172.23.139.4:9999/m4";//测试接口
|
||||
public static final String TEST_IP1 = "http://172.21.98.90:9999/m4";//引导页完成接口
|
||||
public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口
|
||||
public static final String TEST_IP = "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
|
||||
public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口
|
||||
|
||||
|
||||
public static final String USER_PATH = "/user/";//我的
|
||||
public static final String MSG_LIST_PATH = "/msgList/";//发现
|
||||
public static final String USER_LOGIN_PATH = "/userlogin/";//登录
|
||||
@ -141,7 +144,7 @@ public class HttpInterface {
|
||||
//dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718
|
||||
USER_DETAIL_BY_USER_ID = TEST_IP + USER_PATH + "user/" + USERID + "/getUserDetailByUserid/" + USERID; //获取用户信息
|
||||
//http://172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide
|
||||
INSERT_USER_GUIDE=TEST_IP1 +USER_PATH+"userGuide/"+USERID+"/insertUserGuide";//引导页完成接口
|
||||
INSERT_USER_GUIDE=TEST_GUIDANCE_IP +USER_PATH+"userGuide/"+USERID+"/insertUserGuide";//引导页完成接口
|
||||
/**
|
||||
* 发现
|
||||
* Path=/m4/msgList/**
|
||||
|
@ -16,8 +16,8 @@
|
||||
android:id="@+id/camera"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:cameraPictureSizeMaxArea="2500"
|
||||
app:cameraVideoSizeMaxWidth="2750000"
|
||||
app:cameraPictureSizeMaxArea="1100"
|
||||
app:cameraVideoSizeMaxWidth="800000"
|
||||
android:keepScreenOn="true"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
@ -8,9 +8,9 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_delete"
|
||||
android:layout_width="15dp"
|
||||
android:layout_height="15dp"
|
||||
android:padding="10dp"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:padding="5dp"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="@drawable/icon_delete"
|
||||
|
60
app/src/main/res/layout/login_task_item.xml
Normal file
60
app/src/main/res/layout/login_task_item.xml
Normal file
@ -0,0 +1,60 @@
|
||||
<?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"
|
||||
android:background="@drawable/icon_task_1_marker"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="170dp"
|
||||
android:background="#FBF9F9"
|
||||
android:layout_margin="20dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.51">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="15dp"
|
||||
android:text="提示"
|
||||
android:textSize="27dp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/black"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="请查看APP使用说明"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="20dp"
|
||||
android:textStyle="normal"
|
||||
app:layout_constraintBottom_toTopOf="@+id/btn_login"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_login"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginRight="20dp"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:text="确定"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="#D6F4F8"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -6,6 +6,25 @@
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<!--首先在style里写属性-->
|
||||
<style name= "dialog" parent= "@android:style/Theme.Dialog" >
|
||||
<!-- 有无边框 -->
|
||||
<item name= "android:windowFrame">@null</item>
|
||||
<!-- 是否浮现在activity之上 -->
|
||||
<item name= "android:windowIsFloating">true</item>
|
||||
<!-- 是否透明 -->
|
||||
<item name= "android:windowIsTranslucent">true</item>
|
||||
<!-- 背景透明 -->
|
||||
<!--
|
||||
<item name= "android:windowBackground" >@color/white</ item >
|
||||
-->
|
||||
<!-- 模糊 -->
|
||||
<item name= "android:backgroundDimEnabled">true</item>
|
||||
<!--无标题 -->
|
||||
<item name= "android:windowNoTitle">true</item>
|
||||
</style >
|
||||
|
||||
<!--解决黑白屏问题-->
|
||||
<style name="Theme.WhiteScreen" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<!--设置系统的取消预览(空白窗口)为true -->
|
||||
@ -27,6 +46,7 @@
|
||||
<item name="colorControlNormal">@android:color/darker_gray</item>
|
||||
<item name="colorControlActivated">@android:color/darker_gray</item>
|
||||
</style>
|
||||
|
||||
<style name="text_style_title">
|
||||
<item name="android:layout_marginTop">15dp</item>
|
||||
<item name="android:layout_marginLeft">15dp</item>
|
||||
@ -34,6 +54,7 @@
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textColor">#333</item>
|
||||
</style>
|
||||
|
||||
<style name="text_style_toolbar_title">
|
||||
<item name="android:layout_height">45dp</item>
|
||||
<item name="android:layout_marginLeft">35dp</item>
|
||||
@ -42,33 +63,35 @@
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textColor">#fff</item>
|
||||
</style>
|
||||
|
||||
<style name="text_style">
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
|
||||
<style name="text_style_time">
|
||||
<item name="android:textSize">12sp</item>
|
||||
<item name="android:textColor">#EDBCBABA</item>
|
||||
</style>
|
||||
|
||||
|
||||
<!-- 登录字体-->
|
||||
<!-- 登录字体-->
|
||||
|
||||
<style name="text_styles">
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:textColor">#ffffff</item>
|
||||
</style>
|
||||
<!-- '我的'提现设置-->
|
||||
<style name="text_styles">
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:textColor">#ffffff</item>
|
||||
</style>
|
||||
<!-- '我的'提现设置-->
|
||||
<style name="main_style">
|
||||
<item name="android:textColor">#ffffff</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:background">@drawable/user_style</item>
|
||||
<item name="android:background">@drawable/user_style</item>
|
||||
</style>
|
||||
<!--‘我的’退出登录设置-->
|
||||
<!--‘我的’退出登录设置-->
|
||||
<style name="main_outLogin_style">
|
||||
<item name="android:textColor">#ffffff</item>
|
||||
<item name="android:background">@drawable/mine_outlogin_ripple</item>
|
||||
</style>
|
||||
<!-- ‘我的’字体设置 -->
|
||||
<!-- ‘我的’字体设置 -->
|
||||
<style name="main_text_style">
|
||||
<item name="android:textSize">18sp</item>
|
||||
</style>
|
||||
@ -79,28 +102,28 @@
|
||||
<item name="android:textColor">@color/black</item>
|
||||
</style>
|
||||
|
||||
<!-- ‘我的-用户资料’方框设置-->
|
||||
<style name="user_style">
|
||||
<item name="android:background">@drawable/selector_red_bg</item>
|
||||
<item name="android:padding">@dimen/default_widget_padding</item>
|
||||
</style>
|
||||
<!-- ‘我的-用户资料’字体设置-->
|
||||
<!-- ‘我的-用户资料’方框设置-->
|
||||
<style name="user_style">
|
||||
<item name="android:background">@drawable/selector_red_bg</item>
|
||||
<item name="android:padding">@dimen/default_widget_padding</item>
|
||||
</style>
|
||||
<!-- ‘我的-用户资料’字体设置-->
|
||||
<style name="user_text_style">
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:textColor">#333</item>
|
||||
</style>
|
||||
<!-- '我的-用户资料'输入字体设置-->
|
||||
<!-- '我的-用户资料'输入字体设置-->
|
||||
<style name="user_hint_style">
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:background">#fff</item>
|
||||
</style>
|
||||
<!-- 登录背景设置-->
|
||||
<!-- 登录背景设置-->
|
||||
<style name="login_style">
|
||||
<item name="android:textSize">18sp</item>
|
||||
<item name="android:background">@drawable/login_ripple</item>
|
||||
<item name="android:textColor">@color/colorBlue</item>
|
||||
</style>
|
||||
<!--'注册'hint设置-->
|
||||
<!--'注册'hint设置-->
|
||||
<style name="register_hint_style">
|
||||
<item name="android:paddingBottom">10dp</item>
|
||||
<item name="android:layout_marginTop">10dp</item>
|
||||
@ -108,7 +131,7 @@
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:textColorHint">@color/colorTransparent</item>
|
||||
</style>
|
||||
<!-- 状态栏设置-->
|
||||
<!-- 状态栏设置-->
|
||||
<style name="toolbar_style">
|
||||
<item name="android:textColor">#fff</item>
|
||||
<item name="android:textSize">17sp</item>
|
||||
@ -122,6 +145,7 @@
|
||||
<item name="android:layout_marginRight">20dp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
<style name="user_data_style">
|
||||
<item name="android:background">@drawable/selector_red_radius_bg</item>
|
||||
<item name="android:textColor">@color/white</item>
|
||||
@ -135,16 +159,16 @@
|
||||
</style>
|
||||
|
||||
|
||||
<!-- <style name="MyTabLayoutTextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">-->
|
||||
<!-- <item name="android:textSize">20sp</item>-->
|
||||
<!-- <item name="android:textColor">@android:color/white</item>-->
|
||||
<!-- </style>-->
|
||||
<!-- <style name="MyTabLayoutTextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">-->
|
||||
<!-- <item name="android:textSize">20sp</item>-->
|
||||
<!-- <item name="android:textColor">@android:color/white</item>-->
|
||||
<!-- </style>-->
|
||||
<style name="MyTabLayoutTextAppearanceInverse" parent="TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<!-- <item name="android:textColor">@drawable/textcolor_record</item>-->
|
||||
<item name="android:textSize">16sp</item>
|
||||
<!-- <item name="android:textColor">@drawable/textcolor_record</item>-->
|
||||
</style>
|
||||
|
||||
<!-- checkBox选中的颜色-->
|
||||
<!-- checkBox选中的颜色-->
|
||||
<style name="CheckBoxTheme">
|
||||
<item name="colorAccent">@color/colorPrimaryBlue</item><!--选中颜色-->
|
||||
</style>
|
||||
|
Loading…
x
Reference in New Issue
Block a user