Pārlūkot izejas kodu

管理私人桩开发完成

huyuguo 4 gadi atpakaļ
vecāks
revīzija
89d6853213
22 mainītis faili ar 577 papildinājumiem un 556 dzēšanām
  1. 2 2
      app/src/main/AndroidManifest.xml
  2. 34 4
      app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
  3. 186 207
      app/src/main/java/com/electric/chargingpile/activity/PrivateZhuangInfoActivity.java
  4. 1 1
      app/src/main/java/com/electric/chargingpile/activity/ShareTwoActivity.java
  5. 5 0
      app/src/main/java/com/electric/chargingpile/activity/ShareTwoPictureActivity.java
  6. BIN
      app/src/main/res/drawable-hdpi/private_point_pic_1.png
  7. BIN
      app/src/main/res/drawable-hdpi/private_point_pic_2.png
  8. BIN
      app/src/main/res/drawable-hdpi/private_point_pic_3.png
  9. BIN
      app/src/main/res/drawable-mdpi/private_point_pic_1.png
  10. BIN
      app/src/main/res/drawable-mdpi/private_point_pic_2.png
  11. BIN
      app/src/main/res/drawable-mdpi/private_point_pic_3.png
  12. BIN
      app/src/main/res/drawable-xhdpi/private_point_pic_1.png
  13. BIN
      app/src/main/res/drawable-xhdpi/private_point_pic_2.png
  14. BIN
      app/src/main/res/drawable-xhdpi/private_point_pic_3.png
  15. BIN
      app/src/main/res/drawable-xxhdpi/private_point_pic_1.png
  16. BIN
      app/src/main/res/drawable-xxhdpi/private_point_pic_2.png
  17. BIN
      app/src/main/res/drawable-xxhdpi/private_point_pic_3.png
  18. BIN
      app/src/main/res/drawable-xxxhdpi/private_point_pic_1.png
  19. BIN
      app/src/main/res/drawable-xxxhdpi/private_point_pic_2.png
  20. BIN
      app/src/main/res/drawable-xxxhdpi/private_point_pic_3.png
  21. 34 11
      app/src/main/res/layout/activity_main_map.xml
  22. 315 331
      app/src/main/res/layout/activity_private_zhuang_info.xml

+ 2 - 2
app/src/main/AndroidManifest.xml

@ -2,8 +2,8 @@
2 2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    xmlns:tools="http://schemas.android.com/tools"
4 4
    package="com.electric.chargingpile"
5
    android:versionCode="88"
6
    android:versionName="3.5.0">
5
    android:versionCode="92"
6
    android:versionName="3.5.4">
7 7
    <uses-permission android:name="android.permission.BLUETOOTH" />
8 8
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
9 9

+ 34 - 4
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -366,8 +366,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
366 366
    public static zhan_list current_chargePoint;
367 367
    public static Marker nMarker;
368 368
    private boolean paoShow = false;
369
    private TextView windowName, windowGrade, windowCost, window_tv_fast_free_num,window_tv_fast_free_label,window_tv_fast_total_num,
370
            window_tv_slow_free_label,window_tv_slow_free_num,window_tv_slow_total_num, windowCommentNum, windowDistance, stopCost;
369
    private TextView windowName, windowGrade, windowCost, window_tv_fast_free_num, window_tv_fast_free_label, window_tv_fast_total_num,
370
            window_tv_slow_free_label, window_tv_slow_free_num, window_tv_slow_total_num, windowCommentNum, windowDistance, stopCost;
371 371
    private RelativeLayout windowGo, windowZhanDetails, windowComments;
372 372
    private ImageView windowAd, windowGradeImg;
373 373
    public static RelativeLayout windowLayout;
@ -486,8 +486,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
486 486
                                if (key.length - 1 > 2) {
487 487
                                    dialogup_other();
488 488
                                } else {
489
//                                    dialogup();
490
                                    dialogup_other();
489
                                    dialogup();
491 490
                                }
492 491
                            }
493 492
@ -763,6 +762,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
763 762
    private ConstraintLayout windowChat;
764 763
    private LatLng markerPosition;
765 764
    private ImageView second_hand_car;
765
    private LinearLayout private_telephone;
766 766
767 767
768 768
    @Override
@ -1230,6 +1230,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1230 1230
        stopCost = findViewById(R.id.window_tv_stop_cost);
1231 1231
        windowGrade = (TextView) findViewById(R.id.window_tv_zhan_grade);
1232 1232
        windowCost = (TextView) findViewById(R.id.window_tv_zhan_cost);
1233
        private_telephone = findViewById(R.id.private_telephone);
1233 1234
        window_tv_fast_free_num = (TextView) findViewById(R.id.window_tv_fast_free_num);
1234 1235
        window_tv_fast_free_label = findViewById(R.id.window_tv_fast_free_label);
1235 1236
        window_tv_fast_total_num = findViewById(R.id.window_tv_fast_total_num);
@ -5229,6 +5230,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
5229 5230
        final String poi_jing = JsonUtils.getKeyResult(info, "poi_jing");
5230 5231
        final String poi_wei = JsonUtils.getKeyResult(info, "poi_wei");
5231 5232
        final String fenshi_is = JsonUtils.getKeyResult(info, "fenshi_is");
5233
        final String telephone = JsonUtils.getKeyResult(info, "telephone");
5232 5234
5233 5235
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
5234 5236
        if ("1".equals(fenshi_is)) {
@ -5251,6 +5253,34 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
5251 5253
            fenshi_info_textview.setText("");
5252 5254
        }
5253 5255
5256
        if (belong_attribute!=null && belong_attribute.contains("私人")) {
5257
            private_telephone.setVisibility(View.VISIBLE);
5258
            private_telephone.setOnClickListener(new View.OnClickListener() {
5259
                @Override
5260
                public void onClick(View v) {
5261
                    new com.electric.chargingpile.view.AlertDialog(MainMapActivity.this).builder()
5262
                            .setMsg(zhan_name + "  " + telephone)
5263
                            .setPositiveButton("呼叫", new View.OnClickListener() {
5264
                                @Override
5265
                                public void onClick(View v) {
5266
                                    Intent intent = new Intent();
5267
                                    intent.setAction("android.intent.action.CALL");
5268
                                    intent.addCategory("android.intent.category.DEFAULT");
5269
                                    intent.setData(Uri.parse("tel:" + telephone));
5270
                                    startActivity(intent);
5271
                                }
5272
                            }).setNegativeButton("取消", new View.OnClickListener() {
5273
                        @Override
5274
                        public void onClick(View v) {
5275
5276
                        }
5277
                    }).show();
5278
                }
5279
            });
5280
        } else {
5281
            private_telephone.setVisibility(View.GONE);
5282
        }
5283
5254 5284
        // remind 0 正常 2 休息中 other 故障
5255 5285
        // own_pay 1 可支付
5256 5286

+ 186 - 207
app/src/main/java/com/electric/chargingpile/activity/PrivateZhuangInfoActivity.java

@ -13,6 +13,7 @@ import android.graphics.Color;
13 13
import android.graphics.Matrix;
14 14
import android.graphics.drawable.BitmapDrawable;
15 15
import android.graphics.drawable.ColorDrawable;
16
import android.graphics.drawable.Drawable;
16 17
import android.net.Uri;
17 18
import android.os.Bundle;
18 19
import android.os.Environment;
@ -46,6 +47,14 @@ import android.widget.TimePicker;
46 47
import android.widget.Toast;
47 48
import android.widget.ToggleButton;
48 49
50
import androidx.annotation.Nullable;
51
import androidx.constraintlayout.widget.ConstraintLayout;
52
53
import com.bumptech.glide.Glide;
54
import com.bumptech.glide.load.DataSource;
55
import com.bumptech.glide.load.engine.GlideException;
56
import com.bumptech.glide.request.RequestListener;
57
import com.bumptech.glide.request.target.Target;
49 58
import com.electric.chargingpile.R;
50 59
import com.electric.chargingpile.application.MainApplication;
51 60
import com.electric.chargingpile.data.Pic;
@ -54,6 +63,7 @@ import com.electric.chargingpile.data.Zhan;
54 63
import com.electric.chargingpile.util.BarColorUtil;
55 64
import com.electric.chargingpile.util.Bimp;
56 65
import com.electric.chargingpile.util.CheckMobileNum;
66
import com.electric.chargingpile.util.DensityUtil;
57 67
import com.electric.chargingpile.util.FileUtils;
58 68
import com.electric.chargingpile.util.ImageItem;
59 69
import com.electric.chargingpile.util.ImageUtils;
@ -164,8 +174,6 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
164 174
    private RadioButton rb_guo, rb_te, rb_shang, rb_xia;
165 175
    private RadioGroup rg_claimtype, rg_park;
166 176
    public static Bitmap bimap;
167
    private GridView noScrollgridview;
168
    private GridAdapter adapter;
169 177
    private View parentView;
170 178
    private PopupWindow pop = null;
171 179
    private LinearLayout ll_popup;
@ -178,25 +186,31 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
178 186
    private static final int RC_ALBUM_PERM = 123;
179 187
    public static final int REQUEST_CODE_CHOOSE = 341;
180 188
189
    private ArrayList<ImageView> takeImageViewList = new ArrayList<>();
190
    private ArrayList<ImageView> takeImageCameraList = new ArrayList<>();
191
    private ConstraintLayout take_image_0;
192
    private ConstraintLayout take_image_1;
193
    private ConstraintLayout take_image_2;
194
195
    public static ImageItem[] selectBitmap = new ImageItem[3];
196
    private int selectIndex = 0;
