4"
865
                    android:background="@color/white"
866
                    android:gravity="center|right"
867
                    android:hint="请选择运营商"
868
                    android:paddingLeft="300px"
869
                    android:text=""
870
                    android:textColor="@color/ui_62"
871
                    android:textColorHint="@color/ui_68"
872
                    android:textSize="15sp" />
873

874
                <ImageView
875
                    android:id="@+id/imageView4"
876
                    android:layout_width="wrap_content"
877
                    android:layout_height="wrap_content"
878
                    android:layout_alignParentEnd="true"
879
                    android:layout_alignParentRight="true"
880
                    android:layout_centerVertical="true"
881
                    android:layout_marginRight="44px"
882
                    android:src="@drawable/icon_select" />
883

884

885
            </com.zhy.autolayout.AutoRelativeLayout>
886

887
            <!-- 运营商电话 -->
888
            <View
889
                android:layout_width="match_parent"
890
                android:layout_height="0.5dp"
891
                android:layout_marginLeft="44px"
892
                android:background="@color/ui_line" />
893

894
            <com.zhy.autolayout.AutoLinearLayout
895
                android:layout_width="match_parent"
896
                android:layout_height="139px"
897
                android:background="@color/bg_row"
898
                android:gravity="center">
899

900
                <TextView
901
                    android:layout_width="wrap_content"
902
                    android:layout_height="wrap_content"
903
                    android:layout_centerInParent="true"
904
                    android:layout_marginLeft="44px"
905
                    android:layout_marginRight="8px"
906
                    android:text="*"
907
                    android:textColor="@color/xinghao"
908
                    android:textSize="15sp" />
909

910
                <TextView
911
                    android:layout_width="wrap_content"
912
                    android:layout_height="wrap_content"
913
                    android:text="运营商电话"
914
                    android:textColor="@color/ui_65"
915
                    android:textSize="15sp" />
916

917

918
                <EditText
919
                    android:id="@+id/et_telephone"
920
                    android:layout_width="0dp"
921
                    android:layout_height="match_parent"
922
                    android:layout_marginLeft="20px"
923
                    android:layout_marginRight="44px"
924
                    android:layout_weight="5"
925
                    android:background="@color/white"
926
                    android:gravity="center|right"
927
                    android:hint="请填写运营商电话"
928
                    android:inputType="text"
929
                    android:text=""
930
                    android:textColor="@color/ui_62"
931
                    android:textColorHint="@color/ui_68"
932
                    android:textSize="15sp" />
933

934

935
            </com.zhy.autolayout.AutoLinearLayout>
936

937
            <View
938
                android:layout_width="match_parent"
939
                android:layout_height="0.5dp"
940
                android:background="@color/ui_line" />
941

942
            <View
943
                android:layout_width="match_parent"
944
                android:layout_height="44px"
945
                android:background="@color/activity_bgcolor" />
946

947
            <View
948
                android:layout_width="match_parent"
949
                android:layout_height="0.5dp"
950
                android:background="@color/ui_line" />
951

952
            <com.zhy.autolayout.AutoRelativeLayout
953
                android:id="@+id/rl_parkLocation"
954
                android:layout_width="match_parent"
955
                android:layout_height="139px"
956
                android:background="@color/white">
957

958
                <TextView
959
                    android:id="@+id/textView24"
960
                    android:layout_width="wrap_content"
961
                    android:layout_height="wrap_content"
962
                    android:layout_alignParentStart="true"
963
                    android:layout_alignParentLeft="true"
964
                    android:layout_centerInParent="true"
965
                    android:layout_marginLeft="44px"
966
                    android:layout_marginRight="8px"
967
                    android:text="*"
968
                    android:textColor="@color/xinghao"
969
                    android:textSize="15sp" />
970

971
                <TextView
972
                    android:id="@+id/textView13"
973
                    android:layout_width="wrap_content"
974
                    android:layout_height="wrap_content"
975
                    android:layout_alignTop="@+id/textView24"
976
                    android:layout_toEndOf="@+id/textView24"
977
                    android:layout_toRightOf="@+id/textView24"
978
                    android:text="停车场地"
979
                    android:textColor="@color/ui_65"
980
                    android:textSize="15sp" />
981

982
                <RadioGroup
983
                    android:id="@+id/rg_park"
984
                    android:layout_width="wrap_content"
985
                    android:layout_height="wrap_content"
986
                    android:layout_alignParentEnd="true"
987
                    android:layout_alignParentRight="true"
988
                    android:layout_centerVertical="true"
989
                    android:layout_marginEnd="44px"
990
                    android:layout_marginRight="44px"
991
                    android:orientation="horizontal">
992

993
                    <RadioButton
994
                        android:id="@+id/rb_shang"
