Browse Source

添加新站点

huyuguo 4 years ago
parent
commit
96b718ad72

+ 2 - 1
app/build.gradle

48
48
49
    sourceSets.main {
49
    sourceSets.main {
50
        jniLibs.srcDirs 'src/main/libs'
50
        jniLibs.srcDirs 'src/main/libs'
51
        res.srcDirs = ['src/main/res']
51
    }
52
    }
52
    lintOptions {
53
    lintOptions {
53
        checkReleaseBuilds false
54
        checkReleaseBuilds false
166
167
167
dependencies {
168
dependencies {
168
    implementation fileTree(dir: 'libs', include: ['*.jar'])
169
    implementation fileTree(dir: 'libs', include: ['*.jar'])
169
    implementation (name:'alipaySdk-15.6.8-20191021122514', ext:'aar')
170
    implementation(name: 'alipaySdk-15.6.8-20191021122514', ext: 'aar')
170
    implementation project(':autolayout')
171
    implementation project(':autolayout')
171
    implementation project(':library')
172
    implementation project(':library')
172
    implementation project(':zxing')
173
    implementation project(':zxing')

+ 1 - 1
app/gradle.properties

10
# Specifies the JVM arguments used for the daemon process.
10
# Specifies the JVM arguments used for the daemon process.
11
# The setting is particularly useful for tweaking memory settings.
11
# The setting is particularly useful for tweaking memory settings.
12
# Default value: -Xmx10248m -XX:MaxPermSize=256m
12
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
13
 org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14
14
15
# When configured, Gradle will run in incubating parallel mode.
15
# When configured, Gradle will run in incubating parallel mode.
16
# This option should only be used with decoupled projects. More details, visit
16
# This option should only be used with decoupled projects. More details, visit

+ 77 - 85
app/src/main/AndroidManifest.xml

4
    package="com.electric.chargingpile"
4
    package="com.electric.chargingpile"
5
    android:versionCode="89"
5
    android:versionCode="89"
6
    android:versionName="3.5.1">
6
    android:versionName="3.5.1">
7
    <!-- 极光 -->
7
    <!-- 往SDCard写入数据权限 -->
8
    <permission
9
        android:name="${applicationId}.permission.JPUSH_MESSAGE"
10
        android:protectionLevel="signature" />
11
12
    <uses-feature android:name="android.hardware.camera" />
13
    <uses-feature android:name="android.hardware.camera.autofocus" />
14
15
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
16
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
17
    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
18
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
19
    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
20
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
21
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
22
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
23
    <uses-permission android:name="android.permission.INTERNET" />
24
    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
25
    <uses-permission android:name="android.permission.WAKE_LOCK" />
26
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
27
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
28
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
29
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
30
    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
31
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
32
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
33
    <uses-permission android:name="android.permission.CALL_PHONE" />
34
    <uses-permission android:name="android.permission.CAMERA" />
35
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
36
    <uses-permission android:name="android.permission.GET_TASKS" />
37
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
38
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
39
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
40
    <uses-permission android:name="android.permission.READ_LOGS" /> <!-- 极光 -->
41
    <uses-permission android:name="android.permission.VIBRATE" />
42
    <uses-permission android:name="android.permission.INTERNET" />
43
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
44
    <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
45
    <!-- <uses-permission android:name="android.permission.WAKE_LOCK" /> -->
46
    <!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" /> -->
47
    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
48
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
49
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
50
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> -->
51
    <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
52
    <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
53
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- 极光 -->
54
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
55
    <uses-permission android:name="android.permission.VIBRATE" />
56
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
57
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
58
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
59
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 【常用】 信鸽SDK所需权限 -->
60
    <!-- <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" /> -->
61
    <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
62
    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
63
    <!-- 【可选】 信鸽SDK所需权限 -->
64
    <!-- <uses-permission android:name="android.permission.RESTART_PACKAGES" /> -->
65
    <!-- <uses-permission android:name="android.permission.BROADCAST_STICKY" /> -->
66
    <!-- <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" /> -->
67
    <!-- <uses-permission android:name="android.permission.READ_LOGS" /> -->
68
    <!-- <uses-permission android:name="android.permission.BATTERY_STATS" /> -->
69
    <!-- 蓝牙分享所需的权限 -->
70
    <!-- <uses-permission android:name="android.permission.BLUETOOTH" /> -->
71
    <!-- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> -->
72
    <!-- 权限 :  GPS定位 -->
73
    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
74
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
75
    <uses-permission android:name="android.permission.REORDER_TASKS" />
76
    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
77
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 权限 : AGPS定位 -->
78
    <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
79
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
80
8
    <application
81
    <application
9
        android:name=".application.MainApplication"
82
        android:name=".application.MainApplication"
10
        android:allowBackup="true"
83
        android:allowBackup="true"
14
        android:resizeableActivity="true"
87
        android:resizeableActivity="true"
15
        android:theme="@style/AppTheme"
88
        android:theme="@style/AppTheme"
16
        tools:ignore="LockedOrientationActivity">
89
        tools:ignore="LockedOrientationActivity">
90
        <activity android:name=".activity.ShareTwoPictureActivity"></activity>
17
        <activity
91
        <activity
18
            android:name=".activity.RecommendChargingStationActivity"
92
            android:name=".activity.RecommendChargingStationActivity"
19
            android:screenOrientation="portrait"></activity>
93
            android:screenOrientation="portrait" />
20
        <activity
94
        <activity
21
            android:name=".activity.ChatContentListActivity"
95
            android:name=".activity.ChatContentListActivity"
22
            android:screenOrientation="portrait" />
96
            android:screenOrientation="portrait" />
23
        <activity android:name=".activity.UserPageActivity" />
97
        <activity android:name=".activity.UserPageActivity" />
24
25
        <activity
98
        <activity
26
            android:name=".activity.WelcomeActivity"
99
            android:name=".activity.WelcomeActivity"
27
            android:configChanges="keyboardHidden|orientation"
100
            android:configChanges="keyboardHidden|orientation"
57
            android:launchMode="singleTop"
130
            android:launchMode="singleTop"
58
            android:screenOrientation="portrait"
131
            android:screenOrientation="portrait"
59
            android:windowSoftInputMode="stateHidden|adjustUnspecified" />
132
            android:windowSoftInputMode="stateHidden|adjustUnspecified" />
60
61
        <activity
133
        <activity
62
            android:name=".activity.FeedbackActivity"
134
            android:name=".activity.FeedbackActivity"
63
            android:configChanges="keyboardHidden|orientation"
135
            android:configChanges="keyboardHidden|orientation"
139
            android:label="@string/title_activity_my_share"
211
            android:label="@string/title_activity_my_share"
140
            android:launchMode="singleTop"
212
            android:launchMode="singleTop"
141
            android:screenOrientation="portrait" />
213
            android:screenOrientation="portrait" />
142
143
        <activity
214
        <activity
144
            android:name=".activity.MyCollectActivity"
215
            android:name=".activity.MyCollectActivity"
145
            android:configChanges="keyboardHidden|orientation"
216
            android:configChanges="keyboardHidden|orientation"
150
            android:name=".activity.MyAlterActivity"
221
            android:name=".activity.MyAlterActivity"
151
            android:label="@string/title_activity_my_alter"
222
            android:label="@string/title_activity_my_alter"
152
            android:screenOrientation="portrait" />
223
            android:screenOrientation="portrait" />
153
154
        <activity
224
        <activity
155
            android:name=".activity.LoginActivity"
225
            android:name=".activity.LoginActivity"
156
            android:label="@string/title_activity_login"
226
            android:label="@string/title_activity_login"
522
            android:name="cn.jpush.android.ui.PopWinActivity"
592
            android:name="cn.jpush.android.ui.PopWinActivity"
523
            android:exported="false"
593
            android:exported="false"
524
            android:theme="@style/MyDialogStyle" />
594
            android:theme="@style/MyDialogStyle" />
525
526
        <activity
595
        <activity
527
            android:name="cn.jpush.android.ui.PushActivity"
596
            android:name="cn.jpush.android.ui.PushActivity"
528
            android:configChanges="orientation|keyboardHidden"
597
            android:configChanges="orientation|keyboardHidden"
569
        <activity
638
        <activity
570
            android:name=".activity.SelectCarActivity"
639
            android:name=".activity.SelectCarActivity"
571
            android:screenOrientation="portrait" />
640
            android:screenOrientation="portrait" />
572
573
        <activity
641
        <activity
574
            android:name=".activity.ZhanCommentActivity"
642
            android:name=".activity.ZhanCommentActivity"
575
            android:configChanges="keyboardHidden|orientation|screenSize"
643
            android:configChanges="keyboardHidden|orientation|screenSize"
585
        <activity
653
        <activity
586
            android:name=".activity.PrivateZhuangMapActivity"
654
            android:name=".activity.PrivateZhuangMapActivity"
587
            android:screenOrientation="portrait" />
655
            android:screenOrientation="portrait" />
588
589
        <activity
656
        <activity
590
            android:name=".activity.PrivateZhuangInfoActivity"
657
            android:name=".activity.PrivateZhuangInfoActivity"
591
            android:screenOrientation="portrait"
658
            android:screenOrientation="portrait"
596
        <activity
663
        <activity
597
            android:name=".activity.AlbumPrivateActivity"
664
            android:name=".activity.AlbumPrivateActivity"
598
            android:screenOrientation="portrait" />
665
            android:screenOrientation="portrait" />
599
600
        <activity
666
        <activity
601
            android:name=".activity.BuildTypeActivity"
667
            android:name=".activity.BuildTypeActivity"
602
            android:screenOrientation="portrait" />
668
            android:screenOrientation="portrait" />
909
                <category android:name="${applicationId}" />
975
                <category android:name="${applicationId}" />
910
            </intent-filter>
976
            </intent-filter>
911
        </service>
977
        </service>
912
    </application> <!-- 往SDCard写入数据权限 -->
913
    <permission
914
        android:name="${applicationId}.permission.JPUSH_MESSAGE"
915
        android:protectionLevel="signature" />
916
917
    <uses-feature android:name="android.hardware.camera" />
918
    <uses-feature android:name="android.hardware.camera.autofocus" />
919
920
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
921
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
922
    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
923
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
924
    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
925
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
926
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
927
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
928
    <uses-permission android:name="android.permission.INTERNET" />
929
    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
930
    <uses-permission android:name="android.permission.WAKE_LOCK" />
931
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
932
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
933
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
934
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
935
    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
936
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
937
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
938
    <uses-permission android:name="android.permission.CALL_PHONE" />
939
    <uses-permission android:name="android.permission.CAMERA" />
940
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
941
    <uses-permission android:name="android.permission.GET_TASKS" />
942
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
943
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
944
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
945
    <uses-permission android:name="android.permission.READ_LOGS" /> <!-- 极光 -->
946
    <uses-permission android:name="android.permission.VIBRATE" />
947
    <uses-permission android:name="android.permission.INTERNET" />
948
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
949
    <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
950
    <!-- <uses-permission android:name="android.permission.WAKE_LOCK" /> -->
951
    <!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" /> -->
952
    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
953
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
954
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
955
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> -->
956
    <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
957
    <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
958
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- 极光 -->
959
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
960
    <uses-permission android:name="android.permission.VIBRATE" />
961
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
962
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
963
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
964
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 【常用】 信鸽SDK所需权限 -->
965
    <!-- <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" /> -->
966
    <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
967
    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
968
    <!-- 【可选】 信鸽SDK所需权限 -->
969
    <!-- <uses-permission android:name="android.permission.RESTART_PACKAGES" /> -->
970
    <!-- <uses-permission android:name="android.permission.BROADCAST_STICKY" /> -->
971
    <!-- <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" /> -->
972
    <!-- <uses-permission android:name="android.permission.READ_LOGS" /> -->
973
    <!-- <uses-permission android:name="android.permission.BATTERY_STATS" /> -->
974
    <!-- 蓝牙分享所需的权限 -->
975
    <!-- <uses-permission android:name="android.permission.BLUETOOTH" /> -->
976
    <!-- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> -->
977
    <!-- 权限 :  GPS定位 -->
978
    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
979
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
980
    <uses-permission android:name="android.permission.REORDER_TASKS" />
981
982
    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
983
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 权限 : AGPS定位 -->
984
    <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
985
986
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
978
    </application>
987
979
988
</manifest>
980
</manifest>

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

5284
            }
5284
            }
5285
        } else if (remind.equals("2")) {
5285
        } else if (remind.equals("2")) {
5286
            iv_guzhang.setVisibility(View.VISIBLE);
5286
            iv_guzhang.setVisibility(View.VISIBLE);
5287
            if ("1".equals(own_pay)) {
5288
                iv_guzhang.setImageResource(R.drawable.icon_is_cost);
5289
            } else {
5290
                iv_guzhang.setImageResource(R.drawable.icon_rest);
5291
            }
5287
            iv_guzhang.setImageResource(R.drawable.icon_rest);
5292
        } else {
5288
        } else {
5293
            iv_guzhang.setVisibility(View.VISIBLE);
5289
            iv_guzhang.setVisibility(View.VISIBLE);
5294
            iv_guzhang.setImageResource(R.drawable.icon_guzhang_window);
5290
            iv_guzhang.setImageResource(R.drawable.icon_guzhang_window);

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

52
import com.electric.chargingpile.util.BarColorUtil;
52
import com.electric.chargingpile.util.BarColorUtil;
53
import com.electric.chargingpile.util.Bimp;
53
import com.electric.chargingpile.util.Bimp;
54
import com.electric.chargingpile.util.DES3;
54
import com.electric.chargingpile.util.DES3;
55
import com.electric.chargingpile.util.DensityUtil;
55
import com.electric.chargingpile.util.ImageItem;
56
import com.electric.chargingpile.util.ImageItem;
56
import com.electric.chargingpile.util.ImageUtils;
57
import com.electric.chargingpile.util.ImageUtils;
57
import com.electric.chargingpile.util.OkHttpUtil;
58
import com.electric.chargingpile.util.OkHttpUtil;
160
    private ProgressDialog insertDialog;
161
    private ProgressDialog insertDialog;
161
    private static final int RC_ALBUM_PERM = 123;
162
    private static final int RC_ALBUM_PERM = 123;
162
163
163
    private ImageItem[] selectBitmap = new ImageItem[4];
164
    public static ImageItem[] selectBitmap = new ImageItem[4];
164
    private int selectIndex = 0;
165
    private int selectIndex = 0;
165
166
166
    private ArrayList<ImageView> takeImageViewList = new ArrayList<>();
167
    private ArrayList<ImageView> takeImageViewList = new ArrayList<>();
173
            switch (msg.what) {
174
            switch (msg.what) {
174
                case 1:
175
                case 1:
175
                    int index = msg.arg1;
176
                    int index = msg.arg1;
176
                    takeImageViewList.get(index).setImageBitmap(selectBitmap[index].getBitmap());
177
                    ImageView iv = takeImageViewList.get(index);
178
                    iv.setImageBitmap(selectBitmap[index].getBitmap());
179
                    iv.setScaleType(ImageView.ScaleType.CENTER_CROP);
180
                    ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) iv.getLayoutParams();
181
                    lp.width = DensityUtil.dip2px(ShareTwoActivity.this, 82);
182
                    lp.height = DensityUtil.dip2px(ShareTwoActivity.this, 70);
183
                    ;
184
                    iv.setLayoutParams(lp);
177
                    takeImageCameraList.get(index).setVisibility(View.GONE);
185
                    takeImageCameraList.get(index).setVisibility(View.GONE);
178
                    break;
186
                    break;
179
                case 2:
187
                case 2:
288
    }
296
    }
289
297
290
    public void Init() {
298
    public void Init() {
299
        selectBitmap[0] = null;
300
        selectBitmap[1] = null;
301
        selectBitmap[2] = null;
302
        selectBitmap[3] = null;
291
303
292
        pop = new PopupWindow(ShareTwoActivity.this);
304
        pop = new PopupWindow(ShareTwoActivity.this);
293
305
380
        Log.e(TAG, "callGallery: " + (Bimp.max - Bimp.tempSelectBitmap.size()));
392
        Log.e(TAG, "callGallery: " + (Bimp.max - Bimp.tempSelectBitmap.size()));
381
        //调用第三方图库选择
393
        //调用第三方图库选择
382
        PhotoPicker.builder()
394
        PhotoPicker.builder()
383
                .setPhotoCount(PIC_NUM - Bimp.tempSelectBitmap.size())//可选择图片数量
395
                .setPhotoCount(1)//可选择图片数量
384
                .setShowCamera(true)//是否显示拍照按钮
396
                .setShowCamera(true)//是否显示拍照按钮
385
                .setShowGif(true)//是否显示动态图
397
                .setShowGif(true)//是否显示动态图
386
                .setPreviewEnabled(true)//是否可以预览
398
                .setPreviewEnabled(true)//是否可以预览
599
                if (selectBitmap[0] == null) {
611
                if (selectBitmap[0] == null) {
600
                    permissionTask();
612
                    permissionTask();
601
                } else {
613
                } else {
602
                    Intent intent = new Intent(ShareTwoActivity.this,
603
                            GalleryActivity.class);
604
                    intent.putExtra("position", "1");
605
                    intent.putExtra("ID", 0);
614
                    Intent intent = new Intent(ShareTwoActivity.this, ShareTwoPictureActivity.class);
615
                    intent.putExtra("selectIndex", selectIndex);
606
                    startActivity(intent);
616
                    startActivity(intent);
607
                }
617
                }
608
                break;
618
                break;
611
                if (selectBitmap[1] == null) {
621
                if (selectBitmap[1] == null) {
612
                    permissionTask();
622
                    permissionTask();
613
                } else {
623
                } else {
614
                    Intent intent = new Intent(ShareTwoActivity.this,
615
                            GalleryActivity.class);
616
                    intent.putExtra("position", "1");
617
                    intent.putExtra("ID", 1);
624
                    Intent intent = new Intent(ShareTwoActivity.this, ShareTwoPictureActivity.class);
625
                    intent.putExtra("selectIndex", selectIndex);
618
                    startActivity(intent);
626
                    startActivity(intent);
619
                }
627
                }
620
                break;
628
                break;
623
                if (selectBitmap[2] == null) {
631
                if (selectBitmap[2] == null) {
624
                    permissionTask();
632
                    permissionTask();
625
                } else {
633
                } else {
626
                    Intent intent = new Intent(ShareTwoActivity.this,
627
                            GalleryActivity.class);
628
                    intent.putExtra("position", "1");
629
                    intent.putExtra("ID", 2);
634
                    Intent intent = new Intent(ShareTwoActivity.this, ShareTwoPictureActivity.class);
635
                    intent.putExtra("selectIndex", selectIndex);
630
                    startActivity(intent);
636
                    startActivity(intent);
631
                }
637
                }
632
                break;
638
                break;
635
                if (selectBitmap[3] == null) {
641
                if (selectBitmap[3] == null) {
636
                    permissionTask();
642
                    permissionTask();
637
                } else {
643
                } else {
638
                    Intent intent = new Intent(ShareTwoActivity.this,
639
                            GalleryActivity.class);
640
                    intent.putExtra("position", "1");
641
                    intent.putExtra("ID", 3);
644
                    Intent intent = new Intent(ShareTwoActivity.this, ShareTwoPictureActivity.class);
645
                    intent.putExtra("selectIndex", selectIndex);
642
                    startActivity(intent);
646
                    startActivity(intent);
643
                }
647
                }
644
                break;
648
                break;
1253
        wei = sharedPreferencesUtil.getString("poi_wei", "");
1257
        wei = sharedPreferencesUtil.getString("poi_wei", "");
1254
        et_share_address.setText(address);
1258
        et_share_address.setText(address);
1255
        costWay.setText(costway);
1259
        costWay.setText(costway);
1260
1261
        for (int i=0;i<selectBitmap.length;i++) {
1262
            ImageItem imageItem = selectBitmap[i];
1263
            if (imageItem == null) {
1264
                takeImageCameraList.get(i).setVisibility(View.VISIBLE);
1265
                ImageView takeImageView = takeImageViewList.get(i);
1266
                takeImageView.setImageResource(Res.getDrawableID("add_picture_" + (i+1)));
1267
                takeImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
1268
1269
                ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) takeImageView.getLayoutParams();
1270
                lp.width = ViewGroup.LayoutParams.WRAP_CONTENT;
1271
                lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
1272
                takeImageView.setLayoutParams(lp);
1273
1274
            } else {
1275
                takeImageCameraList.get(i).setVisibility(View.GONE);
1276
            }
1277
        }
1278
1256
    }
1279
    }