197
198
181 199
    private Handler handler = new Handler() {
182 200
        // 主线程通过这个方法处理消息
183 201
        @Override
184 202
        public void handleMessage(final Message msg) {
185 203
            switch (msg.what) {
186 204
                case 1:
187
                    Bundle bundle = msg.getData();
188
                    String id = bundle.getString("id");
189
                    Bitmap bitmap = (Bitmap) msg.obj;
190
                    Log.e("bitmap", bitmap + "");
191
                    Log.e("bitmap_id", id + "");
192
                    ImageItem mImageItem = new ImageItem();
193
                    mImageItem.setBitmap(bitmap);
194
                    try {
195
                        Bimp.tempSelectBitmap.add(Integer.parseInt(id), mImageItem);
196
                    } catch (Exception e) {
197
                        e.printStackTrace();
198
                    }
199
                    adapter.update();
205
                    int index = msg.arg1;
206
                    ImageView iv = takeImageViewList.get(index);
207
                    iv.setImageBitmap(selectBitmap[index].getBitmap());
208
                    iv.setScaleType(ImageView.ScaleType.CENTER_CROP);
209
                    ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) iv.getLayoutParams();
210
                    lp.width = DensityUtil.dip2px(PrivateZhuangInfoActivity.this, 108);
211
                    lp.height = DensityUtil.dip2px(PrivateZhuangInfoActivity.this, 70);
212
                    iv.setLayoutParams(lp);
213
                    takeImageCameraList.get(index).setVisibility(View.GONE);
200 214
                    break;
201 215
                case 2:
202 216
                    Toast.makeText(PrivateZhuangInfoActivity.this, "提交信息成功,感谢您的分享", Toast.LENGTH_SHORT).show();
@ -309,14 +323,10 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
309 323
        pop.setContentView(view);
310 324
311 325
        final RelativeLayout parent = (RelativeLayout) view.findViewById(R.id.parent);
312
        Button bt1 = (Button) view
313
                .findViewById(R.id.item_popupwindows_camera);
314
        Button bt2 = (Button) view
315
                .findViewById(R.id.item_popupwindows_Photo);
316
        Button bt3 = (Button) view
317
                .findViewById(R.id.item_popupwindows_cancel);
326
        Button bt1 = (Button) view.findViewById(R.id.item_popupwindows_camera);
327
        Button bt2 = (Button) view.findViewById(R.id.item_popupwindows_Photo);
328
        Button bt3 = (Button) view.findViewById(R.id.item_popupwindows_cancel);
318 329
        parent.setOnClickListener(new View.OnClickListener() {
319
320 330
            @Override
321 331
            public void onClick(View v) {
322 332
                // TODO Auto-generated method stub
@ -352,27 +362,28 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
352 362
            }
353 363
        });
354 364
355
        noScrollgridview = (GridView) findViewById(R.id.noScrollgridview);
356
        noScrollgridview.setSelector(new ColorDrawable(Color.TRANSPARENT));
357
        adapter = new GridAdapter(this);
358
        adapter.update();
359
        noScrollgridview.setAdapter(adapter);
365
        take_image_0 = findViewById(R.id.take_image_0);
366
        take_image_1 = findViewById(R.id.take_image_1);
367
        take_image_2 = findViewById(R.id.take_image_2);
360 368
361
        noScrollgridview.setOnItemClickListener(new OnItemClickListener() {
369
        take_image_0.setOnClickListener(this);
370
        take_image_1.setOnClickListener(this);
371
        take_image_2.setOnClickListener(this);
372
373
        ImageView take_image_view_0 = findViewById(R.id.take_image_view_0);
374
        ImageView take_image_view_1 = findViewById(R.id.take_image_view_1);
375
        ImageView take_image_view_2 = findViewById(R.id.take_image_view_2);
376
        takeImageViewList.add(take_image_view_0);
377
        takeImageViewList.add(take_image_view_1);
378
        takeImageViewList.add(take_image_view_2);
379
380
        ImageView take_image_camera_0 = findViewById(R.id.take_image_camera_0);
381
        ImageView take_image_camera_1 = findViewById(R.id.take_image_camera_1);
382
        ImageView take_image_camera_2 = findViewById(R.id.take_image_camera_2);
383
        takeImageCameraList.add(take_image_camera_0);
384
        takeImageCameraList.add(take_image_camera_1);
385
        takeImageCameraList.add(take_image_camera_2);
362 386
363
            public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
364
                                    long arg3) {
365
                if (arg2 == Bimp.tempSelectBitmap.size()) {
366
                    permissionTask();
367
                } else {
368
                    Intent intent = new Intent(PrivateZhuangInfoActivity.this,
369
                            GalleryPrivateActivity.class);
370
                    intent.putExtra("position", "1");
371
                    intent.putExtra("ID", arg2);
372
                    startActivity(intent);
373
                }
374
            }
375
        });
376 387
    }