995
                        android:layout_width="wrap_content"
996
                        android:layout_height="wrap_content"
997
                        android:layout_marginLeft="44px"
998
                        android:background="@drawable/icon_shangselected1105"
999
                        android:button="@null" />
1000

1001
                    <RadioButton
1002
                        android:id="@+id/rb_xia"
1003
                        android:layout_width="wrap_content"
1004
                        android:layout_height="wrap_content"
1005
                        android:layout_marginLeft="44px"
1006
                        android:background="@drawable/icon_xianormal1105"
1007
                        android:button="@null" />
1008
                </RadioGroup>
1009

1010
            </com.zhy.autolayout.AutoRelativeLayout>
1011

1012
            <View
1013
                android:layout_width="fill_parent"
1014
                android:layout_height="0.5dp"
1015
                android:layout_marginLeft="44px"
1016
                android:background="@color/ui_line" />
1017

1018
            <com.zhy.autolayout.AutoLinearLayout
1019
                android:id="@+id/rl_prefect_time"
1020
                android:layout_width="match_parent"
1021
                android:layout_height="139px"
1022
                android:background="@color/bg_row">
1023

1024
                <TextView
1025
                    android:id="@+id/tv_prefect_time"
1026
                    android:layout_width="0dp"
1027
                    android:layout_height="wrap_content"
1028
                    android:layout_alignParentLeft="true"
1029
                    android:layout_centerVertical="true"
1030
                    android:layout_weight="1.5"
1031
                    android:paddingLeft="44px"
1032
                    android:text="开放时间"
1033
                    android:textColor="@color/ui_65"
1034
                    android:textSize="15sp" />
1035

1036
                <TextView
1037
                    android:id="@+id/tv_prefect_start_time"
1038
                    android:layout_width="wrap_content"
1039
                    android:layout_height="match_parent"
1040
                    android:layout_centerVertical="true"
1041
                    android:layout_toEndOf="@+id/tv_prefect_time"
1042
                    android:layout_toRightOf="@+id/tv_prefect_time"
1043
                    android:gravity="center"
1044
                    android:hint="00:00"
1045
                    android:paddingLeft="44px"
1046
                    android:paddingRight="20px"
1047
                    android:text=""
1048
                    android:textColor="@color/ui_62"
1049
                    android:textColorHint="@color/ui_68"
1050
                    android:textSize="15sp" />
1051

1052
                <ImageView
1053
                    android:layout_width="wrap_content"
1054
                    android:layout_height="match_parent"
1055
                    android:layout_centerVertical="true"
1056
                    android:layout_toEndOf="@id/tv_prefect_time"
1057
                    android:layout_toRightOf="@id/tv_prefect_start_time"
1058
                    android:src="@drawable/icon_zhi2_0" />
1059

1060
                <TextView
1061
                    android:id="@+id/tv_ferfect_time"
1062
                    android:layout_width="wrap_content"
1063
                    android:layout_height="match_parent"
1064
                    android:layout_alignParentEnd="true"
1065
                    android:layout_alignParentRight="true"
1066
                    android:layout_centerVertical="true"
1067
                    android:contentDescription="@null"
1068
                    android:gravity="center"
1069
                    android:hint="24:00"
1070
                    android:paddingLeft="20px"
1071
                    android:paddingRight="44px"
1072
                    android:text=""
1073
                    android:textColor="@color/ui_62"
1074
                    android:textColorHint="@color/ui_68"
1075

1076
                    android:textSize="15sp" />
1077
            </com.zhy.autolayout.AutoLinearLayout>
1078

1079
            <View
1080
                android:layout_width="fill_parent"
1081
                android:layout_height="0.5dp"
1082
                android:layout_marginLeft="44px"
1083
                android:background="@color/ui_line" />
1084

1085
            <EditText
1086
                android:id="@+id/et_remarkclaim"
1087
                android:layout_width="match_parent"
1088
                android:layout_height="wrap_content"
1089
                android:background="@color/white"
1090
                android:gravity="left|top"
1091
                android:hint="备注说明"
1092
                android:paddingLeft="44px"
1093
                android:paddingTop="48px"
1094
                android:paddingRight="44px"
1095
                android:paddingBottom="50px"
1096
                android:textColor="@color/ui_62"
1097
                android:textColorHint="@color/ui_68"
1098
                android:textSize="15sp" />
1099

1100
            <View
1101
                android:layout_width="fill_parent"
1102
                android:layout_height="0.5dp"
1103
                android:background="@color/ui_line" />
1104

1105
            <View
1106
                android:layout_width="match_parent"
1107
                android:layout_height="44px"
1108
                android:background="@color/activity_bgcolor" />
1109
        </com.zhy.autolayout.AutoLinearLayout>