1257
1280
1258
1281

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

1
package com.electric.chargingpile.activity;
2
3
import android.support.v7.app.AppCompatActivity;
4
import android.os.Bundle;
5
import android.view.View;
6
import android.widget.ImageView;
7
import android.widget.TextView;
8
9
import com.electric.chargingpile.R;
10
11
public class ShareTwoPictureActivity extends AppCompatActivity {
12
13
    private ImageView gallery_icon;
14
    private TextView gallery_del;
15
    private int selectIndex;
16
    private ImageView picture;
17
18
    @Override
19
    protected void onCreate(Bundle savedInstanceState) {
20
        super.onCreate(savedInstanceState);
21
        setContentView(R.layout.activity_share_two_picture);
22
        initView();
23
    }
24
25
    private void initView() {
26
        selectIndex = getIntent().getIntExtra("selectIndex", 0);
27
        picture = findViewById(R.id.picture);
28
29
        picture.setImageBitmap(ShareTwoActivity.selectBitmap[selectIndex].getBitmap());
30
        gallery_icon = findViewById(R.id.gallery_icon);
31
        gallery_icon.setOnClickListener(new View.OnClickListener() {
32
            @Override
33
            public void onClick(View v) {
34
                finish();
35
            }
36
        });
37
        gallery_del = findViewById(R.id.gallery_del);
38
        gallery_del.setOnClickListener(new View.OnClickListener() {
39
            @Override
40
            public void onClick(View v) {
41
                ShareTwoActivity.selectBitmap[selectIndex] = null;
42
                finish();
43
            }
44
        });
45
    }
46
}

