代码更新

app/build.gradle

@@ -63,11 +63,11 @@ android {
    buildTypes {
        debug {
            //是否优化zip
            zipAlignEnabled true
            zipAlignEnabled false
            // 移除无用的resource文件
//            shrinkResources true
            //启用代码混淆  debug 模式下需要设置为false，否则无法看到局部变量的值
            minifyEnabled true
            minifyEnabled false
            //混淆规则配置文件
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
            signingConfig signingConfigs.release

app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@@ -552,15 +552,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                                    if (center != null) {
                                        for (int i = 0; i < list.size(); i++) {
                                            String wei = list.get(i).getPoi_wei().trim();
//                                            String wei = "39.896712151452";
                                            String jing = list.get(i).getPoi_jing().trim();
//
                                            int position_jing = jing.length() - jing.indexOf(".") - 1;
                                            int position_wei = wei.length() - wei.indexOf(".") - 1;
                                            LatLng ll;
                                            if (position_jing > 13 || position_wei > 13) {
                                                ll = new LatLng(Double.parseDouble(wei), Double.parseDouble(jing));
@@ -1761,9 +1755,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            //mLocationOption.setWifiActiveScan(false);
            mLocationOption.setWifiScan(true);
            mlocationClient.startLocation();
        }
    }
    @Override
@@ -3024,7 +3016,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                }
                MobclickAgent.onEvent(getApplicationContext(), "0107");
                startActivity(new Intent(getApplicationContext(), NewSelectCityActivity.class));
//                startActivityForResult(new Intent(getApplication(), SelectCityActivity.class), SEARCH_CODE);
                if (ll_tuijian.getVisibility() == View.VISIBLE) {
                    ll_tuijian.setVisibility(View.GONE);
                    rl_tuijian_tip.setVisibility(View.VISIBLE);
@@ -3153,8 +3144,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    windowLayout.setVisibility(View.GONE);
                    rl_control.setVisibility(View.VISIBLE);
                }
//                windowLayout.setVisibility(View.GONE);
//                rl_control.setVisibility(View.VISIBLE);
                if (null != current_chargePoint) {
                    resetMarker();
                }
@@ -3975,7 +3964,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                }
            }, 500);
//            aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
            if (search_marker != null) {
                search_marker.remove();
            }
@@ -3991,7 +3979,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        } else if (requestCode == SEARCH_CODE && resultCode == 102) {
            double jing = Double.valueOf(data.getStringExtra("jing"));
            double wei = Double.valueOf(data.getStringExtra("wei"));
//            Log.e("---------!", "jing=" + Double.valueOf(data.getStringExtra("jing")) + "--wei=" + Double.valueOf(data.getStringExtra("wei")));
            final LatLng screenCity = new LatLng(wei, jing);
            aMap = mapView.getMap();
            Util.setMapCustomStyleFile(aMap, getApplicationContext());
@@ -4001,12 +3988,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(screenCity, 14.0f));
                }
            }, 500);
//            aMap.moveCamera(CameraUpdateFactory.newLatLng(screenCity));
//            aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
        }
    }
@@ -5253,7 +5234,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            fenshi_info_textview.setText("");
        }
        if (belong_attribute!=null && belong_attribute.contains("私人")) {
        if (belong_attribute != null && belong_attribute.contains("私人")) {
            private_telephone.setVisibility(View.VISIBLE);
            private_telephone.setOnClickListener(new View.OnClickListener() {
                @Override

app/src/main/java/com/electric/chargingpile/activity/RecommendZhanActivity.java

@@ -325,9 +325,6 @@ public class RecommendZhanActivity extends Activity implements View.OnClickListe
                canRefresh = true;
            }
        }
        LogUtils.e("+++++++");
//        center_jing = String.valueOf(cameraPosition.target.longitude);
//        center_wei = String.valueOf(cameraPosition.target.latitude);
    }
    @Override

app/src/main/java/com/electric/chargingpile/activity/SearchActivity.java

@@ -76,7 +76,6 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
    private View convertView = null;
    private boolean stype = true;
    InputMethodManager imm;
    private LinearLayout ll_menu;
    ListView historyList;
@@ -93,7 +92,6 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_search);
        BarColorUtil.initStatusBarColor(SearchActivity.this);
        stype = getIntent().getBooleanExtra("searchtype", true);
        initView();
    }