1110

1111
    </ScrollView>
1112

1113
    <TextView
1114
        android:id="@+id/share_next"
1115
        android:layout_width="match_parent"
1116
        android:layout_height="127px"
1117
        android:layout_alignParentBottom="true"
1118
        android:layout_gravity="center"
1119
        android:background="@color/lvse"
1120
        android:gravity="center"
1121
        android:text="立即提交"
1122
        android:textColor="@color/white"
1123
        android:textSize="15sp" />
1124

1125

1126
</com.zhy.autolayout.AutoRelativeLayout>

+ 2 - 2
app/src/main/res/layout/activity_share_two_picture.xml

37
        android:id="@+id/picture"
37
        android:id="@+id/picture"
38
        android:layout_width="match_parent"
38
        android:layout_width="match_parent"
39
        android:layout_height="0dp"
39
        android:layout_height="0dp"
40
        android:background="@color/orange"
41
        android:scaleType="centerCrop"
40
        android:scaleType="centerCrop"
42
        app:layout_constraintBottom_toBottomOf="parent"
41
        app:layout_constraintBottom_toBottomOf="parent"
43
        app:layout_constraintTop_toBottomOf="@+id/nav_bar" />
42
        app:layout_constraintTop_toBottomOf="@+id/nav_bar"
43
        tools:background="@color/orange" />
44
44
45
</android.support.constraint.ConstraintLayout>
45
</android.support.constraint.ConstraintLayout>

+ 2 - 2
app/src/main/res/layout/item_share_dialog.xml

24
            android:layout_width="match_parent"
24
            android:layout_width="match_parent"
25
            android:layout_height="wrap_content"
25
            android:layout_height="wrap_content"
26
            android:layout_marginLeft="20dp"
26
            android:layout_marginLeft="20dp"
27
            android:layout_marginRight="20dp"
27
            android:layout_marginRight="10dp"
28
            android:textSize="14sp"
28
            android:textSize="14sp"
29
            android:lineSpacingMultiplier="1.5"
29
            android:lineSpacingMultiplier="1.5"
30
            android:textColor="@color/ui_65"
30
            android:textColor="@color/ui_65"
31
            android:text="照片内容需包含以下信息,最多张:\n1、站点周围环境照片,如XX酒店、XX银行;\n2、充电站照片,需要包含充电桩;\n3、充电中的照片,可以是车桩连接的照片或者充电桩显示屏正在充电的照片\n4、分时电价、分时停车费等信息可以拍照或截图上传(非必需)"
31
            android:text="添加照片包含以下信息,最多4张:\n1、站点周围建筑或小区图片,如xx酒店、xx银行;\n2、充电站全景照片,需要包含充电桩;\n3、充电桩图片,可以是具体的桩或车连接的照片;\n4、分时电价、分时停车费等信息(非必填)。"
32
            android:layout_marginTop="17dp"
32
            android:layout_marginTop="17dp"
33
            android:layout_marginBottom="30dp"/>
33
            android:layout_marginBottom="30dp"/>
34
34

+ 73 - 45
app/src/main/res/layout/share_list_adapter.xml

1
<LinearLayout
2
    xmlns:android="http://schemas.android.com/apk/res/android"
1
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2
    xmlns:tools="http://schemas.android.com/tools"
3
    android:layout_width="match_parent"
3
    android:layout_width="match_parent"
4
    android:layout_height="match_parent"
4
    android:background="@color/activity_bgcolor"
5
    android:background="@color/activity_bgcolor"
5
    android:orientation="vertical"
6
    android:layout_height="match_parent">
6
    android:orientation="vertical">
7
7
8
    <LinearLayout
8
    <LinearLayout
9
        android:layout_width="match_parent"
9
        android:layout_width="match_parent"
10
        android:layout_height="wrap_content"
10
        android:layout_height="wrap_content"
11
        android:background="@color/bg_row"
11
        android:background="@color/bg_row"
12
        android:orientation="vertical">
12
        android:orientation="vertical">
13
        <View
14
            android:layout_width="match_parent"
15
            android:layout_height="0.5dp"
16
            android:background="@color/Line"
17
            android:visibility="gone"/>
18
13
19
        <RelativeLayout
14
        <RelativeLayout
20
            android:id="@+id/shareName"
15
            android:id="@+id/shareName"
26
                android:id="@+id/tv_shareName"
21
                android:id="@+id/tv_shareName"
27
                android:layout_width="match_parent"
22
                android:layout_width="match_parent"
28
                android:layout_height="wrap_content"
23
                android:layout_height="wrap_content"
29
                android:gravity="center_vertical"
24
                android:layout_alignParentLeft="true"
30
                android:layout_marginLeft="16dp"
25
                android:layout_marginLeft="16dp"