377 388
378 389
    /**
@ -424,17 +435,18 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
424 435
            public void subscribe(ObservableEmitter<String> subscriber) {
425 436
                try {
426 437
                    List<Uri> uriList = Matisse.obtainResult(data);
427
                    for (Uri uri: uriList) {
428
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
429
                        File file = FileUtils.from(PrivateZhuangInfoActivity.this, uri);
430
431
                        bitmap = FileUtils.rotateIfRequired(file, bitmap);
432
                        bitmap = imageZoom(bitmap);
433
                        ImageItem takePhoto = new ImageItem();
434
                        takePhoto.setBitmap(bitmap);
435
                        Bimp.tempSelectBitmap.add(takePhoto);
436
                        subscriber.onNext("");
437
                    }
438
                    Uri uri = uriList.get(0);
439
                    Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
440
                    File file = FileUtils.from(PrivateZhuangInfoActivity.this, uri);
441
442
                    bitmap = FileUtils.rotateIfRequired(file, bitmap);
443
                    bitmap = imageZoom(bitmap);
444
445
                    ImageItem takePhoto = new ImageItem();
446
                    takePhoto.setBitmap(bitmap);
447
                    selectBitmap[selectIndex] = takePhoto;
448
449
                    subscriber.onNext("");
438 450
                    subscriber.onComplete();
439 451
                } catch (Exception e) {
440 452
                    e.printStackTrace();
@ -448,7 +460,10 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
448 460
                    @Override
449 461
                    public void onComplete() {
450 462
                        insertDialog.dismiss();
451
                        adapter.update();
463
                        Message msg = new Message();
464
                        msg.arg1 = selectIndex;
465
                        msg.what = 1;
466
                        handler.sendMessage(msg);
452 467
                    }
453 468
454 469
                    @Override
@ -585,32 +600,40 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
585 600
                rb_xia.setBackgroundResource(R.drawable.icon_xiaselected1105);
586 601
            }
587 602
            park = park_location;
588
            new Thread(new Runnable() {
589
590
                @Override
591
                public void run() {
592
                    List<Pic> listPic = JsonUtils.parseToObjectList(pic, Pic.class);
593
                    Log.e("pic===size", listPic.size() + "");
594
                    for (int i = 0; i < listPic.size(); i++) {
595
                        try {
596
                            bitmap = Bimp.revitionImageSize(MainApplication.url + "/zhannew/uploadfile/" + listPic.get(i).getUrl(), 300);
597
                            if (bitmap != null) {
598
                                Message mes = new Message();
599
                                mes.obj = bitmap;
600
                                Log.e("bitmap===", bitmap + "");
601
                                mes.what = 1;
602
                                Bundle bundle = new Bundle();
603
                                bundle.putString("id", String.valueOf(i));
604
                                mes.setData(bundle);
605
606
                                handler.sendMessage(mes);
603
            List<Pic> listPic = JsonUtils.parseToObjectList(pic, Pic.class);
604
            for (int i = 0; i < listPic.size(); i++) {
605
                String url = MainApplication.url + "/zhannew/uploadfile/" + listPic.get(i).getUrl();
606
                int finalI = i;
607
                Glide.with(this).load(url).listener(new RequestListener<Drawable>() {
608
                    @Override
609
                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
610
                        return false;
611
                    }
612
613
                    @Override
614
                    public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
615
                        takeImageCameraList.get(finalI).setVisibility(View.GONE);
616
                        ImageView iv = takeImageViewList.get(finalI);
617
                        iv.setScaleType(ImageView.ScaleType.CENTER_CROP);
618
                        ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) iv.getLayoutParams();
619
                        lp.width = DensityUtil.dip2px(PrivateZhuangInfoActivity.this, 108);
620
                        lp.height = DensityUtil.dip2px(PrivateZhuangInfoActivity.this, 70);
621
                        iv.setLayoutParams(lp);
622
                        new Handler().postDelayed(new Runnable() {
623
                            @Override
624
                            public void run() {
625
                                BitmapDrawable drawable = (BitmapDrawable) iv.getDrawable();
626
                                Bitmap bitmap = drawable.getBitmap();
627
                                ImageItem takePhoto = new ImageItem();
628
                                takePhoto.setBitmap(bitmap);
629
                                selectBitmap[finalI] = takePhoto;
607 630
                            }
608
                        } catch (IOException e) {
609
                            e.printStackTrace();
610
                        }
631
                        }, 500);// 0.5秒后,执行
632
                        return false;
611 633
                    }
612
                }
613
            }).start();
634
                }).into(takeImageViewList.get(i));
635
            }
636
614 637
        }
615 638
    }
616 639
@ -642,6 +665,39 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
642 665
    @Override
643 666
    public void onClick(View v) {
644 667
        switch (v.getId()) {
668
            case R.id.take_image_0:
669
                selectIndex = 0;
670
                if (selectBitmap[0] == null) {
671
                    permissionTask();
672
                } else {
673
                    Intent intent = new Intent(PrivateZhuangInfoActivity.this, ShareTwoPictureActivity.class);
674
                    intent.putExtra("selectIndex", selectIndex);
675
                    intent.putExtra("from", "private_zhuang_info");
676
                    startActivity(intent);
677
                }
678
                break;
679
            case R.id.take_image_1:
680
                selectIndex = 1;
681
                if (selectBitmap[1] == null) {
682
                    permissionTask();
683
                } else {
684
                    Intent intent = new Intent(PrivateZhuangInfoActivity.this, ShareTwoPictureActivity.class);
685
                    intent.putExtra("selectIndex", selectIndex);
686
                    intent.putExtra("from", "private_zhuang_info");
687
                    startActivity(intent);
688
                }
689
                break;
690
            case R.id.take_image_2:
691
                selectIndex = 2;
692
                if (selectBitmap[2] == null) {
693
                    permissionTask();
694
                } else {
695
                    Intent intent = new Intent(PrivateZhuangInfoActivity.this, ShareTwoPictureActivity.class);
696
                    intent.putExtra("selectIndex", selectIndex);
697
                    intent.putExtra("from", "private_zhuang_info");
698
                    startActivity(intent);
699
                }
700
                break;
645 701
            case R.id.ll_address:
646 702
                Intent intent = new Intent(PrivateZhuangInfoActivity.this, PrivateZhuangMapActivity.class);
647 703
                if (tag.equals("edit")) {
@ -730,7 +786,8 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
730 786
                break;
731 787
732 788
            case R.id.share_next:
733
                if (et_share_address.getText().toString().equals("")) {
789
                if (!checkPictureOk()) {
790
                } else if (et_share_address.getText().toString().equals("")) {
734 791
                    Toast.makeText(this, "请选择充电站地址", Toast.LENGTH_SHORT).show();
735 792
                } else if (zhanName.getText().toString().equals("")) {
736 793
                    Toast.makeText(this, "请填写名称", Toast.LENGTH_SHORT).show();
@ -748,8 +805,6 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
748 805
                    Toast.makeText(this, "请填写服务费", Toast.LENGTH_SHORT).show();
749 806
                } else if (costWay.getText().toString().equals("")) {
750 807
                    Toast.makeText(this, "请选择支付方式", Toast.LENGTH_SHORT).show();
751
                } else if (Bimp.tempSelectBitmap.size() == 0) {
752
                    Toast.makeText(this, "请上传图片", Toast.LENGTH_SHORT).show();
753 808
                } else {
754 809
                    if (fastNum.getText().toString().equals("") && !slowNum.getText().toString().equals("")) {
755 810
                        fastNum.setText("0");
@ -813,6 +868,27 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
813 868
        }
814 869
    }
815 870
871
    private boolean checkPictureOk() {
872
873
        if (selectBitmap[0] == null) {
874
            Toast.makeText(this, "请上传桩图片", Toast.LENGTH_SHORT).show();
875
            return false;
876
        }
877
878
        if (selectBitmap[1] == null) {
879
            Toast.makeText(this, "请上传车位图片", Toast.LENGTH_SHORT).show();
880
            return false;
881
        }
882
883
        if (selectBitmap[2] == null) {
884
            Toast.makeText(this, "请上桩全景图", Toast.LENGTH_SHORT).show();
885
            return false;
886
        }
887
888
889
        return true;
890
    }
891
816 892
817 893
    public boolean onKeyDown(int keyCode, KeyEvent event) {
818 894
        if (keyCode == KeyEvent.KEYCODE_BACK) {
@ -914,19 +990,18 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
914 990
        String token = String.valueOf(updatetime);
915 991
        Log.i("token---", token);
916 992
917
        for (int i = 0; i < Bimp.tempSelectBitmap.size(); i++) {
918
            try {
919
                bm = imageZoom(Bimp.tempSelectBitmap.get(i).getBitmap());
920
                file = bitmapToBase64(bm);
921
                par.put("file" + (i + 1), file);
922
                Log.i("file--------" + (i + 1), file);
923
                par.put("filename" + (i + 1), "androidapp.jpg");
924
            } catch (Exception e) {
925
                e.printStackTrace();
993
        for (int i = 0; i < selectBitmap.length; i++) {
994
            if (selectBitmap[i] != null) {
995
                try {
996
                    bm = imageZoom(selectBitmap[i].getBitmap());
997
                    file = bitmapToBase64(bm);
998
                    par.put("file" + (i + 1), file);
999
                    par.put("filename" + (i + 1), "androidapp.jpg");
1000
                } catch (Exception e) {
1001
                    e.printStackTrace();
1002
                }
926 1003
            }
927
928 1004
        }
929
//        String fast = fastNum
930 1005
931 1006
        par.put("zhan_name", zhanName.getText().toString());
932 1007
        par.put("zhan_address", et_share_address.getText().toString());
@ -936,8 +1011,6 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
936 1011
        par.put("poi_jing", jing);
937 1012
938 1013
        par.put("poi_wei", wei);
939
//        Log.e("poi_jing",jing);
940
//        Log.e("poi_wei",wei);
941 1014
        par.put("suit_car", suit_car2);
942 1015
        par.put("charge_cost", chargeCost.getText().toString());
943 1016
        par.put("charge_cost_way", costWay.getText().toString());
@ -957,11 +1030,7 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
957 1030
        }
958 1031
959 1032
        try {
960
            String u = UploadUtil.post(
961
                    MainApplication.url + "/zhannew/basic/web/index.php/applist/createpile",
962
                    par, null);
963
            System.err.println(u);
964
            // submit(u);
1033
            String u = UploadUtil.post(MainApplication.url + "/zhannew/basic/web/index.php/applist/createpile", par, null);
965 1034
            Message msg = new Message();
966 1035
            msg.obj = u;
967 1036
            msg.what = 2;
@ -1004,113 +1073,6 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
1004 1073
        );
1005 1074
    }
1006 1075
1007
    @SuppressLint("HandlerLeak")
1008
    public class GridAdapter extends BaseAdapter {
1009
        private LayoutInflater inflater;
1010
        private int selectedPosition = -1;
1011
        private boolean shape;
1012
1013
        public boolean isShape() {
1014
            return shape;
1015
        }
1016
1017
        public void setShape(boolean shape) {
1018
            this.shape = shape;
1019
        }
1020
1021
        public GridAdapter(Context context) {
1022
            inflater = LayoutInflater.from(context);
1023
        }
1024
1025
        public void update() {
1026
            loading();
1027
        }
1028
1029
        public int getCount() {
1030
            if (Bimp.tempSelectBitmap.size() == 3) {
1031
                return 3;
1032
            }
1033
            return (Bimp.tempSelectBitmap.size() + 1);
1034
        }
1035
1036
        public Object getItem(int arg0) {
1037
            return null;
1038
        }
1039
1040
        public long getItemId(int arg0) {
1041
            return 0;
1042
        }
1043
1044
        public void setSelectedPosition(int position) {
1045
            selectedPosition = position;
1046
        }
1047
1048
        public int getSelectedPosition() {
1049
            return selectedPosition;
1050
        }
1051
1052
        public View getView(int position, View convertView, ViewGroup parent) {
1053
            ViewHolder holder = null;
1054
            if (convertView == null) {
1055
                convertView = inflater.inflate(R.layout.item_published_grida,
1056
                        parent, false);
1057
                holder = new ViewHolder();
1058
                holder.image = (ImageView) convertView
1059
                        .findViewById(R.id.item_grida_image);
1060
                convertView.setTag(holder);
1061
            } else {
1062
                holder = (ViewHolder) convertView.getTag();
1063
            }
1064
1065
            if (position == Bimp.tempSelectBitmap.size()) {
1066
                holder.image.setImageBitmap(BitmapFactory.decodeResource(
1067
                        getResources(), R.drawable.icon_defaultadd1105));
1068
                if (position == 3) {
1069
                    holder.image.setVisibility(View.GONE);
1070
                }
1071
            } else {
1072
                holder.image.setImageBitmap(Bimp.tempSelectBitmap.get(position).getBitmap());
1073
            }
1074
1075
            return convertView;
1076
        }
1077
1078
        public class ViewHolder {
1079
            public ImageView image;
1080
        }
1081
1082
        Handler handler = new Handler() {
1083
            public void handleMessage(Message msg) {
1084
                switch (msg.what) {
1085
                    case 1:
1086
                        adapter.notifyDataSetChanged();
1087
                        break;
1088
                }
1089
                super.handleMessage(msg);
1090
            }
1091
        };
1092
1093
        public void loading() {
1094
            new Thread(new Runnable() {
1095
                public void run() {
1096
                    while (true) {
1097
                        if (Bimp.max == Bimp.tempSelectBitmap.size()) {
1098
                            Message message = new Message();
1099
                            message.what = 1;
1100
                            handler.sendMessage(message);
1101
                            break;
1102
                        } else {
1103
                            Bimp.max += 1;
1104
                            Message message = new Message();
1105
                            message.what = 1;
1106
                            handler.sendMessage(message);
1107
                        }
1108
                    }
1109
                }
1110
            }).start();
1111
        }
1112
    }
1113
1114 1076
    public String getString(String s) {
1115 1077
        String path = null;
1116 1078
        if (s == null)
@ -1122,7 +1084,6 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
1122 1084
    }
1123 1085
1124 1086
    protected void onRestart() {
1125
        adapter.update();
1126 1087
        super.onRestart();
1127 1088
    }
1128 1089
@ -1130,7 +1091,7 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
1130 1091
1131 1092
    public void photo() {
1132 1093
        if (hasSdcard()) {
1133
            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);//���������
1094
            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
1134 1095
            intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(tempFile));
1135 1096
            startActivityForResult(intent, PHOTO_REQUEST_CAMERA);
1136 1097
        }
@ -1303,6 +1264,24 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
1303 1264
    @Override
1304 1265
    protected void onResume() {
1305 1266
        super.onResume();
1267
1268
        for (int i = 0; i < selectBitmap.length; i++) {
1269
            ImageItem imageItem = selectBitmap[i];
1270
            if (imageItem == null) {
1271
                takeImageCameraList.get(i).setVisibility(View.VISIBLE);
1272
                ImageView takeImageView = takeImageViewList.get(i);
1273
                takeImageView.setImageResource(Res.getDrawableID("private_point_pic_" + (i + 1)));
1274
                takeImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
1275
1276
                ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) takeImageView.getLayoutParams();
1277
                lp.width = ViewGroup.LayoutParams.WRAP_CONTENT;
1278
                lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
1279
                takeImageView.setLayoutParams(lp);
1280
1281
            } else {
1282
                takeImageCameraList.get(i).setVisibility(View.GONE);
1283
            }
1284
        }
1306 1285
    }
1307 1286
1308 1287
    public Bitmap getHttpBitmap(String url) {

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/ShareTwoActivity.java

@ -197,9 +197,9 @@ public class ShareTwoActivity extends Activity implements View.OnClickListener,
197 197
                    ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) iv.getLayoutParams();
198 198
                    lp.width = DensityUtil.dip2px(ShareTwoActivity.this, 82);
199 199
                    lp.height = DensityUtil.dip2px(ShareTwoActivity.this, 70);
200
                    ;
201 200
                    iv.setLayoutParams(lp);
202 201
                    takeImageCameraList.get(index).setVisibility(View.GONE);
202
203 203
                    break;
204 204
                case 2:
205 205
                    Toast.makeText(ShareTwoActivity.this, "提交信息成功,感谢您的分享", Toast.LENGTH_SHORT).show();

+ 5 - 0
app/src/main/java/com/electric/chargingpile/activity/ShareTwoPictureActivity.java

@ -1,6 +1,7 @@
1 1
package com.electric.chargingpile.activity;
2 2
3 3
import androidx.appcompat.app.AppCompatActivity;
4
4 5
import android.os.Bundle;
5 6
import android.view.View;
6 7
import android.widget.ImageView;
@ -30,6 +31,8 @@ public class ShareTwoPictureActivity extends AppCompatActivity {
30 31
31 32
        if ("edit".equals(from)) {
32 33
            picture.setImageBitmap(ShareTwoEditActivity.selectBitmap[selectIndex].getBitmap());
34
        } else if ("private_zhuang_info".equals(from)) {
35
            picture.setImageBitmap(PrivateZhuangInfoActivity.selectBitmap[selectIndex].getBitmap());
33 36
        } else {
34 37
            picture.setImageBitmap(ShareTwoActivity.selectBitmap[selectIndex].getBitmap());
35 38
        }
@ -47,6 +50,8 @@ public class ShareTwoPictureActivity extends AppCompatActivity {
47 50
            public void onClick(View v) {
48 51
                if ("edit".equals(from)) {
49 52
                    ShareTwoEditActivity.selectBitmap[selectIndex] = null;
53
                } else if ("private_zhuang_info".equals(from)) {
54
                    PrivateZhuangInfoActivity.selectBitmap[selectIndex] = null;
50 55
                } else {
51 56
                    ShareTwoActivity.selectBitmap[selectIndex] = null;
52 57
                }

BIN
app/src/main/res/drawable-hdpi/private_point_pic_1.png


BIN
app/src/main/res/drawable-hdpi/private_point_pic_2.png


BIN
app/src/main/res/drawable-hdpi/private_point_pic_3.png


BIN
app/src/main/res/drawable-mdpi/private_point_pic_1.png


BIN
app/src/main/res/drawable-mdpi/private_point_pic_2.png


BIN
app/src/main/res/drawable-mdpi/private_point_pic_3.png


BIN
app/src/main/res/drawable-xhdpi/private_point_pic_1.png


BIN
app/src/main/res/drawable-xhdpi/private_point_pic_2.png


BIN
app/src/main/res/drawable-xhdpi/private_point_pic_3.png


BIN
app/src/main/res/drawable-xxhdpi/private_point_pic_1.png


BIN
app/src/main/res/drawable-xxhdpi/private_point_pic_2.png


BIN
app/src/main/res/drawable-xxhdpi/private_point_pic_3.png


BIN
app/src/main/res/drawable-xxxhdpi/private_point_pic_1.png


BIN
app/src/main/res/drawable-xxxhdpi/private_point_pic_2.png


BIN
app/src/main/res/drawable-xxxhdpi/private_point_pic_3.png


+ 34 - 11
app/src/main/res/layout/activity_main_map.xml

@ -1169,23 +1169,45 @@
1169 1169
                    tools:text="18:00开始 1.45元/度" />
1170 1170
            </LinearLayout>
1171 1171
1172
            <TextView
1173
                android:id="@+id/window_tv_zhan_cost"
1174
                android:layout_width="wrap_content"
1172
            <LinearLayout
1173
                android:layout_width="match_parent"
1175 1174
                android:layout_height="wrap_content"
1176
                android:layout_marginLeft="15dp"
1177
                android:layout_marginTop="20dp"
1178
                android:text=""
1179
                android:textColor="@color/ui_62"
1180
                android:textSize="14sp"
1181
                tools:text="可使用本APP扫码支付" />
1175
                android:orientation="horizontal">
1176
                <TextView
1177
                    android:id="@+id/window_tv_zhan_cost"
1178
                    android:layout_width="0dp"
1179
                    android:layout_weight="1"
1180
                    android:layout_height="wrap_content"
1181
                    android:layout_marginLeft="15dp"
1182
                    android:layout_marginBottom="5dp"
1183
                    android:layout_marginTop="20dp"
1184
                    android:text=""
1185
                    android:textColor="@color/ui_62"
1186
                    android:textSize="14sp"
1187
                    tools:text="可使用本APP扫码支付" />
1188
                <LinearLayout
1189
                    android:visibility="gone"
1190
                    tools:visibility="visible"
1191
                    android:id="@+id/private_telephone"
1192
                    android:layout_width="wrap_content"
1193
                    tools:background="#00ff00"
1194
                    android:layout_height="wrap_content">
1195
                    <ImageView
1196
                        android:layout_marginTop="20dp"
1197
                        android:layout_marginRight="15dp"
1198
                        android:layout_marginBottom="5dp"
1199
                        android:layout_marginLeft="15dp"
1200
                        android:layout_width="wrap_content"
1201
                        android:layout_height="wrap_content"
1202
                        android:src="@drawable/icon_detail_tel" />
1203
                </LinearLayout>
1204
            </LinearLayout>
1182 1205
1183 1206
            <TextView
1184 1207
                android:id="@+id/window_tv_stop_cost"
1185 1208
                android:layout_width="wrap_content"
1186 1209
                android:layout_height="wrap_content"
1187 1210
                android:layout_marginLeft="15dp"
1188
                android:layout_marginTop="5dp"
1189 1211
                android:layout_marginRight="15dp"
1190 1212
                android:ellipsize="end"
1191 1213
                android:maxLines="1"
@ -1300,6 +1322,7 @@
1300 1322
                            android:layout_gravity="center_vertical"
1301 1323
                            android:paddingRight="10dp"
1302 1324
                            android:src="@drawable/slow_icon" />
1325
1303 1326
                        <TextView
1304 1327
                            android:id="@+id/window_tv_slow_free_label"
1305 1328
                            android:layout_width="wrap_content"
@ -1618,7 +1641,7 @@
1618 1641
                android:layout_marginBottom="9dp"
1619 1642
                android:visibility="gone"
1620 1643
                tools:background="#ff0000"
1621
                tools:visibility="visible" />
1644
                tools:visibility="gone" />
1622 1645
1623 1646
            <ImageView
1624 1647
                android:id="@+id/iv_route"

+ 315 - 331
app/src/main/res/layout/activity_private_zhuang_info.xml

@ -1,19 +1,19 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<com.zhy.autolayout.AutoRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:app="http://schemas.android.com/apk/res-auto"
4
    android:id="@+id/claim"
3 5
    android:layout_width="match_parent"
4 6
    android:layout_height="match_parent"
5
    android:focusable="true"
6
    android:focusableInTouchMode="true"
7
    android:id="@+id/claim"
8 7
    android:background="@color/activity_bgcolor"
9
    >
8
    android:focusable="true"
9
    android:focusableInTouchMode="true">
10 10
11 11
    <com.zhy.autolayout.AutoRelativeLayout
12 12
        android:id="@+id/rl_title"
13 13
        android:layout_width="fill_parent"
14 14
        android:layout_height="130px"
15
        android:background="@color/title_background"
16
        android:layout_alignParentTop="true">
15
        android:layout_alignParentTop="true"
16
        android:background="@color/title_background">
17 17
18 18
        <ImageView
19 19
            android:id="@+id/iv_back"
@ -40,109 +40,102 @@
40 40
            android:layout_height="match_parent"
41 41
            android:layout_alignParentRight="true"
42 42
            android:layout_centerInParent="true"
43
            android:paddingRight="44px"
44 43
            android:gravity="center"
44
            android:paddingRight="44px"
45 45
            android:text="添加记录"
46
            android:textSize="15sp"
47 46
            android:textColor="@color/lvse"
48
            android:visibility="gone"/>
47
            android:textSize="15sp"
48
            android:visibility="gone" />
49 49
    </com.zhy.autolayout.AutoRelativeLayout>
50 50
51 51
    <View
52 52
        android:layout_width="match_parent"
53 53
        android:layout_height="0.5dp"
54 54
        android:background="@color/ui_titleline"
55
        android:visibility="gone"/>
55
        android:visibility="gone" />
56 56
57 57
    <RelativeLayout
58 58
        android:id="@+id/tv_notice"
59 59
        android:layout_width="match_parent"
60 60
        android:layout_height="38dp"
61
        android:orientation="horizontal"
62 61
        android:background="@drawable/bg_notice1105"
62
        android:orientation="horizontal"
63 63
        android:visibility="gone">
64
64 65
        <TextView
65 66
            android:layout_width="wrap_content"
66 67
            android:layout_height="wrap_content"
67
            android:text="轻点地图即可选取位置,添加未被收录的站点"
68
            android:textSize="14sp"
68
            android:layout_centerHorizontal="true"
69
            android:layout_centerVertical="true"
69 70
            android:layout_gravity="center_horizontal"
70
            android:textColor="#099234"
71 71
            android:drawableRight="@drawable/icon_close1105"
72 72
            android:drawablePadding="16dp"
73
            android:layout_centerVertical="true"
74
            android:layout_centerHorizontal="true" />
75
76
73
            android:text="轻点地图即可选取位置,添加未被收录的站点"
74
            android:textColor="#099234"
75
            android:textSize="14sp" />
77 76
    </RelativeLayout>
78 77
79
80 78
    <RelativeLayout
81 79
        android:layout_width="match_parent"
82 80
        android:layout_height="300dp"
83 81
        android:visibility="gone">
84 82
85
86 83
        <ImageView
84
            android:id="@+id/ib_location"
87 85
            android:layout_width="wrap_content"
88 86
            android:layout_height="wrap_content"
89
            android:id="@+id/ib_location"
90
            android:layout_marginBottom="32dp"
91
            android:background="@drawable/icon_location2_0"
92
            android:layout_marginLeft="8dp"
93
            android:layout_marginStart="8dp"
94
            android:layout_alignParentBottom="true"
87
            android:layout_alignParentStart="true"
95 88
            android:layout_alignParentLeft="true"
96
            android:layout_alignParentStart="true" />
89
            android:layout_alignParentBottom="true"
90
            android:layout_marginStart="8dp"
91
            android:layout_marginLeft="8dp"
92
            android:layout_marginBottom="32dp"
93
            android:background="@drawable/icon_location2_0" />
97 94
98 95
        <LinearLayout
99 96
            android:id="@+id/zoom_in_out"
100 97
            android:layout_width="wrap_content"
101 98
            android:layout_height="wrap_content"
102
            android:layout_marginRight="8dp"
103
            android:background="@color/transparent"
104
            android:orientation="vertical"
105 99
            android:layout_alignBottom="@+id/iv_point_again"
106
            android:layout_alignParentRight="true"
107 100
            android:layout_alignParentEnd="true"
101
            android:layout_alignParentRight="true"
108 102
            android:layout_alignParentBottom="true"
109 103
            android:layout_marginEnd="8dp"
110
            android:layout_marginBottom="32dp">
104
            android:layout_marginRight="8dp"
105
            android:layout_marginBottom="32dp"
106
            android:background="@color/transparent"
107
            android:orientation="vertical">
111 108
112 109
            <ImageView
113 110
                android:id="@+id/zoomin1"
114 111
                android:layout_width="wrap_content"
115 112
                android:layout_height="wrap_content"
116 113
                android:contentDescription="@null"
117
                android:src="@drawable/icon_jia2_0"/>
118
            <!--android:background="@color/white"-->
119
120
114
                android:src="@drawable/icon_jia2_0" />
121 115
122 116
            <ImageView
123 117
                android:id="@+id/zoomout1"
124 118
                android:layout_width="wrap_content"
125 119
                android:layout_height="wrap_content"
126 120
                android:contentDescription="@null"
127
                android:src="@drawable/icon_jian2_0"/>
128
            <!--android:background="@color/white"-->
121
                android:src="@drawable/icon_jian2_0" />
129 122
        </LinearLayout>
130 123
131
132 124
    </RelativeLayout>
125
133 126
    <View
134 127
        android:id="@+id/view_title"
135 128
        android:layout_width="match_parent"
136 129
        android:layout_height="0.5dp"
137
        android:background="@color/ui_titleline"
138
        android:layout_below="@+id/rl_title"/>
130
        android:layout_below="@+id/rl_title"
131
        android:background="@color/ui_titleline" />
139 132
140 133
141 134
    <ScrollView
142 135
        android:layout_width="match_parent"
143 136
        android:layout_height="match_parent"
144
        android:layout_below="@+id/view_title"
145
        android:layout_above="@+id/share_next">
137
        android:layout_above="@+id/share_next"
138
        android:layout_below="@+id/view_title">
146 139
147 140
        <com.zhy.autolayout.AutoLinearLayout
148 141
            android:layout_width="match_parent"
@ -150,44 +143,98 @@
150 143
            android:background="@color/white"
151 144
            android:orientation="vertical">
152 145
153
            <com.zhy.autolayout.AutoLinearLayout
154
                android:id="@+id/ll_add_photo"
146
            <LinearLayout
155 147
                android:layout_width="match_parent"
156
                android:layout_height="307px"
157
                android:orientation="vertical"
158
                android:visibility="visible"
159
                android:background="@color/bg_row">
160
                <TextView
161
                    android:layout_width="wrap_content"
148
                android:layout_height="wrap_content"
149
                android:padding="10dp">
150
151
                <androidx.constraintlayout.widget.ConstraintLayout
152
                    android:id="@+id/take_image_0"
153
                    android:layout_width="0dp"
162 154
                    android:layout_height="wrap_content"
163
                    android:textColor="@color/title_row"
164
                    android:text="请上传充电站照片"
165
                    android:textSize="16sp"
166
                    android:visibility="gone"
167
                    android:layout_marginTop="8dp"
168
                    android:layout_marginLeft="16dp"
169
                    android:layout_gravity="center_vertical"/>
170
                <!--<ImageView-->
171
                <!--android:id="@+id/iv_photo1"-->
172
                <!--android:layout_width="100dp"-->
173
                <!--android:padding="16dp"-->
174
                <!--android:layout_height="match_parent"-->
175
                <!--android:src="@drawable/addpic65"/>-->
176
                <GridView
177
                    android:id="@+id/noScrollgridview"
178
                    android:layout_width="match_parent"
155
                    android:layout_weight="1">
156
157
                    <ImageView
158
                        android:id="@+id/take_image_view_0"
159
                        android:layout_width="wrap_content"
160
                        android:layout_height="wrap_content"
161
                        android:layout_marginLeft="5dp"
162
                        android:layout_marginRight="5dp"
163
                        android:src="@drawable/private_point_pic_1"
164
                        app:layout_constraintBottom_toBottomOf="parent"
165
                        app:layout_constraintLeft_toLeftOf="parent"
166
                        app:layout_constraintRight_toRightOf="parent"
167
                        app:layout_constraintTop_toTopOf="parent" />
168
169
                    <ImageView
170
                        android:id="@+id/take_image_camera_0"
171
                        android:layout_width="wrap_content"
172
                        android:layout_height="wrap_content"
173
                        android:layout_marginTop="8dp"
174
                        android:layout_marginRight="8dp"
175
                        android:src="@drawable/camera_icon"
176
                        app:layout_constraintRight_toRightOf="@+id/take_image_view_0"
177
                        app:layout_constraintTop_toTopOf="@+id/take_image_view_0" />
178
                </androidx.constraintlayout.widget.ConstraintLayout>
179
180
                <androidx.constraintlayout.widget.ConstraintLayout
181
                    android:id="@+id/take_image_1"
182
                    android:layout_width="0dp"
179 183
                    android:layout_height="wrap_content"
180
                    android:layout_marginLeft="16dp"
181
                    android:layout_marginTop="14dp"
182
                    android:layout_marginBottom="14dp"
183
                    android:layout_marginRight="16dp"
184
                    android:horizontalSpacing="3dp"
185
                    android:numColumns="3"
186
                    android:scrollbars="none"
187
                    android:verticalSpacing="5dp" >
188
                </GridView>
184
                    android:layout_weight="1">
189 185
190
            </com.zhy.autolayout.AutoLinearLayout>
186
                    <ImageView
187
                        android:id="@+id/take_image_view_1"
188
                        android:layout_width="wrap_content"
189
                        android:layout_height="wrap_content"
190
                        android:layout_marginLeft="5dp"
191
                        android:layout_marginRight="5dp"
192
                        android:src="@drawable/private_point_pic_2"
193
                        app:layout_constraintBottom_toBottomOf="parent"
194
                        app:layout_constraintLeft_toLeftOf="parent"
195
                        app:layout_constraintRight_toRightOf="parent"
196
                        app:layout_constraintTop_toTopOf="parent" />
197
198
                    <ImageView
199
                        android:id="@+id/take_image_camera_1"
200
                        android:layout_width="wrap_content"
201
                        android:layout_height="wrap_content"
202
                        android:layout_marginTop="8dp"
203
                        android:layout_marginRight="8dp"
204
                        android:src="@drawable/camera_icon"
205
                        app:layout_constraintRight_toRightOf="@+id/take_image_view_1"
206
                        app:layout_constraintTop_toTopOf="@+id/take_image_view_1" />
207
                </androidx.constraintlayout.widget.ConstraintLayout>
208
209
                <androidx.constraintlayout.widget.ConstraintLayout
210
                    android:id="@+id/take_image_2"
211
                    android:layout_width="0dp"
212
                    android:layout_height="wrap_content"
213
                    android:layout_weight="1">
214
215
                    <ImageView
216
                        android:id="@+id/take_image_view_2"
217
                        android:layout_width="wrap_content"
218
                        android:layout_height="wrap_content"
219
                        android:layout_marginLeft="5dp"
220
                        android:layout_marginRight="5dp"
221
                        android:src="@drawable/private_point_pic_3"
222
                        app:layout_constraintBottom_toBottomOf="parent"
223
                        app:layout_constraintLeft_toLeftOf="parent"
224
                        app:layout_constraintRight_toRightOf="parent"
225
                        app:layout_constraintTop_toTopOf="parent" />
226
227
                    <ImageView
228
                        android:id="@+id/take_image_camera_2"
229
                        android:layout_width="wrap_content"
230
                        android:layout_height="wrap_content"
231
                        android:layout_marginTop="8dp"
232
                        android:layout_marginRight="8dp"
233
                        android:src="@drawable/camera_icon"
234
                        app:layout_constraintRight_toRightOf="@+id/take_image_view_2"
235
                        app:layout_constraintTop_toTopOf="@+id/take_image_view_2" />
236
                </androidx.constraintlayout.widget.ConstraintLayout>
237
            </LinearLayout>
191 238
192 239
            <View
193 240
                android:layout_width="match_parent"
@ -204,12 +251,12 @@
204 251
                <TextView
205 252
                    android:layout_width="wrap_content"
206 253
                    android:layout_height="wrap_content"
207
                    android:text="*"
208
                    android:textSize="15sp"
254
                    android:layout_centerInParent="true"
209 255
                    android:layout_marginLeft="44px"
210 256
                    android:layout_marginRight="8px"
211
                    android:layout_centerInParent="true"
212
                    android:textColor="@color/xinghao"/>
257
                    android:text="*"
258
                    android:textColor="@color/xinghao"
259
                    android:textSize="15sp" />
213 260
214 261
                <TextView
215 262
                    android:layout_width="wrap_content"
@ -223,13 +270,13 @@
223 270
                    android:layout_width="0dp"
224 271
                    android:layout_height="match_parent"
225 272
                    android:layout_marginLeft="10dp"
273
                    android:layout_marginRight="44px"
226 274
                    android:layout_weight="5"
227 275
                    android:background="@color/white"
228
                    android:layout_marginRight="44px"
229 276
                    android:editable="true"
230
                    android:singleLine="true"
231 277
                    android:gravity="center|right"
232 278
                    android:hint="请以地名或建筑命名"
279
                    android:singleLine="true"
233 280
                    android:text=""
234 281
                    android:textColor="@color/ui_62"
235 282
                    android:textColorHint="@color/ui_68"
@ -252,29 +299,29 @@
252 299
                android:orientation="horizontal">
253 300
254 301
                <TextView
302
                    android:id="@+id/textView25"
255 303
                    android:layout_width="wrap_content"
256 304
                    android:layout_height="wrap_content"
257
                    android:text="*"
258
                    android:textSize="15sp"
305
                    android:layout_alignParentStart="true"
306
                    android:layout_alignParentLeft="true"
307
                    android:layout_centerInParent="true"
259 308
                    android:layout_marginLeft="44px"
260 309
                    android:layout_marginRight="8px"
310
                    android:text="*"
261 311
                    android:textColor="@color/xinghao"
262
                    android:id="@+id/textView25"
263
                    android:layout_centerInParent="true"
264
                    android:layout_alignParentLeft="true"
265
                    android:layout_alignParentStart="true" />
312
                    android:textSize="15sp" />
266 313
267 314
                <TextView
268 315
                    android:id="@+id/address"
269 316
                    android:layout_width="wrap_content"
270 317
                    android:layout_height="match_parent"
318
                    android:layout_alignParentTop="true"
319
                    android:layout_toEndOf="@+id/textView25"
320
                    android:layout_toRightOf="@+id/textView25"
271 321
                    android:gravity="center"
272 322
                    android:text="站地址"
273 323
                    android:textColor="@color/ui_65"
274
                    android:textSize="15sp"
275
                    android:layout_alignParentTop="true"
276
                    android:layout_toRightOf="@+id/textView25"
277
                    android:layout_toEndOf="@+id/textView25" />
324
                    android:textSize="15sp" />
278 325
279 326
280 327
                <TextView
@ -282,24 +329,24 @@
282 329
                    style="?android:attr/textViewStyle"
283 330
                    android:layout_width="match_parent"
284 331
                    android:layout_height="match_parent"
332
                    android:layout_alignParentTop="true"
333
                    android:layout_alignParentEnd="true"
334
                    android:layout_alignParentRight="true"
335
                    android:layout_marginLeft="30px"
336
                    android:layout_marginEnd="16dp"
337
                    android:layout_marginRight="44px"
338
                    android:layout_toRightOf="@+id/address"
285 339
                    android:background="@null"
340
                    android:drawableRight="@drawable/icon_select"
341
                    android:drawablePadding="20px"
342
                    android:ellipsize="end"
286 343
                    android:gravity="center|right"
287 344
                    android:hint="请选择"
345
                    android:singleLine="true"
288 346
                    android:text=""
289
                    android:layout_toRightOf="@+id/address"
290
                    android:drawableRight="@drawable/icon_select"
291
                    android:drawablePadding="20px"
292
                    android:layout_marginRight="44px"
293
                    android:layout_marginLeft="30px"
294 347
                    android:textColor="@color/ui_62"
295 348
                    android:textColorHint="@color/ui_68"
296
                    android:textSize="15sp"
297
                    android:singleLine="true"
298
                    android:ellipsize="end"
299
                    android:layout_alignParentTop="true"
300
                    android:layout_alignParentRight="true"
301
                    android:layout_alignParentEnd="true"
302
                    android:layout_marginEnd="16dp" />
349
                    android:textSize="15sp" />
303 350
304 351
305 352
            </com.zhy.autolayout.AutoRelativeLayout>
@ -317,41 +364,41 @@
317 364
                android:background="@drawable/click_effect">
318 365
319 366
                <TextView
367
                    android:id="@+id/textView18"
320 368
                    android:layout_width="wrap_content"
321 369
                    android:layout_height="wrap_content"
322
                    android:text="*"
323
                    android:textColor="@color/xinghao"
324
                    android:id="@+id/textView18"
325
                    android:textSize="15sp"
326
                    android:layout_marginLeft="44px"
327
                    android:layout_marginRight="8px"
328 370
                    android:layout_alignTop="@+id/textView19"
329
                    android:layout_centerInParent="true"
371
                    android:layout_alignParentStart="true"
330 372
                    android:layout_alignParentLeft="true"
331
                    android:layout_alignParentStart="true" />
373
                    android:layout_centerInParent="true"
374
                    android:layout_marginLeft="44px"
375
                    android:layout_marginRight="8px"
376
                    android:text="*"
377
                    android:textColor="@color/xinghao"
378
                    android:textSize="15sp" />
332 379
333 380
                <TextView
381
                    android:id="@+id/textView19"
334 382
                    android:layout_width="wrap_content"
335 383
                    android:layout_height="wrap_content"
336
                    android:text="电桩类型"
337
                    android:layout_gravity="center"
338
                    android:textColor="@color/ui_65"
339
                    android:textSize="15sp"
340 384
                    android:layout_centerVertical="true"
341
                    android:layout_toRightOf="@+id/textView18"
385
                    android:layout_gravity="center"
342 386
                    android:layout_toEndOf="@+id/textView18"
343
                    android:id="@+id/textView19" />
387
                    android:layout_toRightOf="@+id/textView18"
388
                    android:text="电桩类型"
389
                    android:textColor="@color/ui_65"
390
                    android:textSize="15sp" />
344 391
345 392
                <RadioGroup
346 393
                    android:id="@+id/rg_claimtype"
347 394
                    android:layout_width="wrap_content"
348 395
                    android:layout_height="wrap_content"
349
                    android:orientation="horizontal"
350
                    android:layout_marginRight="16dp"
351
                    android:layout_centerVertical="true"
352
                    android:layout_alignParentRight="true"
353 396
                    android:layout_alignParentEnd="true"
354
                    android:layout_marginEnd="16dp">
397
                    android:layout_alignParentRight="true"
398
                    android:layout_centerVertical="true"
399
                    android:layout_marginEnd="16dp"
400
                    android:layout_marginRight="16dp"
401
                    android:orientation="horizontal">
355 402
356 403
                    <RadioButton
357 404
                        android:id="@+id/rb_guo"
@ -359,8 +406,7 @@
359 406
                        android:layout_height="wrap_content"
360 407
                        android:layout_marginLeft="44px"
361 408
                        android:background="@drawable/icon_guoselected1105"
362
                        android:button="@null"
363
                        />
409
                        android:button="@null" />
364 410
365 411
                    <RadioButton
366 412
                        android:id="@+id/rb_te"
@ -368,8 +414,7 @@
368 414
                        android:layout_height="wrap_content"
369 415
                        android:layout_marginLeft="44px"
370 416
                        android:background="@drawable/icon_tenormal1105"
371
                        android:button="@null"
372
                        />
417
                        android:button="@null" />
373 418
                </RadioGroup>
374 419
375 420
            </com.zhy.autolayout.AutoRelativeLayout>
@ -386,87 +431,88 @@
386 431
                android:background="@color/bg_row">
387 432
388 433
                <TextView
434
                    android:id="@+id/textView21"
389 435
                    android:layout_width="wrap_content"
390 436
                    android:layout_height="wrap_content"
391
                    android:text="*"
392
                    android:textColor="@color/xinghao"
393
                    android:id="@+id/textView21"
394 437
                    android:layout_alignTop="@+id/textView22"
395
                    android:layout_alignParentLeft="true"
396 438
                    android:layout_alignParentStart="true"
439
                    android:layout_alignParentLeft="true"
397 440
                    android:layout_centerInParent="true"
398
                    android:textSize="15sp"
399 441
                    android:layout_marginLeft="44px"
400
                    android:layout_marginRight="8px" />
442
                    android:layout_marginRight="8px"
443
                    android:text="*"
444
                    android:textColor="@color/xinghao"
445
                    android:textSize="15sp" />
401 446
402 447
                <TextView
448
                    android:id="@+id/textView22"
403 449
                    android:layout_width="wrap_content"
404 450
                    android:layout_height="wrap_content"
405
                    android:text="数量"
406
                    android:textColor="@color/ui_65"
407
                    android:textSize="15sp"
408
                    android:id="@+id/textView22"
409 451
                    android:layout_alignTop="@+id/imageView3"
452
                    android:layout_toEndOf="@+id/textView21"
410 453
                    android:layout_toRightOf="@+id/textView21"
411
                    android:layout_toEndOf="@+id/textView21" />
454
                    android:text="数量"
455
                    android:textColor="@color/ui_65"
456
                    android:textSize="15sp" />
457
412 458
                <ImageView
459
                    android:id="@+id/imageView3"
413 460
                    android:layout_width="wrap_content"
414 461
                    android:layout_height="wrap_content"
415
                    android:src="@drawable/icon_kuai1105"
462
                    android:layout_alignTop="@+id/imageView2"
416 463
                    android:layout_gravity="center"
417
                    android:id="@+id/imageView3"
418 464
                    android:layout_marginRight="20px"
419
                    android:layout_alignTop="@+id/imageView2"
465
                    android:layout_toStartOf="@+id/et_fastNum"
420 466
                    android:layout_toLeftOf="@+id/et_fastNum"
421
                    android:layout_toStartOf="@+id/et_fastNum" />
467
                    android:src="@drawable/icon_kuai1105" />
422 468
423 469
                <EditText
424 470
                    android:id="@+id/et_fastNum"
425 471
                    android:layout_width="wrap_content"
426 472
                    android:layout_height="match_parent"
473
                    android:layout_alignParentTop="true"
474
                    android:layout_marginRight="44px"
475
                    android:layout_toStartOf="@+id/imageView2"
476
                    android:layout_toLeftOf="@+id/imageView2"
427 477
                    android:layout_weight="1"
428
                    android:inputType="number"
429 478
                    android:background="@color/white"
430 479
                    android:editable="true"
431 480
                    android:gravity="center"
432 481
                    android:hint="桩数"
482
                    android:inputType="number"
433 483
                    android:text=""
434 484
                    android:textColor="@color/ui_62"
435 485
                    android:textColorHint="@color/ui_68"
436
                    android:textSize="15sp"
437
                    android:layout_marginRight="44px"
438
                    android:layout_alignParentTop="true"
439
                    android:layout_toLeftOf="@+id/imageView2"
440
                    android:layout_toStartOf="@+id/imageView2" />
486
                    android:textSize="15sp" />
441 487
442 488
                <ImageView
489
                    android:id="@+id/imageView2"
443 490
                    android:layout_width="wrap_content"
444 491
                    android:layout_height="wrap_content"
445
                    android:src="@drawable/icon_man1105"
446
                    android:layout_gravity="center"
447 492
                    android:layout_centerVertical="true"
493
                    android:layout_gravity="center"
448 494
                    android:layout_marginRight="20px"
449 495
                    android:layout_toLeftOf="@+id/et_slowNum"
450
                    android:id="@+id/imageView2" />
496
                    android:src="@drawable/icon_man1105" />
451 497
452 498
                <EditText
453 499
                    android:id="@+id/et_slowNum"
454 500
                    android:layout_width="wrap_content"
455 501
                    android:layout_height="match_parent"
502
                    android:layout_alignParentTop="true"
503
                    android:layout_alignParentEnd="true"
504
                    android:layout_alignParentRight="true"
505
                    android:layout_marginRight="44px"
456 506
                    android:layout_weight="1"
457
                    android:inputType="number"
458 507
                    android:background="@color/white"
459 508
                    android:editable="true"
460 509
                    android:gravity="center"
461 510
                    android:hint="桩数"
511
                    android:inputType="number"
462 512
                    android:text=""
463 513
                    android:textColor="@color/ui_62"
464 514
                    android:textColorHint="@color/ui_68"
465
                    android:textSize="15sp"
466
                    android:layout_alignParentTop="true"
467
                    android:layout_alignParentRight="true"
468
                    android:layout_marginRight="44px"
469
                    android:layout_alignParentEnd="true" />
515
                    android:textSize="15sp" />
470 516
471 517
            </com.zhy.autolayout.AutoRelativeLayout>
472 518
@ -488,18 +534,18 @@
488 534
            <com.zhy.autolayout.AutoLinearLayout
489 535
                android:layout_width="match_parent"
490 536
                android:layout_height="139px"
491
                android:gravity="center"
492
                android:background="@color/bg_row">
537
                android:background="@color/bg_row"
538
                android:gravity="center">
493 539
494 540
                <TextView
495 541
                    android:layout_width="wrap_content"
496 542
                    android:layout_height="wrap_content"
497
                    android:text="*"
498
                    android:textSize="15sp"
543
                    android:layout_centerInParent="true"
499 544
                    android:layout_marginLeft="44px"
500 545
                    android:layout_marginRight="8px"
501
                    android:layout_centerInParent="true"
502
                    android:textColor="@color/xinghao"/>
546
                    android:text="*"
547
                    android:textColor="@color/xinghao"
548
                    android:textSize="15sp" />
503 549
504 550
                <TextView
505 551
                    android:layout_width="wrap_content"
@ -514,21 +560,21 @@
514 560
                    android:layout_width="0dp"
515 561
                    android:layout_height="match_parent"
516 562
                    android:layout_marginLeft="20px"
517
                    android:layout_weight="5"
518 563
                    android:layout_marginRight="44px"
564
                    android:layout_weight="5"
519 565
                    android:background="@color/white"
520 566
                    android:editable="true"
521 567
                    android:gravity="center|right"
522
                    android:inputType="text"
523 568
                    android:hint="如:0.87元/度"
569
                    android:inputType="text"
524 570
                    android:text=""
525 571
                    android:textColor="@color/ui_62"
526 572
                    android:textColorHint="@color/ui_68"
527 573
                    android:textSize="15sp" />
528 574
529 575
530
531 576
            </com.zhy.autolayout.AutoLinearLayout>
577
532 578
            <View
533 579
                android:layout_width="match_parent"
534 580
                android:layout_height="0.5dp"
@ -543,46 +589,46 @@
543 589
                android:visibility="visible">
544 590
545 591
                <TextView
592
                    android:id="@+id/textView23"
546 593
                    android:layout_width="wrap_content"
547 594
                    android:layout_height="wrap_content"
548
                    android:text="*"
549
                    android:textSize="15sp"
595
                    android:layout_alignParentStart="true"
596
                    android:layout_alignParentLeft="true"
597
                    android:layout_centerInParent="true"
550 598
                    android:layout_marginLeft="44px"
551 599
                    android:layout_marginRight="8px"
600
                    android:text="*"
552 601
                    android:textColor="@color/xinghao"
553
                    android:id="@+id/textView23"
554
                    android:layout_centerInParent="true"
555
                    android:layout_alignParentLeft="true"
556
                    android:layout_alignParentStart="true" />
602
                    android:textSize="15sp" />
557 603
558 604
                <TextView
559 605
                    android:layout_width="wrap_content"
560 606
                    android:layout_height="wrap_content"
561
                    android:text="服务费"
562
                    android:textColor="@color/ui_65"
563
                    android:textSize="15sp"
564 607
                    android:layout_alignTop="@+id/textView23"
608
                    android:layout_toEndOf="@+id/textView23"
565 609
                    android:layout_toRightOf="@+id/textView23"
566
                    android:layout_toEndOf="@+id/textView23" />
610
                    android:text="服务费"
611
                    android:textColor="@color/ui_65"
612
                    android:textSize="15sp" />
567 613
568 614
                <EditText
569 615
                    android:id="@+id/et_serviceCost"
570 616
                    style="?android:attr/textViewStyle"
571
                    android:background="@null"
572 617
                    android:layout_width="wrap_content"
573 618
                    android:layout_height="match_parent"
619
                    android:layout_alignParentEnd="true"
620
                    android:layout_alignParentRight="true"
621
                    android:layout_centerVertical="true"
622
                    android:layout_marginRight="44px"
623
                    android:background="@null"
574 624
                    android:contentDescription="@null"
575 625
                    android:gravity="center|right"
626
                    android:hint="如:0.8元/度"
627
                    android:inputType="text"
576 628
                    android:text=""
577 629
                    android:textColor="@color/ui_62"
578 630
                    android:textColorHint="@color/ui_68"
579
                    android:inputType="text"
580
                    android:hint="如:0.8元/度"
581
                    android:textSize="15sp"
582
                    android:layout_alignParentRight="true"
583
                    android:layout_centerVertical="true"
584
                    android:layout_marginRight="44px"
585
                    android:layout_alignParentEnd="true"/>
631
                    android:textSize="15sp" />
586 632
            </com.zhy.autolayout.AutoRelativeLayout>
587 633
588 634
            <View
@ -590,23 +636,23 @@
590 636
                android:layout_height="0.5dp"
591 637
                android:layout_marginLeft="44px"
592 638
                android:background="@color/ui_line"
593
                android:visibility="visible"/>
639
                android:visibility="visible" />
594 640
595 641
            <com.zhy.autolayout.AutoLinearLayout
596 642
                android:layout_width="match_parent"
597 643
                android:layout_height="139px"
598
                android:gravity="center"
599
                android:background="@color/bg_row">
644
                android:background="@color/bg_row"
645
                android:gravity="center">
600 646
601 647
                <TextView
602 648
                    android:layout_width="wrap_content"
603 649
                    android:layout_height="wrap_content"
604
                    android:text="*"
605
                    android:textSize="15sp"
650
                    android:layout_centerInParent="true"
606 651
                    android:layout_marginLeft="44px"
607 652
                    android:layout_marginRight="8px"
653
                    android:text="*"
608 654
                    android:textColor="@color/xinghao"
609
                    android:layout_centerInParent="true"/>
655
                    android:textSize="15sp" />
610 656
611 657
                <TextView
612 658
                    android:layout_width="wrap_content"
@ -621,21 +667,21 @@
621 667
                    android:layout_width="0dp"
622 668
                    android:layout_height="match_parent"
623 669
                    android:layout_marginLeft="20px"
624
                    android:layout_weight="5"
625 670
                    android:layout_marginRight="44px"
671
                    android:layout_weight="5"
626 672
                    android:background="@color/white"
627 673
                    android:editable="true"
628 674
                    android:gravity="center|right"
629
                    android:inputType="text"
630 675
                    android:hint="如:5元/时"
676
                    android:inputType="text"
631 677
                    android:text=""
632 678
                    android:textColor="@color/ui_62"
633 679
                    android:textColorHint="@color/ui_68"
634 680
                    android:textSize="15sp" />
635 681
636 682
637
638 683
            </com.zhy.autolayout.AutoLinearLayout>
684
639 685
            <View
640 686
                android:layout_width="match_parent"
641 687
                android:layout_height="0.5dp"
@ -643,8 +689,6 @@
643 689
                android:background="@color/ui_line" />
644 690
645 691
646
647
648 692
            <com.zhy.autolayout.AutoRelativeLayout
649 693
                android:id="@+id/ll_select_cost_type"
650 694
                android:layout_width="match_parent"
@ -652,57 +696,57 @@
652 696
                android:background="@color/bg_row">
653 697
654 698
                <TextView
699
                    android:id="@+id/textView20"
655 700
                    android:layout_width="wrap_content"
656 701
                    android:layout_height="wrap_content"
657
                    android:text="*"
658
                    android:textColor="@color/xinghao"
659
                    android:id="@+id/textView20"
660 702
                    android:layout_alignTop="@+id/textView17"
661
                    android:layout_alignParentLeft="true"
662 703
                    android:layout_alignParentStart="true"
704
                    android:layout_alignParentLeft="true"
663 705
                    android:layout_centerInParent="true"
664
                    android:textSize="15sp"
665 706
                    android:layout_marginLeft="44px"
666
                    android:layout_marginRight="8px"/>
707
                    android:layout_marginRight="8px"
708
                    android:text="*"
709
                    android:textColor="@color/xinghao"
710
                    android:textSize="15sp" />
667 711
668 712
                <TextView
713
                    android:id="@+id/textView17"
669 714
                    android:layout_width="wrap_content"
670 715
                    android:layout_height="wrap_content"
671
                    android:text="支付方式"
672
                    android:textColor="@color/ui_65"
673
                    android:textSize="15sp"
674
                    android:id="@+id/textView17"
675 716
                    android:layout_centerVertical="true"
717
                    android:layout_toEndOf="@+id/textView20"
676 718
                    android:layout_toRightOf="@+id/textView20"
677
                    android:layout_toEndOf="@+id/textView20" />
719
                    android:text="支付方式"
720
                    android:textColor="@color/ui_65"
721
                    android:textSize="15sp" />
678 722
679 723
680 724
                <TextView
681 725
                    android:id="@+id/tv_costtype"
682 726
                    android:layout_width="wrap_content"
683 727
                    android:layout_height="match_parent"
728
                    android:layout_centerVertical="true"
729
                    android:layout_marginRight="20px"
730
                    android:layout_toLeftOf="@+id/imageView4"
684 731
                    android:background="@color/white"
685 732
                    android:editable="true"
686
                    android:text=""
687
                    android:hint="请选择支付方式"
688 733
                    android:gravity="center|right"
689
                    android:textColorHint="@color/ui_68"
690
                    android:textColor="@color/ui_62"
691
                    android:layout_marginRight="20px"
734
                    android:hint="请选择支付方式"
692 735
                    android:paddingLeft="300px"
693
                    android:textSize="15sp"
694
                    android:layout_centerVertical="true"
695
                    android:layout_toLeftOf="@+id/imageView4" />
736
                    android:text=""
737
                    android:textColor="@color/ui_62"
738
                    android:textColorHint="@color/ui_68"
739
                    android:textSize="15sp" />
696 740
697 741
                <ImageView
742
                    android:id="@+id/imageView4"
698 743
                    android:layout_width="wrap_content"
699 744
                    android:layout_height="wrap_content"
700
                    android:src="@drawable/icon_select"
701
                    android:id="@+id/imageView4"
702
                    android:layout_marginRight="44px"
703
                    android:layout_centerVertical="true"
745
                    android:layout_alignParentEnd="true"
704 746
                    android:layout_alignParentRight="true"
705
                    android:layout_alignParentEnd="true" />
747
                    android:layout_centerVertical="true"
748
                    android:layout_marginRight="44px"
749
                    android:src="@drawable/icon_select" />
706 750
707 751
708 752
            </com.zhy.autolayout.AutoRelativeLayout>
@ -725,18 +769,18 @@
725 769
            <com.zhy.autolayout.AutoLinearLayout
726 770
                android:layout_width="match_parent"
727 771
                android:layout_height="139px"
728
                android:gravity="center"
729
                android:background="@color/bg_row">
772
                android:background="@color/bg_row"
773
                android:gravity="center">
730 774
731 775
                <TextView
732 776
                    android:layout_width="wrap_content"
733 777
                    android:layout_height="wrap_content"
734
                    android:text="*"
735
                    android:textSize="15sp"
778
                    android:layout_centerInParent="true"
736 779
                    android:layout_marginLeft="44px"
737 780
                    android:layout_marginRight="8px"
738
                    android:layout_centerInParent="true"
739
                    android:textColor="@color/xinghao"/>
781
                    android:text="*"
782
                    android:textColor="@color/xinghao"
783
                    android:textSize="15sp" />
740 784
741 785
                <TextView
742 786
                    android:layout_width="wrap_content"
@ -751,21 +795,21 @@
751 795
                    android:layout_width="0dp"
752 796
                    android:layout_height="match_parent"
753 797
                    android:layout_marginLeft="20px"
754
                    android:layout_weight="5"
755 798
                    android:layout_marginRight="44px"
799
                    android:layout_weight="5"
756 800
                    android:background="@color/white"
757 801
                    android:editable="true"
758 802
                    android:gravity="center|right"
759
                    android:inputType="text"
760 803
                    android:hint="请输入手机号码"
804
                    android:inputType="text"
761 805
                    android:text=""
762 806
                    android:textColor="@color/ui_62"
763 807
                    android:textColorHint="@color/ui_68"
764 808
                    android:textSize="15sp" />
765 809
766 810
767
768 811
            </com.zhy.autolayout.AutoLinearLayout>
812
769 813
            <View
770 814
                android:layout_width="match_parent"
771 815
                android:layout_height="0.5dp"
@ -779,39 +823,39 @@
779 823
                android:background="@color/white">
780 824
781 825
                <TextView
826
                    android:id="@+id/textView24"
782 827
                    android:layout_width="wrap_content"
783 828
                    android:layout_height="wrap_content"
784
                    android:text="*"
785
                    android:textSize="15sp"
829
                    android:layout_alignParentStart="true"
830
                    android:layout_alignParentLeft="true"
831
                    android:layout_centerInParent="true"
786 832
                    android:layout_marginLeft="44px"
787 833
                    android:layout_marginRight="8px"
834
                    android:text="*"
788 835
                    android:textColor="@color/xinghao"
789
                    android:id="@+id/textView24"
790
                    android:layout_centerInParent="true"
791
                    android:layout_alignParentLeft="true"
792
                    android:layout_alignParentStart="true" />
836
                    android:textSize="15sp" />
793 837
794 838
                <TextView
839
                    android:id="@+id/textView13"
795 840
                    android:layout_width="wrap_content"
796 841
                    android:layout_height="wrap_content"
797
                    android:text="停车场地"
798
                    android:textColor="@color/ui_65"
799
                    android:textSize="15sp"
800
                    android:id="@+id/textView13"
801 842
                    android:layout_alignTop="@+id/textView24"
843
                    android:layout_toEndOf="@+id/textView24"
802 844
                    android:layout_toRightOf="@+id/textView24"
803
                    android:layout_toEndOf="@+id/textView24" />
845
                    android:text="停车场地"
846
                    android:textColor="@color/ui_65"
847
                    android:textSize="15sp" />
804 848
805 849
                <RadioGroup
806 850
                    android:id="@+id/rg_park"
807 851
                    android:layout_width="wrap_content"
808 852
                    android:layout_height="wrap_content"
809
                    android:orientation="horizontal"
810
                    android:layout_marginRight="44px"
811
                    android:layout_centerVertical="true"
812
                    android:layout_alignParentRight="true"
813 853
                    android:layout_alignParentEnd="true"
814
                    android:layout_marginEnd="44px">
854
                    android:layout_alignParentRight="true"
855
                    android:layout_centerVertical="true"
856
                    android:layout_marginEnd="44px"
857
                    android:layout_marginRight="44px"
858
                    android:orientation="horizontal">
815 859
816 860
                    <RadioButton
817 861
                        android:id="@+id/rb_shang"
@ -819,8 +863,7 @@
819 863
                        android:layout_height="wrap_content"
820 864
                        android:layout_marginLeft="44px"
821 865
                        android:background="@drawable/icon_shangselected1105"
822
                        android:button="@null"
823
                        />
866
                        android:button="@null" />
824 867
825 868
                    <RadioButton
826 869
                        android:id="@+id/rb_xia"
@ -828,8 +871,7 @@
828 871
                        android:layout_height="wrap_content"
829 872
                        android:layout_marginLeft="44px"
830 873
                        android:background="@drawable/icon_xianormal1105"
831
                        android:button="@null"
832
                        />
874
                        android:button="@null" />
833 875
                </RadioGroup>
834 876
835 877
            </com.zhy.autolayout.AutoRelativeLayout>
@ -838,7 +880,7 @@
838 880
                android:layout_width="fill_parent"
839 881
                android:layout_height="0.5dp"
840 882
                android:layout_marginLeft="44px"
841
                android:background="@color/ui_line"/>
883
                android:background="@color/ui_line" />
842 884
843 885
            <com.zhy.autolayout.AutoLinearLayout
844 886
                android:id="@+id/rl_prefect_time"
@ -849,75 +891,75 @@
849 891
                <TextView
850 892
                    android:id="@+id/tv_prefect_time"
851 893
                    android:layout_width="0dp"
852
                    android:layout_weight="1.5"
853 894
                    android:layout_height="wrap_content"
854 895
                    android:layout_alignParentLeft="true"
855 896
                    android:layout_centerVertical="true"
897
                    android:layout_weight="1.5"
856 898
                    android:paddingLeft="44px"
857 899
                    android:text="开放时间"
858 900
                    android:textColor="@color/ui_65"
859
                    android:textSize="15sp"/>
901
                    android:textSize="15sp" />
860 902
861 903
                <TextView
862 904
                    android:id="@+id/tv_prefect_start_time"
863 905
                    android:layout_width="wrap_content"
864 906
                    android:layout_height="match_parent"
907
                    android:layout_centerVertical="true"
908
                    android:layout_toEndOf="@+id/tv_prefect_time"
909
                    android:layout_toRightOf="@+id/tv_prefect_time"
865 910
                    android:gravity="center"
866 911
                    android:hint="00:00"
912
                    android:paddingLeft="44px"
913
                    android:paddingRight="20px"
867 914
                    android:text=""
868 915
                    android:textColor="@color/ui_62"
869 916
                    android:textColorHint="@color/ui_68"
870
                    android:textSize="15sp"
871
                    android:paddingRight="20px"
872
                    android:paddingLeft="44px"
873
                    android:layout_centerVertical="true"
874
                    android:layout_toRightOf="@+id/tv_prefect_time"
875
                    android:layout_toEndOf="@+id/tv_prefect_time"/>
917
                    android:textSize="15sp" />
876 918
877 919
                <ImageView
878 920
                    android:layout_width="wrap_content"
879 921
                    android:layout_height="match_parent"
880 922
                    android:layout_centerVertical="true"
923
                    android:layout_toEndOf="@id/tv_prefect_time"
881 924
                    android:layout_toRightOf="@id/tv_prefect_start_time"
882
                    android:src="@drawable/icon_zhi2_0"
883
                    android:layout_toEndOf="@id/tv_prefect_time"/>
925
                    android:src="@drawable/icon_zhi2_0" />
884 926
885 927
                <TextView
886 928
                    android:id="@+id/tv_ferfect_time"
887 929
                    android:layout_width="wrap_content"
888 930
                    android:layout_height="match_parent"
889
                    android:gravity="center"
931
                    android:layout_alignParentEnd="true"
932
                    android:layout_alignParentRight="true"
933
                    android:layout_centerVertical="true"
890 934
                    android:contentDescription="@null"
935
                    android:gravity="center"
891 936
                    android:hint="24:00"
937
                    android:paddingLeft="20px"
938
                    android:paddingRight="44px"
892 939
                    android:text=""
893 940
                    android:textColor="@color/ui_62"
894 941
                    android:textColorHint="@color/ui_68"
895
                    android:textSize="15sp"
896
                    android:paddingRight="44px"
897
                    android:paddingLeft="20px"
898
                    android:layout_alignParentRight="true"
899
                    android:layout_centerVertical="true"
900 942
901
                    android:layout_alignParentEnd="true"/>
943
                    android:textSize="15sp" />
902 944
            </com.zhy.autolayout.AutoLinearLayout>
903 945
904 946
            <View
905 947
                android:layout_width="fill_parent"
906 948
                android:layout_height="0.5dp"
907 949
                android:layout_marginLeft="44px"
908
                android:background="@color/ui_line"/>
950
                android:background="@color/ui_line" />
909 951
910 952
            <EditText
911 953
                android:id="@+id/et_remarkclaim"
912 954
                android:layout_width="match_parent"
913 955
                android:layout_height="wrap_content"
914
                android:hint="备注说明"
956
                android:background="@color/white"
915 957
                android:gravity="left|top"
958
                android:hint="备注说明"
916 959
                android:paddingLeft="44px"
917
                android:paddingRight="44px"
918 960
                android:paddingTop="48px"
961
                android:paddingRight="44px"
919 962
                android:paddingBottom="50px"
920
                android:background="@color/white"
921 963
                android:textColor="@color/ui_62"
922 964
                android:textColorHint="@color/ui_68"
923 965
                android:textSize="15sp" />
@ -925,68 +967,13 @@
925 967
            <View
926 968
                android:layout_width="fill_parent"
927 969
                android:layout_height="0.5dp"
928
                android:background="@color/ui_line"/>
970
                android:background="@color/ui_line" />
929 971
930 972
            <View
931 973
                android:layout_width="match_parent"
932 974
                android:layout_height="44px"
933 975
                android:background="@color/activity_bgcolor" />
934
935
            <!--<LinearLayout-->
936
            <!--android:id="@+id/ll_cost"-->
937
            <!--android:layout_width="match_parent"-->
938
            <!--android:layout_height="0dp"-->
939
            <!--android:layout_weight="1"-->
940
            <!--android:background="@drawable/click_effect">-->
941
942
            <!--<TextView-->
943
            <!--android:layout_width="wrap_content"-->
944
            <!--android:layout_height="wrap_content"-->
945
            <!--android:layout_marginLeft="10dp"-->
946
            <!--android:text="支付方式"-->
947
            <!--android:textColor="@color/title_row"-->
948
            <!--android:textSize="16sp" />-->
949
950
            <!--<TextView-->
951
            <!--android:id="@+id/tv_costWay"-->
952
            <!--android:layout_width="0dp"-->
953
            <!--android:layout_height="match_parent"-->
954
            <!--android:layout_marginLeft="10dp"-->
955
            <!--android:layout_weight="5"-->
956
            <!--android:gravity="right|center"-->
957
            <!--android:hint="请选择充电桩类型"-->
958
            <!--android:textColor="@color/hintColor"-->
959
            <!--android:textColorHint="@color/hintColor"-->
960
            <!--android:textSize="15sp" />-->
961
962
            <!--<ImageView-->
963
            <!--android:layout_width="0dp"-->
964
            <!--android:layout_height="wrap_content"-->
965
            <!--android:layout_gravity="center"-->
966
            <!--android:layout_weight="0.7"-->
967
            <!--android:padding="8dp"-->
968
            <!--android:src="@drawable/grey_right" />-->
969
            <!--</LinearLayout>-->
970
971
            <!--<View-->
972
            <!--android:layout_width="match_parent"-->
973
            <!--android:layout_height="0.5dp"-->
974
            <!--android:layout_marginLeft="15dp"-->
975
            <!--android:layout_marginRight="15dp"-->
976
            <!--android:background="@color/in_line" />-->
977
978
979
980
981
982
983
984
            <!--<View-->
985
            <!--android:layout_width="match_parent"-->
986
            <!--android:layout_height="0.5dp"-->
987
            <!--android:background="@color/lineColor"/>-->
988 976
        </com.zhy.autolayout.AutoLinearLayout>
989
990 977
    </ScrollView>
991 978
992 979
    <TextView
@ -994,14 +981,11 @@
994 981
        android:layout_width="match_parent"
995 982
        android:layout_height="127px"
996 983
        android:layout_alignParentBottom="true"
997
        android:background="@color/lvse"
998 984
        android:layout_gravity="center"
985
        android:background="@color/lvse"
999 986
        android:gravity="center"
1000 987
        android:text="立即提交"
1001 988
        android:textColor="@color/white"
1002 989
        android:textSize="15sp" />
1003 990
1004
1005
1006
1007 991
</com.zhy.autolayout.AutoRelativeLayout>