+ 8 - 16
app/src/main/res/layout/activity_share_two.xml

187

187

188
                        <ImageView
188
                        <ImageView
189
                            android:id="@+id/take_image_view_0"
189
                            android:id="@+id/take_image_view_0"
190
                            android:layout_width="82dp"
191
                            android:layout_height="70dp"
192
                            android:scaleType="centerCrop"
190
                            android:layout_width="wrap_content"
191
                            android:layout_height="wrap_content"
193
                            android:src="@drawable/add_picture_1"
192
                            android:src="@drawable/add_picture_1"
194
                            app:layout_constraintBottom_toBottomOf="parent"
193
                            app:layout_constraintBottom_toBottomOf="parent"
195
                            app:layout_constraintLeft_toLeftOf="parent"
194
                            app:layout_constraintLeft_toLeftOf="parent"
202
                            android:layout_height="wrap_content"
201
                            android:layout_height="wrap_content"
203
                            android:layout_marginTop="5dp"
202
                            android:layout_marginTop="5dp"
204
                            android:layout_marginRight="5dp"
203
                            android:layout_marginRight="5dp"
205
                            android:scaleType="fitEnd"
206
                            android:src="@drawable/camera_icon"
204
                            android:src="@drawable/camera_icon"
207
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_0"
205
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_0"
208
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_0" />
206
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_0" />
220