31
                android:layout_marginRight="90dp"
26
                android:layout_marginRight="90dp"
32
                android:singleLine="true"
33
                android:ellipsize="end"
27
                android:ellipsize="end"
34
                android:layout_alignParentLeft="true"
35
                android:text=""
28
                android:gravity="center_vertical"
29
                android:singleLine="true"
36
                android:textColor="@color/ui_62"
30
                android:textColor="@color/ui_62"
37
                android:textSize="15sp" />
31
                android:textSize="15sp"
32
                tools:text="走起" />
38
33
39
            <TextView
34
            <TextView
40
                android:id="@+id/tv_shareState"
35
                android:id="@+id/tv_shareState"
41
                android:layout_width="wrap_content"
36
                android:layout_width="wrap_content"
42
                android:layout_height="wrap_content"
37
                android:layout_height="wrap_content"
38
                android:layout_alignParentRight="true"
39
                android:layout_marginRight="16dp"
43
                android:gravity="center_vertical"
40
                android:gravity="center_vertical"
44
                android:text=""
45
                android:textColor="@color/title_row"
41
                android:textColor="@color/title_row"
46
                android:textSize="14sp"
42
                android:textSize="14sp"
47
                android:layout_marginRight="16dp"
48
                android:layout_alignParentRight="true" />
49
50
51
43
                tools:text="信息不完整" />
52
        </RelativeLayout>
44
        </RelativeLayout>
45
53
        <RelativeLayout
46
        <RelativeLayout
54
            android:id="@+id/shareAddress"
47
            android:id="@+id/shareAddress"
55
            android:layout_width="match_parent"
48
            android:layout_width="match_parent"
60
                android:id="@+id/tv_shareAddress"
53
                android:id="@+id/tv_shareAddress"
61
                android:layout_width="match_parent"
54
                android:layout_width="match_parent"
62
                android:layout_height="wrap_content"
55
                android:layout_height="wrap_content"
56
                android:layout_alignParentLeft="true"
57
                android:layout_alignParentTop="true"
58
                android:layout_marginLeft="16dp"
59
                android:layout_marginRight="16dp"
60
                android:ellipsize="end"
63
                android:gravity="center_vertical"
61
                android:gravity="center_vertical"
64
                android:text=""
62
                android:lines="2"
65
                android:textColor="@color/ui_65"
63
                android:textColor="@color/ui_65"
66
                android:textSize="14sp"
64
                android:textSize="14sp"
67
                android:singleLine="true"
68
                android:ellipsize="end"
69
                android:layout_marginLeft="16dp"
70
                android:layout_alignParentLeft="true"
71
                android:layout_alignParentTop="true"/>
72
73
74
65
                tools:text="北京市朝阳区八里庄街道住邦2000商务楼2号楼从南门入,上12楼右拐即可" />
75
        </RelativeLayout>
66
        </RelativeLayout>
76
67
77
        <LinearLayout
68
        <LinearLayout
78
            android:id="@+id/shareTime"
79
            android:layout_width="match_parent"
69
            android:layout_width="match_parent"
80
            android:layout_height="wrap_content"
70
            android:layout_height="wrap_content"
81
            android:gravity="center"
71
            android:layout_marginLeft="16dp"
82
            android:layout_marginTop="6dp"
72
            android:layout_marginTop="6dp"
73
            android:gravity="center_vertical"
83
            android:orientation="horizontal">
74
            android:orientation="horizontal">
84
75
85
            <TextView
86
                android:id="@+id/tv_shareTime"
87
                android:layout_width="match_parent"
76
            <LinearLayout
77
                android:layout_width="0dp"
88
                android:layout_height="wrap_content"
78
                android:layout_height="wrap_content"
89
                android:layout_marginLeft="16dp"
90
                android:gravity="center_vertical"
91
                android:textColor="@color/ui_68"
92
                android:textSize="14sp"
93
                android:text=""/>
94
            <TextView
95
                android:id="@+id/tv_id"
79
                android:layout_weight="1"
80
                android:orientation="vertical">
81
82
                <TextView
83
                    android:id="@+id/tv_shareTime"
84
                    android:layout_width="match_parent"
85
                    android:layout_height="wrap_content"
86
                    android:textColor="@color/ui_68"
87
                    android:textSize="14sp"
88
89
                    tools:text="2020-05-21 11:26:25" />
90
91
                <TextView
92
                    android:id="@+id/tv_reason"
93
                    android:layout_width="match_parent"
94
                    android:layout_height="wrap_content"
95
                    android:layout_marginTop="5dp"
96
                    android:textColor="#E02020"
97
                    android:textSize="12sp"
