浏览代码

3.5.21版本

hy 2 年之前
父节点
当前提交
b13e7f2b41

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

2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3
    xmlns:tools="http://schemas.android.com/tools"
4
    package="com.electric.chargingpile"
4
    package="com.electric.chargingpile"
5
    android:versionCode="106"
6
    android:versionName="3.5.20">
5
    android:versionCode="107"
6
    android:versionName="3.5.21">
7
7
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

+ 2 - 0
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

4541
            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
4541
            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
4542
            tvFloorLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
4542
            tvFloorLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
4543
4543
4544
        }else{
4545
            tvFloorLock.setVisibility( View.GONE);
4544
        }
4546
        }
4545
        telephone = JsonUtils.getKeyResult(info, "telephone");
4547
        telephone = JsonUtils.getKeyResult(info, "telephone");
4546
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
4548
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);

+ 1 - 1
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

155
    public static boolean isIgnore = true;
155
    public static boolean isIgnore = true;
156
    public static Double search_jing = 0.0, search_wei = 0.0;
156
    public static Double search_jing = 0.0, search_wei = 0.0;
157
    public static Context context;
157
    public static Context context;
158
    public static String current_code = "3.5";
158
    public static String current_code = BuildConfig.VERSION_NAME;
159
    public static String storePath = "";
159
    public static String storePath = "";
160
    public static String q_content = "";
160
    public static String q_content = "";
161
    public static Map<String, String> q_map = new HashMap<>();
161
    public static Map<String, String> q_map = new HashMap<>();

+ 2 - 0
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

293
                        if (locks != null && locks.equals("")){
293
                        if (locks != null && locks.equals("")){
294
                            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
294
                            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
295
                            imgLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
295
                            imgLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
296
                        }else{
297
                            imgLock.setVisibility(View.GONE);
296
                        }
298
                        }
297
                        if (detailsFragmentListener != null) {
299
                        if (detailsFragmentListener != null) {
298
                            detailsFragmentListener.updateScanCharge(own_pay);
300
                            detailsFragmentListener.updateScanCharge(own_pay);

+ 2 - 0
app/src/main/java/com/electric/chargingpile/fragment/ZhanStatusFragment.java

121
                            if (locks != null && locks.equals("")){
121
                            if (locks != null && locks.equals("")){
122
                                ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
122
                                ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
123
                                tvLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
123
                                tvLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
124
                            }else{
125
                                tvLock.setVisibility(View.GONE);
124
                            }
126
                            }
125
                        }catch (Exception e) {
127
                        }catch (Exception e) {
126
                            e.printStackTrace();
128
                            e.printStackTrace();

+ 2 - 0
app/src/main/res/layout/activity_main_map.xml

930
930
931
931
932
    <RelativeLayout
932
    <RelativeLayout
933
        tools:visibility="visible"
933
        android:id="@+id/window_ll_zhan"
934
        android:id="@+id/window_ll_zhan"
934
        android:layout_width="match_parent"
935
        android:layout_width="match_parent"
935
        android:layout_height="wrap_content"
936
        android:layout_height="wrap_content"
1144
                    android:textColor="#828282"
1145
                    android:textColor="#828282"
1145
                    android:textSize="11dp" />
1146
                    android:textSize="11dp" />
1146
                <TextView
1147
                <TextView
1148
                    android:visibility="gone"
1147
                    android:id="@+id/tvFloorLock"
1149
                    android:id="@+id/tvFloorLock"
1148
                    android:layout_width="34dp"
1150
                    android:layout_width="34dp"
1149
                    android:layout_height="18dp"
1151
                    android:layout_height="18dp"