218

221
                        <ImageView
219
                        <ImageView
222
                            android:id="@+id/take_image_view_1"
220
                            android:id="@+id/take_image_view_1"
223
                            android:layout_width="82dp"
224
                            android:layout_height="70dp"
225
                            android:scaleType="centerCrop"
221
                            android:layout_width="wrap_content"
222
                            android:layout_height="wrap_content"
226
                            android:src="@drawable/add_picture_2"
223
                            android:src="@drawable/add_picture_2"
227
                            app:layout_constraintBottom_toBottomOf="parent"
224
                            app:layout_constraintBottom_toBottomOf="parent"
228
                            app:layout_constraintLeft_toLeftOf="parent"
225
                            app:layout_constraintLeft_toLeftOf="parent"
235
                            android:layout_height="wrap_content"
232
                            android:layout_height="wrap_content"
236
                            android:layout_marginTop="5dp"
233
                            android:layout_marginTop="5dp"
237
                            android:layout_marginRight="5dp"
234
                            android:layout_marginRight="5dp"
238
                            android:scaleType="fitEnd"
239
                            android:src="@drawable/camera_icon"
235
                            android:src="@drawable/camera_icon"
240
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_1"
236
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_1"
241
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_1" />
237
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_1" />
251

247

252
                        <ImageView