@@ -190,17 +188,13 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
            }
        });
        String search_address = ProfileManager.getInstance().getSearchAddress(this);
        Log.e("222", search_address);
        if (search_address.equals("")) {
            Log.e(TAG, "默认");
            etSearch.setText("");
        } else {
            Log.e(TAG, search_address);
            etSearch.setText(search_address);
            etSearch.setSelection(etSearch.getText().length());
        }
        lvContent.setOnScrollListener(new AbsListView.OnScrollListener() {
            @Override
            public void onScrollStateChanged(AbsListView view, int scrollState) {
@@ -231,6 +225,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
        adapter = new SearchAdapter(this, list);
        lvContent.setAdapter(adapter);
        // 点击历史记录
        historyList.setOnItemClickListener(new OnItemClickListener() {
            @Override
            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -250,47 +245,38 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
        });
        lvContent.setOnItemClickListener(new OnItemClickListener() {
            @Override
            public void onItemClick(AdapterView<?> parent, View view,
                                    int position, long id) {
                if (stype) {
                    DBOpenHandler db = new DBOpenHandler(SearchActivity.this, "");
                    db.queryOne(etSearch.getText().toString());
                    ContentValues values = new ContentValues();
                    values.put("time", System.currentTimeMillis());
                    values.put("keyword", list.get(position).get("name"));
                    values.put("type", list.get(position).get("address"));
                    values.put("jing", list.get(position).get("jing"));
                    values.put("wei", list.get(position).get("wei"));
                    db.insert(values);
                    Cursor c = db.query();
                    System.err.println(c.getCount());
                    if (c.getCount() <= 0) {
                        return;
                    }
                    String[] from = {"keyword", "type"};
                    int[] to = {R.id.search_name, R.id.search_address};
                    SimpleCursorAdapter historyAdapter = new SimpleCursorAdapter(SearchActivity.this, R.layout.history_item, c, from, to, 0);
                    historyList.setAdapter(historyAdapter);
                    Intent intent = new Intent();
                    intent.putExtra("zhan_name", list.get(position).get("name"));
                    intent.putExtra("jing", list.get(position).get("jing"));
                    intent.putExtra("wei", list.get(position).get("wei"));
                    ProfileManager.getInstance().setSearchAddress(getApplicationContext(), list.get(position).get("name"));
                    setResult(101, intent);
                    View v = getWindow().peekDecorView();
                    if (v != null) {
                        imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
                    }
                    finish();
                } else {
                    Intent intent = new Intent(SearchActivity.this,
                            ZhanDetailsNew.class);
                    intent.putExtra("zhan", mList.get(position));
                    startActivity(intent);
            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                DBOpenHandler db = new DBOpenHandler(SearchActivity.this, "");
                db.queryOne(etSearch.getText().toString());
                ContentValues values = new ContentValues();
                values.put("time", System.currentTimeMillis());
                values.put("keyword", list.get(position).get("name"));
                values.put("type", list.get(position).get("address"));
                values.put("jing", list.get(position).get("jing"));
                values.put("wei", list.get(position).get("wei"));
                db.insert(values);
                Cursor c = db.query();
                System.err.println(c.getCount());
                if (c.getCount() <= 0) {
                    return;
                }
                String[] from = {"keyword", "type"};
                int[] to = {R.id.search_name, R.id.search_address};
                SimpleCursorAdapter historyAdapter = new SimpleCursorAdapter(SearchActivity.this, R.layout.history_item, c, from, to, 0);
                historyList.setAdapter(historyAdapter);
                Intent intent = new Intent();
                intent.putExtra("zhan_name", list.get(position).get("name"));
                intent.putExtra("jing", list.get(position).get("jing"));
                intent.putExtra("wei", list.get(position).get("wei"));
                ProfileManager.getInstance().setSearchAddress(getApplicationContext(), list.get(position).get("name"));
                setResult(101, intent);
                View v = getWindow().peekDecorView();
                if (v != null) {
                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
                }
                finish();
            }
        });
        try {
@@ -499,24 +485,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
            viewHolder.name.setText(list.get(position).get("name"));
            viewHolder.address.setText(list.get(position).get("address"));
            if (stype) {
                viewHolder.zhan.setVisibility(View.GONE);
            } else {
                viewHolder.zhan.setVisibility(View.VISIBLE);
                if (!TextUtils.isEmpty(list.get(position).get("url"))) {
                    ImageLoader.getInstance().init(ImageLoaderConfiguration.createDefault(SearchActivity.this));
                    DisplayImageOptions.Builder builder = new DisplayImageOptions.Builder();
                    builder.cacheInMemory(true);
                    builder.cacheOnDisc(true);
                    builder.showStubImage(R.drawable.image_default);
                    builder.showImageForEmptyUri(R.drawable.image_default);
                    builder.showImageOnFail(R.drawable.image_default);
                    builder.displayer(new RoundedBitmapDisplayer(0));
                    ImageLoader.getInstance().displayImage(list.get(position).get("url"), viewHolder.zhan, builder.build());
                } else {
                    viewHolder.zhan.setImageResource(R.drawable.image_default);
                }
            }
            viewHolder.zhan.setVisibility(View.GONE);
            return convertView;
        }

app/src/main/res/layout/activity_main_map.xml

@@ -8,9 +8,7 @@
    android:focusable="true"
    tools:context="com.electric.chargingpile.activity.MainMapActivity">
    //标题搜索栏布局
    <!-- 标题搜索栏布局 -->
    <LinearLayout
        android:id="@+id/ll_title"
        android:layout_width="match_parent"
@@ -18,7 +16,6 @@
        android:layout_alignParentTop="true"
        android:background="@color/white">
        <ImageView
            android:id="@+id/iv_right"
            android:layout_width="wrap_content"
@@ -113,7 +110,6 @@
                android:src="@drawable/icon_edit_delete2_0" />
        </RelativeLayout>
        <TextView
            android:id="@+id/fragment_right_title"
            android:layout_width="wrap_content"
@@ -269,9 +265,7 @@
            android:fadingEdge="none"
            android:listSelector="@color/transparent"
            android:visibility="visible"></ListView>
        //列表页内容为空时的提示
        <!-- 列表页内容为空时的提示 -->
        <TextView
            android:id="@+id/tv_tishi"
            android:layout_width="wrap_content"
@@ -284,13 +278,8 @@
            android:textColor="@color/ui_68"
            android:textSize="15sp"
            android:visibility="gone" />
    </com.zhy.autolayout.AutoRelativeLayout>
    //底部tab布局
    <!-- 底部tab布局 -->
    <LinearLayout
        android:id="@+id/ll_tab"
        android:layout_width="match_parent"
@@ -300,7 +289,6 @@
        android:orientation="horizontal"
        android:visibility="visible">
        <LinearLayout
            android:id="@+id/tab_main"
            android:layout_width="0dp"
@@ -325,7 +313,6 @@
                android:text="首页"
                android:textColor="@color/ui_64"
                android:textSize="10sp" />
        </LinearLayout>
        <LinearLayout
@@ -402,7 +389,6 @@
                android:src="@drawable/icon_havemessage1201"
                android:visibility="gone" />
            <TextView
                android:id="@+id/tv_find"
                android:layout_width="wrap_content"
@@ -467,9 +453,7 @@
        </LinearLayout>
    </LinearLayout>
    //点击站点弹出框布局
    <!-- 点击站点弹出框布局 -->
    <com.zhy.autolayout.AutoLinearLayout
        android:id="@+id/linearLayout"
        android:layout_width="fill_parent"
@@ -554,8 +538,6 @@
                        android:gravity="center"
                        android:textColor="#ffa900"
                        android:textSize="14sp" />
                </com.zhy.autolayout.AutoRelativeLayout>
@@ -1173,32 +1155,35 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal">
                <TextView
                    android:id="@+id/window_tv_zhan_cost"
                    android:layout_width="0dp"
                    android:layout_weight="1"
                    android:layout_height="wrap_content"
                    android:layout_marginLeft="15dp"
                    android:layout_marginBottom="5dp"
                    android:layout_marginTop="20dp"
                    android:layout_marginBottom="5dp"
                    android:layout_weight="1"
                    android:text=""
                    android:textColor="@color/ui_62"
                    android:textSize="14sp"
                    tools:text="可使用本APP扫码支付" />
                <LinearLayout
                    android:visibility="gone"
                    tools:visibility="visible"
                    android:id="@+id/private_telephone"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:visibility="gone"
                    tools:background="#00ff00"
                    android:layout_height="wrap_content">
                    tools:visibility="visible">
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginLeft="15dp"
                        android:layout_marginTop="20dp"
                        android:layout_marginRight="15dp"
                        android:layout_marginBottom="5dp"
                        android:layout_marginLeft="15dp"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:src="@drawable/icon_detail_tel" />
                </LinearLayout>
            </LinearLayout>
@@ -1460,8 +1445,6 @@
        android:visibility="gone" />
    <!-- 地图状态控制布局 -->
    <!-- 站点提示框布局 -->
    <RelativeLayout
@@ -1556,7 +1539,6 @@
            android:layout_marginTop="12dp"
            android:paddingRight="15dp"
            android:src="@drawable/icon_example_main" />
    </LinearLayout>
    <!-- 推荐更详细哦 -->
    <ImageView
@@ -1665,8 +1647,6 @@
                android:src="@drawable/icon_tuijian"
                android:visibility="visible"
                tools:visibility="visible" />
        </RelativeLayout>
        <RelativeLayout
@@ -1699,11 +1679,7 @@
                android:layout_centerVertical="true"
                android:layout_marginRight="15dp"
                android:src="@drawable/icon_tuijian_tip_close" />
        </RelativeLayout>
    </LinearLayout>
    <ImageView
@@ -1733,8 +1709,6 @@
                android:layout_alignParentRight="true"
                android:layout_marginRight="12dp"
                android:src="@drawable/icon_tuijian_close" />
        </RelativeLayout>
        <LinearLayout
@@ -1784,12 +1758,8 @@
                    android:text="点击这里反馈"
                    android:textColor="#2883ff"
                    android:textSize="14sp" />
            </LinearLayout>
        </RelativeLayout>
    </LinearLayout>
    <!-- 首页弹出广告布局 start -->
@@ -1823,7 +1793,6 @@
    </com.zhy.autolayout.AutoRelativeLayout>
    <!-- 首页弹出广告布局 end -->
    <!-- 首页首次启动弹出隐私协议 start -->
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/rl_privacy_protocol"
@@ -1868,11 +1837,7 @@
                android:background="@color/transparent"
                app:layout_constraintBottom_toTopOf="@+id/private_protocol_sure_and_go"
                app:layout_constraintLeft_toLeftOf="parent" />
        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>
    <!-- 首页首次启动弹出隐私协议 end -->
</RelativeLayout>