98
                    tools:text="原因:缺少站点图片,都是客服经理的说法框架克鲁赛德荆防颗粒的是的考虑是否就看了多少积分开了电视剧付款了大家是否考虑的设计费恐龙当家时空裂缝都是风景的考虑是否觉得卡死了" />
99
100
            </LinearLayout>
101
102
            <LinearLayout
103
                android:id="@+id/tv_edit"
96
                android:layout_width="wrap_content"
104
                android:layout_width="wrap_content"
97
                android:layout_height="wrap_content"
98
                android:visibility="gone"/>
99
105
                android:layout_height="match_parent"
106
                android:gravity="center_vertical"
107
                android:visibility="gone"
108
                tools:background="#ff0000"
109
                tools:visibility="visible">
110
111
                <TextView
112
                    android:layout_width="wrap_content"
113
                    android:layout_height="wrap_content"
114
                    android:layout_marginLeft="16dp"
115
                    android:layout_marginTop="10dp"
116
                    android:layout_marginRight="16dp"
117
                    android:layout_marginBottom="10dp"
118
                    android:background="@drawable/btn_edit_shape"
119
                    android:paddingLeft="10dp"
120
                    android:paddingTop="2dp"
121
                    android:paddingRight="10dp"
122
                    android:paddingBottom="2dp"
123
                    android:text="编辑"
124
                    android:textColor="#444444"
125
                    android:textSize="12sp" />
126
            </LinearLayout>
100
        </LinearLayout>
127
        </LinearLayout>
101
128
129
102
        <View
130
        <View
103
            android:layout_width="match_parent"
131
            android:layout_width="match_parent"
104
            android:layout_height="0.5dp"
132
            android:layout_height="0.5dp"
105
            android:layout_marginTop="14dp"
133
            android:layout_marginTop="14dp"
106
            android:background="@color/ui_line"/>
134
            android:background="@color/ui_line" />
107
135
108
    </LinearLayout>
136
    </LinearLayout>
109
137

+ 1 - 0
app/src/main/res/values/strings.xml

50
    <string name="title_activity_alter_two">AlterTwoActivity</string>
50
    <string name="title_activity_alter_two">AlterTwoActivity</string>
51
    <string name="title_activity_alter_three">AlterThreeActivity</string>
51
    <string name="title_activity_alter_three">AlterThreeActivity</string>
52
    <string name="title_activity_share_two">ShareTwoActivity</string>
52
    <string name="title_activity_share_two">ShareTwoActivity</string>
53
    <string name="title_activity_share_two_edit">ShareTwoEditActivity</string>
53
    <string name="title_activity_share_three">ShareThreeActivity</string>
54
    <string name="title_activity_share_three">ShareThreeActivity</string>
54
    <string name="title_activity_zhan_details_new">ZhanDetailsNew</string>
55
    <string name="title_activity_zhan_details_new">ZhanDetailsNew</string>
55
    <string name="title_activity_my_share">MyShareActivity</string>
56
    <string name="title_activity_my_share">MyShareActivity</string>

Update RoutePlanMapActivity.java · 988cf7a2ed - Gogs: Go Git Service
Selaa lähdekoodia

Update RoutePlanMapActivity.java

huyuguo 6 vuotta sitten
vanhempi
commit
988cf7a2ed

+ 4 - 75
app/src/main/java/com/electric/chargingpile/activity/RoutePlanMapActivity.java

@ -331,7 +331,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
331 331
        rela_paopao = (RelativeLayout) findViewById(R.id.rela_paopao);
332 332
        ll_share_ui = (LinearLayout) findViewById(R.id.ll_share_ui);
333 333
334
335 334
        iv_back = (ImageView) findViewById(R.id.iv_back);
336 335
        iv_back.setOnClickListener(this);
337 336
        tv_route_no1 = (TextView) findViewById(R.id.tv_route_no1);
@ -417,8 +416,7 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
417 416
            aMapNavi.addAMapNaviListener(this);
418 417
            aMapNavi.setUseInnerVoice(true);
419 418
            MyLocationStyle myLocationStyle = new MyLocationStyle();
420
            myLocationStyle.myLocationIcon(com.amap.api.maps.model.BitmapDescriptorFactory
421
                    .fromResource(R.drawable.point_icon));// 设置小蓝点的图标
419
            myLocationStyle.myLocationIcon(com.amap.api.maps.model.BitmapDescriptorFactory.fromResource(R.drawable.point_icon));// 设置小蓝点的图标
422 420
            amap.setMyLocationStyle(myLocationStyle);
423 421
            //获得地图的最大和最小缩放级别
424 422
            geocoderSearch = new GeocodeSearch(this);
@ -594,7 +592,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
594 592
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
595 593
            @Override
596 594
            public void onError(Call call, Exception e) {
597
598 595
            }
599 596
600 597
            @Override
@ -1015,42 +1012,34 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
1015 1012
1016 1013
    @Override
1017 1014
    public void notifyParallelRoad(int i) {
1018
1019 1015
    }
1020 1016
1021 1017
    @Override
1022 1018
    public void OnUpdateTrafficFacility(AMapNaviTrafficFacilityInfo[] aMapNaviTrafficFacilityInfos) {
1023
1024 1019
    }
1025 1020
1026 1021
    @Override
1027 1022
    public void updateAimlessModeStatistics(AimLessModeStat aimLessModeStat) {
1028
1029 1023
    }
1030 1024
1031 1025
    @Override
1032 1026
    public void updateAimlessModeCongestionInfo(AimLessModeCongestionInfo aimLessModeCongestionInfo) {
1033
1034 1027
    }
1035 1028
1036 1029
    @Override
1037 1030
    public void onPlayRing(int i) {
1038
1039 1031
    }
1040 1032
1041 1033
    @Override
1042 1034
    public void onCalculateRouteSuccess(AMapCalcRouteResult aMapCalcRouteResult) {
1043
1044 1035
    }
1045 1036
1046 1037
    @Override
1047 1038
    public void onCalculateRouteFailure(AMapCalcRouteResult aMapCalcRouteResult) {
1048
1049 1039
    }
1050 1040
1051 1041
    @Override
1052 1042
    public void onNaviRouteNotify(AMapNaviRouteNotifyData aMapNaviRouteNotifyData) {
1053
1054 1043
    }
1055 1044
1056 1045
@ -1475,11 +1464,8 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
1475 1464
                            ll = new LatLng(Double.parseDouble(list.get(i).getPoi_wei()), Double.parseDouble(list.get(i).getPoi_jing()));
1476 1465
                        } else if (position <= 13) {
1477 1466
                            double dwei = Double.parseDouble(list.get(i).getPoi_wei());
1478
//                System.out.print("wei:"+l.get(i).getPoi_wei());
1479 1467
                            double djing = Double.parseDouble(list.get(i).getPoi_jing());
1480
//                System.out.println("jing:"+l.get(i).getPoi_jing());
1481 1468
                            getGaode(djing, dwei);
1482
1483 1469
                            ll = new LatLng(Double.parseDouble(gd_wei), Double.parseDouble(gd_jing));
1484 1470
                        }
1485 1471
                        if (String.valueOf(list.get(i).getId()).equals(p1) && !list.get(i).getSuit_car().equals("宝马") && !list.get(i).getSuit_car().equals("特斯拉")) {
@ -1761,8 +1747,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
1761 1747
    //
1762 1748
    @Override
1763 1749
    public void onCameraChangeFinish(CameraPosition cameraPosition) {
1764
//        LogUtils.e(currentMarker);
1765
        LogUtils.e("onCameraChangeFinish");
1766 1750
        if (canRefreshMarker == true) {
1767 1751
            if (null != currentMarker) {
1768 1752
                resetPreviousMarker(currentMarker);
@ -2332,7 +2316,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2332 2316
        LatLng ll = new LatLng(Double.parseDouble(start_wei), Double.parseDouble(start_jing));
2333 2317
        float distance = AMapUtils.calculateLineDistance(new LatLng(ll.latitude
2334 2318
                , ll.longitude), marker.getPosition());
2335
//                                Toast.makeText(getApplicationContext(),Util.getDistance(d),Toast.LENGTH_SHORT).show();
2336 2319
        mInfoWindowDistance.setText(Util.getDistance(distance));
2337 2320
        //infowinow中站名称的显示
2338 2321
        TextView mInfoWindowName = infoWindow.findViewById(R.id.evsdk_tv_info_name);
@ -2358,7 +2341,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2358 2341
                routeTwo.clear();
2359 2342
                routeThree.clear();
2360 2343
                exchangeView(1);
2361
//                                    if (list_zhong.size() <= 3) {
2362 2344
                if (!zhan_id.equals(p1) && !zhan_id.equals(p2) && !zhan_id.equals(p3)) {
2363 2345
                    if (list_zhong.size() < 3) {
2364 2346
                        zhan = new Zhan();
@ -2372,13 +2354,9 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2372 2354
                        list_zhong.add(zhan);
2373 2355
                        Log.e("size===", list_zhong.size() + "");
2374 2356
                        if (list_zhong.size() > 0) {
2375
//                                                tv_navigation_route.setBackgroundResource(R.drawable.bg_route_btn_green);
2376
//                                                tv_save_route.setBackgroundResource(R.drawable.bg_route_btn_green);
2377 2357
                            canRoute = true;
2378 2358
                            canSave = true;
2379 2359
                        } else {
2380
//                                                tv_navigation_route.setBackgroundResource(R.drawable.bg_route_btn_grey);
2381
//                                                tv_save_route.setBackgroundResource(R.drawable.bg_route_btn_grey);
2382 2360
                            canRoute = false;
2383 2361
                            canSave = false;
2384 2362
                        }
@ -2422,13 +2400,9 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2422 2400
                            }
2423 2401
                        }
2424 2402
                        if (list_zhong.size() > 0) {
2425
//                                                tv_navigation_route.setBackgroundResource(R.drawable.bg_route_btn_green);
2426
//                                                tv_save_route.setBackgroundResource(R.drawable.bg_route_btn_green);
2427 2403
                            canRoute = true;
2428 2404
                            canSave = true;
2429 2405
                        } else {
2430
//                                                tv_navigation_route.setBackgroundResource(R.drawable.bg_route_btn_grey);
2431
//                                                tv_save_route.setBackgroundResource(R.drawable.bg_route_btn_grey);
2432 2406
                            canRoute = false;
2433 2407
                            canSave = false;
2434 2408
                        }
@ -2456,15 +2430,10 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2456 2430
                    }
2457 2431
                    if (strategyFlag >= 0) {
2458 2432
                        aMapNavi.calculateDriveRoute(startList, endList, zhongList, strategyFlag);
2459
//                                                Toast.makeText(getApplicationContext(), "策略:" + strategyFlag, Toast.LENGTH_LONG).show();
2460 2433
                    }
2461
//                                            aMapNavi.calculateDriveRoute(startList, endList, zhongList, PathPlanningStrategy.DRIVING_MULTIPLE_ROUTES);
2462 2434
                    dialog.show();
2463 2435
2464 2436
                }
2465
//                                    }else {
2466
//                                        Toast.makeText(getApplicationContext(),"您已经选择了三个途经点",Toast.LENGTH_SHORT).show();
2467
//                                    }
2468 2437
            }
2469 2438
        });
