ments LocationSource, AMapLoc 6229 6312 
            return;
6230 6313 
        }
6231 6314
6232 
        TelephonyManager telephonyManager = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
6315 
        TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
6233 6316 
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
6234 6317 
            int checkPermission = ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.READ_PHONE_STATE);
6235 6318 
            if (checkPermission != PackageManager.PERMISSION_GRANTED) { // 未授权，去授权
6236 
                ActivityCompat.requestPermissions(MainMapActivity.this, new String[]{Manifest.permission.READ_PHONE_STATE},READ_PHONE_STATE);
6319 
                ActivityCompat.requestPermissions(MainMapActivity.this, new String[]{Manifest.permission.READ_PHONE_STATE}, READ_PHONE_STATE);
6237 6320 
            } else {
6238 6321 
                deviceId = telephonyManager.getImei();
6239 6322 
            }
6240 6323 
        } else {
6241 6324 
            int checkPermission = ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.READ_PHONE_STATE);
6242 6325 
            if (checkPermission != PackageManager.PERMISSION_GRANTED) { // 未授权，去授权
6243 
                ActivityCompat.requestPermissions(MainMapActivity.this, new String[]{Manifest.permission.READ_PHONE_STATE},READ_PHONE_STATE);
6326 
                ActivityCompat.requestPermissions(MainMapActivity.this, new String[]{Manifest.permission.READ_PHONE_STATE}, READ_PHONE_STATE);
6244 6327 
            } else {
6245 6328 
                deviceId = telephonyManager.getDeviceId();
6246 6329 
            }
6247 6330 
        }
6248 
        if (!TextUtils.isEmpty(deviceId )) {
6331 
        if (!TextUtils.isEmpty(deviceId)) {
6249 6332 
            ProfileManager.getInstance().setDeviceId(deviceId);
6250 6333 
        }
6251 6334 
    }

+ 14 - 0
app/src/main/res/layout/activity_main_map.xml
Ver fichero 

@ -1205,6 +1205,20 @@
1205 1205 
                android:textSize="14sp"
1206 1206 
                tools:text="可使用本APP扫码支付" />
1207 1207
1208 
            <TextView
1209 
                android:id="@+id/window_tv_stop_cost"
1210 
                android:layout_width="wrap_content"
1211 
                android:layout_height="wrap_content"
1212 
                android:layout_marginLeft="15dp"
1213 
                android:layout_marginTop="5dp"
1214 
                android:layout_marginRight="15dp"
1215 
                android:ellipsize="end"
1216 
                android:maxLines="2"
1217 
                android:textColor="@color/orange"
1218 
                android:textSize="14sp"
1219 
                tools:text="停车费：参考价格：10元\/小时（以实际收取为准）" />
1220
1221
1208 1222 
            <!-- 广告 -->
1209 1223 
            <ImageView
1210 1224 
                android:id="@+id/window_iv_ad"

+ 1 - 1
app/src/main/res/values/color.xml
Ver fichero 

@ -39,7 +39,7 @@
39 39 
    <color name="tab_lv">#01b637</color>
40 40 
    <color name="tab_hei">#555555</color>
41 41 
    <color name="navpage">#FFE1E8EB</color>
42
42 
    <color name="orange">#FE6200</color>
43 43
44 44
45 45

fix bug · 654911360c - Gogs: Go Git Service
Startseite Erkunden Hilfe
Registrieren Anmelden
dudu
/
cdzApp
Beobachten 2
Favorit hinzufügen 1
Fork 0
Code Issues 0 Pull-Requests 0 Commits 101 Releases 18 Wiki
Quellcode durchsuchen

fix bug

dxh vor 7 Jahren
Ursprung
7c67d39c71
Commit
654911360c
1 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 6 4
      app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java

+ 6 - 4
app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java
Datei anzeigen 

@ -173,11 +173,11 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
173 173 
                                public void accept(List<TalkRecommendBean> list) throws Exception {
174 174 
                                    TalkRecommendBean talkRecommendBean = talkRecommendBeans.get(pos);
175 175
176 
                                    int index =0;
176 
                                    int index = 0;
177 177 
                                    for (int i = 0; i < list.size(); i++) {
178 178 
                                        TalkRecommendBean tmp = list.get(i);
179 
                                        if(tmp.targetType == talkRecommendBean.targetType &&
180 
                                        tmp.targetId ==talkRecommendBean.targetId){
179 
                                        if (tmp.targetType == talkRecommendBean.targetType &&
180 
                                                tmp.targetId == talkRecommendBean.targetId) {
181 181 
                                            index = i;
182 182 
                                            break;
183 183 
                                        }
 
@ -272,7 +272,9 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
272 272 
                    xRefreshView.stopRefresh();
273 273 
                else
274 274 
                    xRefreshView.setLoadComplete(true);
275 
                ToastUtil.showToast(getActivity().getApplicationContext(), "加载失败，请重试", Toast.LENGTH_SHORT);
275 
                if (getActivity() != null) {
276 
                    ToastUtil.showToast(getActivity().getApplicationContext(), "加载失败，请重试", Toast.LENGTH_SHORT);
277 
                }
276 278 
            }
277 279
278 280 
            @Override