From 08a542f5ec6a36d3f5a60317f0ba2ce4280e715a Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Mon, 15 Aug 2022 15:57:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   4 +-
 .../activity/AutoTakePictureActivity.java     |   2 +-
 .../outdoor/activity/PicturesActivity.java    |  18 +--
 .../fragment/ChargingStationFragment.java     |   2 +-
 .../navinfo/outdoor/fragment/PoiFragment.java |   2 +-
 .../outdoor/fragment/RoadFragment.java        | 105 ++++++++++--------
 .../outdoor/fragment/TreasureFragment.java    |   4 +-
 .../drawable-hdpi/locaiton_auto_pictures.png  | Bin 0 -> 5548 bytes
 app/src/main/res/layout/activity_pictures.xml |   3 +-
 9 files changed, 77 insertions(+), 63 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/locaiton_auto_pictures.png

diff --git a/app/build.gradle b/app/build.gradle
index 5b2618b..072a42c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.navinfo.outdoor"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 25
-        versionName "8.220812"
+        versionCode 26
+        versionName "8.220815"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
index 090f2e9..c23d3c7 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
@@ -1085,7 +1085,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
     }
 
     private Bitmap getBitMap() {
-        Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.location_north_fill);
+        Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.locaiton_auto_pictures);
         int width = bitmap.getWidth();
         int height = bitmap.getHeight();
         int newWidth = 55;
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
index 55684ab..64bec43 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
@@ -235,10 +235,12 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
             ivPicVideoImage.setVisibility(View.VISIBLE);
             ivPicRoadImage.setVisibility(View.GONE);
             radioPicture = 3;
-        } else if (type == 4) {//道路2秒
+            radioBtnAutoSec.setChecked(true);
+        } else if (type == 4) {//道路1秒2张
             ivPicRoadImage.setVisibility(View.VISIBLE);
             ivPicVideoImage.setVisibility(View.GONE);
-            radioPicture = 3;
+            radioPicture = 4;
+            radioBtnHalfSec.setChecked(true);
         }
         radioGroupPicture.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
@@ -282,7 +284,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
         ivLocation.setOnClickListener(this);
         camera = findViewById(R.id.camera);
         CameraOptions cameraOptions = camera.getCameraOptions();
-        camera.setPreviewFrameRate(FRAMENESS);
         camera.setSnapshotMaxWidth(1920);
         camera.setSnapshotMaxHeight(1440);
         camera.setOnClickListener(this);
@@ -621,8 +622,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                 break;
             case R.id.btn_switch:
                 picturesBuilder.append(TimestampUtil.time()).append(",").append("onClick 点击了切换按钮 ,");
-                v.setEnabled(false);
-                handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
                 benSwitch();
                 break;
             case R.id.iv_zoom_add://放大
@@ -752,6 +751,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
         super.onResume();
         camera.open();
         tvMapView.onResume();