2470 2439
        LinearLayout mInfoWindow = infoWindow.findViewById(R.id.evsdk_rl_infowindow);
@ -2585,8 +2554,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2585 2554
    }
2586 2555
2587 2556
    private void getGaode(Double jing, Double wei) {
2588
//        Log.e("jing", jing + "");
2589
//        Log.e("wei", wei + "");
2590 2557
        double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
2591 2558
        double gg_lon;
2592 2559
        double gg_lat;
@ -2595,10 +2562,8 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2595 2562
        double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
2596 2563
        gg_lon = z * Math.cos(theta);
2597 2564
        gd_jing = String.valueOf(gg_lon);
2598
//        Log.e("gg_lon", gg_lon + "");
2599 2565
        gg_lat = z * Math.sin(theta);
2600 2566
        gd_wei = String.valueOf(gg_lat);
2601
//        Log.e("gg_lat", gg_lat + "");
2602 2567
    }
2603 2568
2604 2569
    private void showSimpleBottomSheetGrid() {
@ -2627,7 +2592,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2627 2592
                        }
2628 2593
                    }
2629 2594
                }).build();
2630
//        build.
2631 2595
        build.show();
2632 2596
        iv_screenShot.setEnabled(true);
2633 2597
    }
@ -2652,10 +2616,7 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2652 2616
                    return;
2653 2617
                }
2654 2618
                try {
2655
                    FileOutputStream fos = new FileOutputStream(
2656
                            Environment.getExternalStorageDirectory() + "/test_"
2657
                                    + sdf.format(new Date()) + ".png");
2658
                    boolean b = bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
2619
                    FileOutputStream fos = new FileOutputStream(Environment.getExternalStorageDirectory() + "/test_" + sdf.format(new Date()) + ".png");
2659 2620
                    try {
2660 2621
                        fos.flush();
2661 2622
                    } catch (IOException e) {
@ -2666,14 +2627,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2666 2627
                    } catch (IOException e) {
2667 2628
                        e.printStackTrace();
2668 2629
                    }
2669
                    StringBuffer buffer = new StringBuffer();
2670
                    if (b) {
2671
//                        buffer.append("截屏成功 ");
2672
2673
                    } else {
2674
//                        buffer.append("截屏失败 ");
2675
                    }
2676
2677 2630
2678 2631
                } catch (FileNotFoundException e) {
2679 2632
                    e.printStackTrace();
@ -2807,10 +2760,7 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2807 2760
        float scaleHeight = ((float) newHeight) / height;
2808 2761
        // 缩放图片动作
2809 2762
        matrix.postScale(scaleWidth, scaleHeight);
2810
        Bitmap bitmap = Bitmap.createBitmap(bgimage, 0, 0, (int) width,
2811
                (int) height, matrix, true);
2812
//        iv_2.setImageBitmap(bitmap);
2813
//        tv_2.setText(bitmap.getRowBytes() * bitmap.getHeight() + "");
2763
        Bitmap bitmap = Bitmap.createBitmap(bgimage, 0, 0, (int) width, (int) height, matrix, true);
2814 2764
        return bitmap;
2815 2765
    }