248
                        <ImageView
253
                            android:id="@+id/take_image_view_2"
249
                            android:id="@+id/take_image_view_2"
254
                            android:layout_width="82dp"
255
                            android:layout_height="70dp"
256
                            android:scaleType="centerCrop"
250
                            android:layout_width="wrap_content"
251
                            android:layout_height="wrap_content"
257
                            android:src="@drawable/add_picture_3"
252
                            android:src="@drawable/add_picture_3"
258
                            app:layout_constraintBottom_toBottomOf="parent"
253
                            app:layout_constraintBottom_toBottomOf="parent"
259
                            app:layout_constraintLeft_toLeftOf="parent"
254
                            app:layout_constraintLeft_toLeftOf="parent"
266
                            android:layout_height="wrap_content"
261
                            android:layout_height="wrap_content"
267
                            android:layout_marginTop="5dp"
262
                            android:layout_marginTop="5dp"
268
                            android:layout_marginRight="5dp"
263
                            android:layout_marginRight="5dp"
269
                            android:scaleType="fitEnd"
270
                            android:src="@drawable/camera_icon"
264
                            android:src="@drawable/camera_icon"
271
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_2"
265
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_2"
272
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_2" />
266
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_2" />
282

276

283
                        <ImageView
277
                        <ImageView
284
                            android:id="@+id/take_image_view_3"
278
                            android:id="@+id/take_image_view_3"
285
                            android:layout_width="82dp"
286
                            android:layout_height="70dp"
287
                            android:scaleType="centerCrop"
279
                            android:layout_width="wrap_content"
280
                            android:layout_height="wrap_content"
288
                            android:src="@drawable/add_picture_4"
281
                            android:src="@drawable/add_picture_4"
289
                            app:layout_constraintBottom_toBottomOf="parent"
282
                            app:layout_constraintBottom_toBottomOf="parent"
290
                            app:layout_constraintLeft_toLeftOf="parent"
283
                            app:layout_constraintLeft_toLeftOf="parent"
297
                            android:layout_height="wrap_content"
290
                            android:layout_height="wrap_content"
298
                            android:layout_marginTop="5dp"
291
                            android:layout_marginTop="5dp"
299
                            android:layout_marginRight="5dp"
292
                            android:layout_marginRight="5dp"
300
                            android:scaleType="fitEnd"
301
                            android:src="@drawable/camera_icon"
293
                            android:src="@drawable/camera_icon"
302
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_3"
294
                            app:layout_constraintRight_toRightOf="@+id/take_image_view_3"
303
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_3" />
295
                            app:layout_constraintTop_toTopOf="@+id/take_image_view_3" />

+ 45 - 0
app/src/main/res/layout/activity_share_two_picture.xml

1
<?xml version="1.0" encoding="utf-8"?>
2
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:app="http://schemas.android.com/apk/res-auto"
4
    xmlns:tools="http://schemas.android.com/tools"
5
    android:layout_width="match_parent"
6
    android:layout_height="match_parent"
7
    android:background="@color/activity_bgcolor"
8
    tools:context=".activity.ShareTwoPictureActivity">
9
10
    <android.support.constraint.ConstraintLayout
11
        android:id="@+id/nav_bar"
12
        android:layout_width="match_parent"
13
        android:layout_height="45dp"
14
        android:background="@color/white"
15
        app:layout_constraintLeft_toLeftOf="parent"
16
        app:layout_constraintRight_toRightOf="parent"
17
        app:layout_constraintTop_toTopOf="parent">
18
19
        <ImageView
20
            android:id="@+id/gallery_icon"
21
            android:layout_width="60dp"
22
            android:layout_height="match_parent"
23
            android:scaleType="center"
24
            android:src="@drawable/app_publish_close_icon"
25
            app:layout_constraintLeft_toLeftOf="parent" />
26
27
        <TextView
28
            android:id="@+id/gallery_del"
29
            android:layout_width="60dp"
30
            android:layout_height="match_parent"
31
            android:background="@drawable/plugin_camera_del_state"
32
            app:layout_constraintRight_toRightOf="parent" />
33
34
    </android.support.constraint.ConstraintLayout>
35
36
    <ImageView
37
        android:id="@+id/picture"
38
        android:layout_width="match_parent"
39
        android:layout_height="0dp"
40
        android:background="@color/orange"
41
        android:scaleType="centerCrop"
42
        app:layout_constraintBottom_toBottomOf="parent"
43
        app:layout_constraintTop_toBottomOf="@+id/nav_bar" />
44
45
</android.support.constraint.ConstraintLayout>