+        camera.setPreviewFrameRate(FRAMENESS);
     }
 
     /**
@@ -1110,9 +1110,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
 
     // 设置当前界面亮度
     private void setWindowBrightness(int brightness) {
-        Window window = getWindow();
-        WindowManager.LayoutParams lp = window.getAttributes();
-        lp.screenBrightness = brightness / 255.0f;
-        window.setAttributes(lp);
+//        Window window = getWindow();
+//        WindowManager.LayoutParams lp = window.getAttributes();
+//        lp.screenBrightness = brightness / 255.0f;
+//        window.setAttributes(lp);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
index 8ec29dd..ddc0e5c 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
@@ -783,7 +783,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 if (getPhoneBean.getCode() == 200) {
                     String code = getPhoneBean.getBody().getCode();
                     Integer telLength = getPhoneBean.getBody().getTelLength();
-                    if (!Constant.CODE.equals(code)) {
+                    if (code!=null&&!Constant.CODE.equals(code)) {
                         DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
                         MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                             @Override
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
index 4759e34..8a08217 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -615,7 +615,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 if (getPhoneBean.getCode() == 200) {
                     String code = getPhoneBean.getBody().getCode();
                     Integer telLength = getPhoneBean.getBody().getTelLength();
-                    if (!Constant.CODE.equals(code)) {
+                    if (code!=null&&!Constant.CODE.equals(code)) {
                         DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
                         MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                             @Override
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
index bd952db..e229f41 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
@@ -514,52 +514,65 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 }
 
                 // 设置亮度和摄像机刷新率
-                CustomDialog.show((AppCompatActivity) getActivity(), R.layout.camera_setting_pre, new CustomDialog.OnBindView() {
-                    @Override
-                    public void onBind(CustomDialog dialog, View v) {
-                        SharedPreferences sharedPreferences = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE);
-                        int brightness = sharedPreferences.getInt("brightness", 40);
-                        EditText edtBrightness = v.findViewById(R.id.edt_camera_setting_brightness);
-                        edtBrightness.setText(brightness+"");
-
-                        int framness = sharedPreferences.getInt("framness", 30);
-                        EditText edtFramness = v.findViewById(R.id.edt_camera_setting_framness);
-                        edtFramness.setText(framness+"");
-
-                        Button btnConfirm = v.findViewById(R.id.btn_camera_setting_confirm);
-                        btnConfirm.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                SharedPreferences.Editor editor = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE).edit();
-                                if (!edtBrightness.getText().toString().isEmpty()) {
-                                    int b = Integer.parseInt(edtBrightness.getText().toString());
-                                    editor.putInt("brightness", b);
-                                }
-                                if (!edtFramness.getText().toString().isEmpty()) {
-                                    int f = Integer.parseInt(edtFramness.getText().toString());
-                                    editor.putInt("framness", f);
-                                }
-                                editor.commit();
-                                Toast.makeText(getActivity(), "设置完成", Toast.LENGTH_SHORT).show();
-
-                                Intent intent = new Intent(getContext(), PicturesActivity.class);
-                                File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath());
-                                intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath());
-                                intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType());
-                                intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt());
-                                intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail());
-                                int gpsRssi = Constant.currentLocation.getGPSRssi();
-                                if (gpsRssi == 0) {
-                                    intent.putExtra(Constant.INTENT_BOOLEAN, false);
-                                } else {
-                                    intent.putExtra(Constant.INTENT_BOOLEAN, true);
-                                }
-                                startActivityForResult(intent, 0x101);
-                                dialog.doDismiss();
-                            }
-                        });
-                    }
-                }).setFullScreen(true);
+//                CustomDialog.show((AppCompatActivity) getActivity(), R.layout.camera_setting_pre, new CustomDialog.OnBindView() {
+//                    @Override
+//                    public void onBind(CustomDialog dialog, View v) {
+//                        SharedPreferences sharedPreferences = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE);
+//                        int brightness = sharedPreferences.getInt("brightness", 40);
+//                        EditText edtBrightness = v.findViewById(R.id.edt_camera_setting_brightness);
+//                        edtBrightness.setText(brightness+"");
+//
+//                        int framness = sharedPreferences.getInt("framness", 30);
+//                        EditText edtFramness = v.findViewById(R.id.edt_camera_setting_framness);
+//                        edtFramness.setText(framness+"");
+//
+//                        Button btnConfirm = v.findViewById(R.id.btn_camera_setting_confirm);
+//                        btnConfirm.setOnClickListener(new View.OnClickListener() {
+//                            @Override
+//                            public void onClick(View v) {
+//                                SharedPreferences.Editor editor = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE).edit();
+//                                if (!edtBrightness.getText().toString().isEmpty()) {
+//                                    int b = Integer.parseInt(edtBrightness.getText().toString());
+//                                    editor.putInt("brightness", b);
+//                                }
+//                                if (!edtFramness.getText().toString().isEmpty()) {
+//                                    int f = Integer.parseInt(edtFramness.getText().toString());
+//                                    editor.putInt("framness", f);
+//                                }
+//                                editor.commit();
+//                                Toast.makeText(getActivity(), "设置完成", Toast.LENGTH_SHORT).show();
+//
+//                                Intent intent = new Intent(getContext(), PicturesActivity.class);
+//                                File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath());
+//                                intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath());
+//                                intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType());
+//                                intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt());
+//                                intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail());
+//                                int gpsRssi = Constant.currentLocation.getGPSRssi();
+//                                if (gpsRssi == 0) {
+//                                    intent.putExtra(Constant.INTENT_BOOLEAN, false);
+//                                } else {
+//                                    intent.putExtra(Constant.INTENT_BOOLEAN, true);
+//                                }
+//                                startActivityForResult(intent, 0x101);
+//                                dialog.doDismiss();
+//                            }
+//                        });
+//                    }
+//                }).setFullScreen(true);
+                Intent intent = new Intent(getContext(), PicturesActivity.class);
+                File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath());
+                intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath());
+                intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType());
+                intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt());
+                intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail());
+                int gpsRssi = Constant.currentLocation.getGPSRssi();
+                if (gpsRssi == 0) {
+                    intent.putExtra(Constant.INTENT_BOOLEAN, false);
+                } else {
+                    intent.putExtra(Constant.INTENT_BOOLEAN, true);
+                }
+                startActivityForResult(intent, 0x101);
                 break;
             case R.id.road_upload:
                 roadBuilder.append(TimestampUtil.time()).append(",").append("点击了上传的按钮 ,");
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index e3b7582..a02ca76 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -302,8 +302,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
         });
 
         imgAutoMatchRoad = findViewById(R.id.iv_auto_match_road);
-        // 如果当前用户的level为1或2，自动采集功能才会开放
-        if (Constant.LEVEL == 1||Constant.LEVEL==2) {
+        // 如果当前用户的level为1或2、3，自动采集功能才会开放
+        if (Constant.LEVEL == 1||Constant.LEVEL==2||Constant.LEVEL==3) {
             imgAutoMatchRoad.setVisibility(View.VISIBLE);
         }
         imgAutoMatchRoad.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/drawable-hdpi/locaiton_auto_pictures.png b/app/src/main/res/drawable-hdpi/locaiton_auto_pictures.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d5a6af43c27e966dbdc42425e7670e7ce746d6
GIT binary patch
literal 5548
zcmb_gcTkhTxBU`AlOjb_Ks2<VAWd4R28h%E(joNTqzFbj1Sx`a>4c(Er1v6Kq>BUu
z1nEryAxN*%UVii5%=`Pzyg$BgXYQHZoqPA5vpXm1sirc`HI{1t0MMwaAa#gi|9?IT
zGUC77s3M0rfV^~+6@ZGNJL>?zWUq>p*Yh#|n@yF@^{c7x${oM;aEhBNEX-(Zyd}M2
zo*Pc_JeD&|aXFRl=O<Vg`{v6-wdrcJw&+2bEQ;sRP|rwCc7`~0xMv(REW0Adtg!Sa
zcNpVyhrf0k_%Sc|b6m#OMstAv;nBX&-C>c1v*4?RtBWA?LJ7rQ0)#6>m=XF_i6H^f
ztBC*-$Ji-jlCS_rpCSVt;y1Mlc%C7_fzG{2RbP!5(0SxIRoDoD{2u~0SPp35RRqKx
zicWdXYg20VOd#a@T|<#@#unf}oc9)=E#J5Sgf6_--C<A}_cA7;K3t(e$Mp%IZF^pi
zdQJ|z3>>3vYPE55vO8E<p?3v?Rq9T!f{!!JKV{0ljs<sq68~AHbY*sT1O~+-aaWGV
zuSLA%+F3Add**ywYR8PVIp#Yx;3FMZc|hCpTz^g`6zjF%5H9@F(TIwvD$SV+90~r_
zi1E6OI3h7%iLhC}HmP1u3gTMc{dv%2VeQx$m`r28neA@$Icn0nWQGb#AOE=!Cn3C(
zBK&OD8a~lZZ-T=3gSa|(AB)$1`jSt7x$kpRG);WV3?0O)fGc+6$0FfD(k3#jgA1&~
z;Lx&GT>&LWk@0fU1d2X)LilH(?h<m-T=b619EEFPb3MQ?a^fNzPGXd2QTHQfPBEtU
zRc>RQ!Ohc5EU@g7RUWM`vdV^>Y^%T4{?miErLMui;535>Ib`xX^KWD{s-~?9I6Xi8
z^C(T(9`F3HtU;I4MOq61tjlyYFm0li$e~i@Z3>s~m-IB<DwPbpiOY^Uy}G;MIv2p!
zQ75i$csow40MBAPZ$&KiYfyuU`52y)`9!q^bJds=Cy}*RFz;M2pbiE{ru~pAD&APV
zfIM5%cy(7eYtP_+5t#|<4X?%@?_@Wt1L|VrXV$X!F0vg}TnUsE&~k_IT{RPlVCuzB
zLt%eDM(E1bh|m<fiGe`*<M~pi$2+Ng8s>jfFa|H~i=Z#bFu?&ce(Pe7>yS3*5J*CT
zX8$|6V=kKM&!;1C2#4QUd#6E;Q4zq0ZswwmaCz`b;3JV|@Cj6I9nwAv@|&3}?3Zvl
z|7O1M9KnI_Rg1%ru}4d8=7+;2;#zc?;n`xrWWDS`4IGPUl70V5hzK_}EQpLuBD1AI
z+}Qs?WG`pkMr|!&E$%F|6#B1FRX0Z-oYRmkyoRlUz7t;~R%`2e1$YC;VhrM1)ShWx
z2l^pDR!O_6VgJ79Bg)6v`LGc9+WW!QHd9ZMHeO0b+M%E2tl(Ltk^<5MpwD6qZy`)~
zps%_meuoeZa^oBy1*;%_Rc`bQGn}kre=qQS%bdX7%lQnCF?S-cV<Do?O$2jDc3O$h
zbqWvp`D#s?Ji}=}3Mfcpb|P93I4{QjeoWC{(`pm=@PDQV?V=}SBAI`ZLuCu|m8ON;
z4o?lkrbKAkAPGRB=@`D{_9Q>BF3cUZ^R&XvmC=4!^nd{okmHHzZN>LvUI(PQs>X@V
zi%XdLRu%Nr6crFFmul@Cn3&B^i<NwPYY_SAkzr%|RI`b(q&67bkEE<W^)``MfY41*
ztv04%wB|ONMonC&Q&()bpx6^1QD^3TM;P)<A;Tk6yOAtl)}W*SLU*sv;#>N4A@=E8
z17X}sbJK%;t_5f{VAtvVrTx|f^e=nvZ>hIdx301*oad$zBX7hL`F`?(?%7-`b%(Ir
zR}8G{(}<%H`AZnbI5<+v!4mGjm%P&2J0th?ltYn|?{T*OUh7&Qy?S+|Oz4Twd8YX}
zZK&Xm{D1_db+RW7;n@O2mzN8BBIIKtI1Q`?B<$%fOLkR@@8}A}qKQP%ZN$|2+Ta#2
z_Zd-=V<4rx^Lt++KPu`2>mEZ5ZsP8-NA<LJuO2wGcRA`EQ7Fl<m4H>qz06ykmXbL6
z)_Z8Vz=CEytzTDT2N**n)Er4b`JrDXYDkkZ2G~>}76Y^HqP!o;7w%`UK@w<Joe8T+
zK%qC3UTK{*!ls;FDUa)j4k4pCK6LXKw9kL{n<BqgMtshAkxy%>evv_n3k>UXCn}r&
zl4a1}|Kauem=N;4xRu=sgZF6tiVR@cic3+pXT72qf7SK|ADYoHBr(7?H^(cEI~*wj
zme~iLd+Q>f?mT6&qBOIIuh4G0F}=TtL{mZUz9MFQI<dtgo2-OZ&~5(sJ3_5}c7=B|
zHf+)qa1wbYt$QvNS?N-Xidun4ajzu{>UE+}C<>@6?Z5=pF;M4)vwQRKW9Cva&6C0I
z&In+%H{E$kQgT(GC6<9HZOa)xA<N66JCZ~M^h%n2*+D#w+8<_hz!te)yv{-1sHVE#
zx58axyC?9g@gEB7^z#>&znaYv-1d;F>)Q#%3^<w4Iyj|?;2o;(1^fbr0nE8}@RZXx
zIK9psV08KRv$=ClY&qJr;$Mveb>FlKCW-fi5rIxua8<HmeYqZTGqu;AlKyX6X_|Xn
z>{4XRH7GyC0)MlTYc&sT#PX55kvXp3FpFAwNgv379-c{Tngrq>l=AH9<W#I~)JEJA
z{Q&oQzWxA<5_%wQa}@IZURp@QucVOuy*P}$w3w3#9~MR3Z%rqzvHZnyalF;0Jf*ws
zw4MiKo5khA>?Hx4T``>G-Ec&{KA!mYv*?cosTQ~&u3IG%&WcDrQ1`ivUow&|^0=*k
z0L8`#r#!Z!BD@s2sC=WiKf~xW$szGfcD2!s;Q*2#T<AzxH3lxlC>3)YuR~1VdX+Kq
zpwoIkQ$cM|Z6&vI*uO_O!EZo5wP_yPDty)G3YwY91NP{h#%p>4GfoZvLYU9$!;)f}
zG1{BQOZ#Mygm{V{6Zi%2<k(u7ei|$Ba%$Lsbsh0w1E9N4#?}sBXn5+LuGbJoHEUB-
zx2ewPN@lfy(~cL<+N$W@y$EVXeHtn<d0i4<*>wc_&zussb`-+-v00APXxq!-qyocE
zxyX_uM#Q{G2HJk>J!-nXgqDxm0x9H$DP>TqgdflmA#M{1+||`ZIGkDl5wFD(H_rGj
zs4Sl}!Mj&1JtOI7k&BSQ7*+p6k?kaRJvSN^IfEK-zx1yX`@!hQopK`$!TYtyMwY`p
zIr*=Bs)m5?ExI{V)sB2Pji5?pH|LmFY`7Nr6esO8m;#$=4$qNK>$b9d?`vyrDatF{
zf@r*2r-0^R)8mD9B(HwOR&)H~&a>*-0?!5U<oF@TYQz7E7M@+uiqrd{Uf+)O+!tss
z4$QwxXCi1$x<g+q3;Ojei}`qkbwbl=2sVy=h~93|Z7IZjPFy7s8krY^E)a~Kf3`eE
z&fMAGE+)$_#C;U;XkR-RecJ!2-_eMtz^e3KeP12P9-KsEOzQmRaoeaz+1AaUFgIgo
zQ1MZEOHzb1gTx3Rj$CB))LiKUsqhJApb?v8zMQwu_#U&9QZxJ+$<ozanOQ7`<WJjF
zD6`}kE^hYpf<qgIrB{BmvE`^Ch%$VJy5F<<g4Z$`@soIwE?qOC99NJ6jo=-aPf$gw
zJnxt_*3CI3^wh>@mWxU9OKyEuSi~`Sm@6)TNgP($2(8~)l_!NT*vV#JX{;>Apv+J?
zTUT|>^La$eye_GVn6wtpOTym>F2YqJ@MTV9?V;nPGK?u+52Q0jwI=+hr8xbW2d;I>
zqwL~UlA*e!9X7r4QB@(DGcp&an$#>Yd9XX`wd*zC{_6*zgTG13Sy(y~ufi*r1>hyJ
zJolI9qk{9v=u9N8SUZlQavdpHZ5Jzj`~K-slykTzUPEl=NY=i`e7z71ka0u7;TDZ<
zJK8#`#d?6w7(SXAF8`IX`{xhY2%Enw7H8#>TBOhhw>aQCIvQzEpNXC6!QuTr)Z~vJ
zJ~vJCL6l^4Mj;RK;Izt^VMx2snx3ZioCD7#!}Z8)emOGxrtK#@A8ljM;Q1lRi4Edu
zaAr6nh-8pO;Jqt<)9Zo5Y+{=+zEAhG2{4uf=ib%`iiJq2-(knWlOAQ|NzHxTU>yR#
z#;+AVbFGa<z3E#`bsBC?r|c;*rz_mmSUt=>HF)Td@BRq0L`W%hpA>HtGxtqm=D3CF
z@g%q?)A7Odp548(^IY=O;y>k#T2YYhp-g{lVrHeSw<mC3f{D_~)vr7_EBN?ElLJJ2
zv<XtG;0<e-BvD$o<LaY0%mZo@;Rt8ew28F}rr=$Ec6w(?P;C92KkNRsa}$(|ijka{
zXb#Qlb`SK73*GwFqYP>0^3WIi$9~_>kiflr&|{^wX?=07LkNfaxc1n50IEfLF60Aj
z_*m1#zHlL8bSkW}*<$=oN}|BTKHB2?eyb~9Tk4V%6g2O_o2#kD5e3RG9L7JYTgs<~
z4V_u8UhK!Jaa72r-bVcQqm_S%obSOrbAaJ|@n%lg1s4U~J`G(V%<8`CWS5$`q*rvW
zZ*{Pe76jU04hO$0ed|%hP)lAIl&38xyLF}tf$GnllYnM=18=MD4R@IM_Px0f@!JFy
z<Ao#~ZpFjaJ-F=zA$L-|%8VY@_7Qn3fomj_7I^TQSM?0q8QRp$L~uAVBI&&EBo_E&
z{|)!vQ&CWCm7V+CzoZXGusS9eBKJ;Rg@WKq0(SDrl%{U*iE3?@Kl$Ee#A@580C`D3
zzW51b-ki|0RerbWh22i}`8J&i!Z~A^7Ip4_#Yz9<Go$7A2fiNz-Y+y;{pq<$C+%`c
z9i!Muq3ZV{tHZjh+E3ab3IR>UQah--2&^$xDkY@V9i#(E4eIT3SLX36i77n{bka6M
zAS-#>V%1*_jL^l1EE~4jmsZ`RyAY&A8h8@EyqO<}qkN&UiV-)_IW@uAB?`o|LB#^+
z({69MCKkf*vak*ZW=*^HzGamGYx2l)oCL{9n#$<gLN@M>j#}To=_<~|glHSm{<j)x
zxyJR*J+<r(Tz>;l*vMo2IA7z*edZ#)GNAf!SrQng5~ZiV4hJ>Qc?|fI&2~$irh}|6
znL4D}|C)z!s9M^lq-I?FIA3MuA9!p{qQY+i$7Te*5BOm1(FwT?7u+^-(ERi?gtQve
zJwfG7l6-<w;`M-aR_!z|8M#D^6ph`j25g@f3VDV7+0~TbJKW$xgmrmh2x!cmz`7(O
zz}kU|#8OKCP^ibkgmTs$K5^u#kF0{<#r|0}0T=>n`zh@21*&`7dfBXZJ{e(Uo(b8*
zQrllsc0wAK-1*?Mp9+A|e%~P=-N%>o9uR3Rb`SC^w=+tyIV>A7^uPtOTy@qkt>uJ>
zs99Yz?d2?YgMkRCB=}kdU52W(i3Y@hYo7U~wo7!EMS&<$S<J~6(|2qr+icj7B-?kB
z-=mh0X+_sNV!mgG%_e}Pw~bB{W*TNSjS*W@O`=Y74hG$O-h=!fueW=L2?_bfY{T?L
z!rP+0ryUFjE1AweKN@}W_HnMk&4d!S92DYVaGwl46w*v4`Y54P&~g2hx4Pe;acLdw
zKHQVzuhC_;N49n&t^P<$4N<C%N$9>U2*(TmY0MD*E?e9ZoW!Fh=qE`X%8EBL!Ig>0
zJ6($4qa#YhO85KGem3ttALkh`B)n(tVKYm+QXjW!Sa(U!Am57}=y9EhZJ8a)?87R{
zt9Az?BbyRj^pek*>)#T0IrRc8_V*D_-eI(Exm@7HRu@=ox4pM07a(@=&@)ISUW--J
z&Tl7hn(*!pG~Ue=?c(|KP1?*%gidKCjE1Diicl?NrtdH~6JxqX0&g%B{$X_H>27oB
z-Zkj@!F&LugU=+jHezHpT;HaCNaABTYI~p@sQn7<?!+Q!F+%=9_scnDif86`s*!S~
zw$|Y=f`Tb=qXsuQQp-F#k)7E$SRT{Dkbt~^D2GIV%C*f0lIhMUGE7?)TRBQSeSbSS
zcUQlTM7RK89vGbY#(gZow#k#PbD7=yV_~MsdXcGU-OJlGXh#L*|N2J4n)qPRZ`Rax
z<Bm0j0-(CK$0F2tiG5USse<L{1#6K_cH)RMsCI(9voSzUx&5o~j@o?n#F0joBD)=6
zoGk0rC6JRps7vto42%u|xz=x8nwB5vy!PeOmdld$9eCu8&YcLz2A6#dD?Y}Z5c~hC
z;+3EsP`nZTC`8ZCIk5G#Q+iD=)4NJ-GcQ&6`qD^cttFqnxN6v$C&q<`>HIzkv3;+|
zBCc&W&z4tDR8G&t%HK<UA{#FF!YOa~z6DLQA>TiwnNmfN=Kjo$M7d-jKUM6yb?;#!
z3}o6PK(?n|{v|RHIUQ8=5uPo!WwV&95-TL|h-E@G(a-U62kK0Mzicr7ME)*Y@wn56
zv72N|Z7cWi;1xU=zV82mJGt)SkSP!%nyaty+4Me$Q?f7f_gU}sjhH(LUoyfq>gmz5
zh1)}^jHy_s4v&Gfm$2lx4RnLgyKl2$b}b&>s6J)cyndpLhEq`-WDC7=*fC=%dc0=j
ziSfA}A~<lfF}oX{@?~juEp#`1q^e=Za=h_vKd2hxC5d%gczHmtfI47&X-G3j^g_s{
zc=)IB(UI|G==n8pAY|j3=YqiQn!`9>FhxzD&vYVK=Ub+-$gek8@hdWHNHOQ!g{)Sp
zIc1UZhMh~ZujfAD;ou)i4r(%sByZl=<nQO+*ysPJ*ZY9^V2j!F^G*+5{6g(F&U{G3
zL1z#rDiAq2vYpDQYly<h`ds3I2n`=@J%EnK7;|(Un+Qvdu-MNQCr;#gtuDxopilih
zDF0)cY+C=-g9UWu3ItRx>Al=lE)7gk0Xa?oy}`g?+Vn<PXr_Aes8Ntfo?9r3zwE3*
z`d`fGd2*1Ld*Fxgymd)Wgp9(T-~N8|xLKn`&w{YOH1*f=61z7%Sf$4SSyTT6@?I-4
zBc`#o6k(t|H?w)a?=?CpkP_zoZ`(3?o8s*}VvA3&CG0}2R;5+)g7VxhKJs?myf@Ei
zlqJcx?d*0><ldnb6K3%#ZNha01(YGeM2x67G3V+o^YNj2aVZ^t4#{EV&n}m%Po?Z=
z5d83D$Zs<hgR$l_hac*dUw74%!HQG93!CM`*Ed9jhuL{|Ip%8pA0$J-ME8*rZkZVG
mO|+d_*Lb!_{(l3(<nZ}~8xB7b^N98<p!!4;S)pM0>c0S6k9DyC

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml
index 260ff12..c4911c2 100644
--- a/app/src/main/res/layout/activity_pictures.xml
+++ b/app/src/main/res/layout/activity_pictures.xml
@@ -126,9 +126,10 @@
         android:id="@+id/btn_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="25dp"
         android:layout_marginEnd="25dp"
         android:text="切换"
+        android:padding="@dimen/default_widget_padding"
         android:src="@mipmap/switcher"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />