huyuguo преди 4 години
родител
ревизия
06d8b7460a

+ 3 - 3
app/build.gradle

@ -19,7 +19,7 @@ android {
19 19
        }
20 20
    }
21 21
    compileSdkVersion 29
22
    buildToolsVersion '29.0.0'
22
    buildToolsVersion '29.0.2'
23 23
24 24
    aaptOptions.cruncherEnabled = false
25 25
    aaptOptions.useNewCruncher = false
@ -86,7 +86,7 @@ android {
86 86
    }
87 87
88 88
    dexOptions {
89
        javaMaxHeapSize "5g"
89
        javaMaxHeapSize "8g"
90 90
    }
91 91
    packagingOptions {
92 92
        exclude 'META-INF/DEPENDENCIES.txt'
@ -227,7 +227,7 @@ dependencies {
227 227
    // 库过期,下载源码修改
228 228
    //    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
229 229
    implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.6'
230
    implementation files('libs/bugly_crash_release_3.2.2.jar')
230
//    implementation files('libs/bugly_crash_release_3.2.2.jar')
231 231
    implementation "androidx.camera:camera-camera2:1.0.0-beta03"
232 232
    implementation "androidx.camera:camera-core:1.0.0-beta03"
233 233
//    implementation 'com.github.chrisbanes:PhotoView:2.3.0'

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

@ -1973,15 +1973,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1973 1973
                    long mub = db.replace("zhan_list", null, cv);
1974 1974
                    if (mub > 0) {
1975 1975
                        ProfileManager.getInstance().setDataUptime(getApplicationContext(), bean.getUptime());
1976
                        if (bean.getId().equals("10005111125822") ) {
1977
                            LogUtils.e( "xxxxxxxxxxxxxxxxxxxxxxxxxx" + bean.getId());
1978
                        }
1979
                        if (i == list.size() -1) {
1980
                            LogUtils.e( "uptime = " + bean.getUptime());
1981
                        }
1982 1976
//                        LogUtils.e("添加成功: id = " + bean.getId() + ", uptime = " + ProfileManager.getInstance().getDataUptime(getApplicationContext()));
1983 1977
                    } else {
1984
                        LogUtils.e( "添加失败---" + bean.getId());
1978
//                        LogUtils.e("添加失败---" + bean.getId());
1985 1979
                    }
1986 1980
                }
1987 1981
                db.setTransactionSuccessful();//调用此方法会在执行到endTransaction() 时提交当前事务,如果不调用此方法会回滚事务
@ -5416,23 +5410,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
5416 5410
            }
5417 5411
        });
5418 5412
5419
//        windowLayout.setOnClickListener(new View.OnClickListener() {
5420
//            @Override
5421
//            public void onClick(View view) {
5422
//                Intent intent = new Intent(getApplication(), NewZhanDetailsActivity.class);
5423
//                intent.putExtra("zhan_id", id);
5424
//                intent.putExtra("poi_jing", poi_jing);
5425
//                intent.putExtra("poi_wei", poi_wei);
5426
//                startActivity(intent);
5427
//                MainMapActivity.isR = true;
5428
//                HashMap<String, String> map = new HashMap<String, String>();
5429
//                map.put("type", "详情");
5430
//                MobclickAgent.onEvent(context, "0102", map);
5431
//                map.clear();
5432
//            }
5433
//        });
5434
5435
5436 5413
        windowLayout.setOnTouchListener(new View.OnTouchListener() {
5437 5414
            @Override
5438 5415
            public boolean onTouch(View view, MotionEvent motionEvent) {

+ 23 - 0
app/src/main/java/com/electric/chargingpile/data/UpdateZhanDataBean.java

@ -179,4 +179,27 @@ public class UpdateZhanDataBean implements Serializable {
179 179
    public void setZhuang_num(String zhuang_num) {
180 180
        this.zhuang_num = zhuang_num;
181 181
    }
182
183
    @Override
184
    public String toString() {
185
        return "UpdateZhanDataBean{" +
186
                "belong_attribute='" + belong_attribute + '\'' +
187
                ", charge_cost_way='" + charge_cost_way + '\'' +
188
                ", city='" + city + '\'' +
189
                ", fast_num='" + fast_num + '\'' +
190
                ", id='" + id + '\'' +
191
                ", open_object='" + open_object + '\'' +
192
                ", own_pay='" + own_pay + '\'' +
193
                ", poi_jing='" + poi_jing + '\'' +
194
                ", poi_wei='" + poi_wei + '\'' +
195
                ", slow_num='" + slow_num + '\'' +
196
                ", status='" + status + '\'' +
197
                ", stop_cost='" + stop_cost + '\'' +
198
                ", suit_car='" + suit_car + '\'' +
199
                ", supplier='" + supplier + '\'' +
200
                ", total_num='" + total_num + '\'' +
201
                ", uptime='" + uptime + '\'' +
202
                ", zhuang_num='" + zhuang_num + '\'' +
203
                '}';
204
    }
182 205
}

+ 0 - 1
build.gradle

@ -8,7 +8,6 @@ buildscript {
8 8
//        appKey = 'mnhwhy8jP7Fq2G6b' // 注册时分配的App Key
9 9
//    }
10 10
    repositories {
11
12 11
        jcenter()
13 12
        google()
14 13
    }