2816 2766
@ -2845,8 +2795,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2845 2795
            e.printStackTrace();
2846 2796
        }
2847 2797
        mBitmap.compress(Bitmap.CompressFormat.PNG, 100, fOut);
2848
        Log.e("!!!", "下载图片");
2849
//        Toast.makeText(RoutePlanMapActivity.this,"保存成功",Toast.LENGTH_SHORT).show();
2850 2798
        try {
2851 2799
            fOut.flush();
2852 2800
        } catch (IOException e) {
@ -2869,8 +2817,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2869 2817
        if (list != null && list.size() > 0) {
2870 2818
            if (amap == null)
2871 2819
                return;
2872
//            LatLngBounds bounds = LatLngBounds.builder().include(new LatLng(boundArray[1], boundArray[0])).include(new LatLng(boundArray[3], boundArray[2])).build();
2873
//            amap.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 10));
2874 2820
        }
2875 2821
    }
2876 2822
@ -2894,9 +2840,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2894 2840
        if (i == 1000) {
2895 2841
            if (result != null && result.getRegeocodeAddress() != null
2896 2842
                    && result.getRegeocodeAddress().getFormatAddress() != null) {
2897
//                tv_address.setText(result.getRegeocodeAddress().getFormatAddress());
2898
//                tv_name.setText("[当前位置]");
2899
//                rl_now.setClickable(true);
2900 2843
                pl = result.getRegeocodeAddress().getPois();
2901 2844
                if (tag.equals("start")) {
2902 2845
                    tv_start.setText(pl.get(0).getTitle());
@ -2905,12 +2848,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2905 2848
                    tv_end.setText(pl.get(0).getTitle());
2906 2849
                    save_end_name = pl.get(0).getTitle();
2907 2850
                }
2908
2909
//                adapter = new RouteSelectPointActivity.POIAdapter();
2910
//                list_poi.setAdapter(adapter);
2911
//                list_poi.setEnabled(true);
2912
2913
2914 2851
            }
2915 2852
        }
2916 2853
    }
@ -2926,7 +2863,7 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2926 2863
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
2927 2864
            @Override
2928 2865
            public void onError(Call call, Exception e) {
2929
2866
                e.printStackTrace();
2930 2867
            }
2931 2868
2932 2869
            @Override
@ -2967,7 +2904,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2967 2904
2968 2905
            @Override
2969 2906
            public void onResponse(String response) {
2970
//                Log.e(TAG, "onResponse: response="+response );
2971 2907
            }
2972 2908
        });
2973 2909
    }
@ -3037,13 +2973,7 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
3037 2973
3038 2974
            //必须告诉AMapNavi 你最后选择的哪条路
3039 2975
            aMapNavi.selectRouteId(routeIds[routeNum - 1]);
3040
//                Toast.makeText(this, "导航距离:" + (aMapNavi.getNaviPaths()).get(routeIds[0]).getAllLength() + "m" + "\n" + "导航时间:" + (aMapNavi.getNaviPaths()).get(routeIds[0]).getAllTime() + "s", Toast.LENGTH_SHORT).show();
3041
//                Toast.makeText(this, "导航时间:" + (aMapNavi.getNaviPaths()).get(routeIds[2]).getStrategy() + "z", Toast.LENGTH_SHORT).show();
3042 2976
            final List<NaviLatLng> nlll = (aMapNavi.getNaviPaths()).get(routeIds[routeNum - 1]).getCoordList();
3043
3044
//                Toast.makeText(this, (aMapNavi.getNaviPaths()).get(routeIds[2]).getStrategy(), Toast.LENGTH_SHORT).show();
3045
3046
3047 2977
            routeIndex++;
3048 2978
3049 2979
            chooseRouteSuccess = true;
@ -3065,7 +2995,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
3065 2995
        final zhan_list markerInfo = (zhan_list) bundle.getSerializable("info");
3066 2996
        View infoWindow = getLayoutInflater().inflate(R.layout.evsdk_layout_infowindow, null);
3067 2997
        getZhanInfo(String.valueOf(markerInfo.getId()), markerInfo, marker, infoWindow);
3068
//        routeShowPresenter.getSingleZhanInfo(String.valueOf(markerInfo.getId()), BaseConstants.DENZA_VERSION, infoWindow, marker);
3069 2998
        try {
3070 2999
            Thread.sleep(300);
3071 3000
        } catch (InterruptedException e) {