修改bug

app/build.gradle

@@ -38,10 +38,10 @@ android {
        multiDexEnabled true
        ndk {
            abiFilters "armeabi-v7a", "arm64-v8a"
//            abiFilters "armeabi"
        }
//        ndk {
//            abiFilters "armeabi-v7a", "arm64-v8a"
//            abiFilters "armeabi-v7a"
//        }
        flavorDimensions "default"
        vectorDrawables.useSupportLibrary = true
        manifestPlaceholders = rootProject.ext.manifestPlaceholders
@@ -108,16 +108,86 @@ android {
    }
    productFlavors {
        yingyongbao {}
        xiaomi {}
        huawei {}
        oppo {}
        cdz {}
        vivo {}
        yingyongbao_32 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "yingyongbao"]
            ndk {
                abiFilters "armeabi-v7a"
            }
        }
        yingyongbao_64 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "yingyongbao"]
            ndk {
                abiFilters "arm64-v8a"
            }
        }
        xiaomi_32 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "xiaomi"]
            ndk {
                abiFilters "armeabi-v7a"
            }
        }
        xiaomi_64 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "xiaomi"]
            ndk {
                abiFilters "arm64-v8a"
            }
        }
        huawei_32 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "huawei"]
            ndk {
                abiFilters "armeabi-v7a"
            }
        }
        huawei_64 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "huawei"]
            ndk {
                abiFilters "arm64-v8a"
            }
        }
        oppo_32 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "oppo"]
            ndk {
                abiFilters "armeabi-v7a"
            }
        }
        oppo_64 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "oppo"]
            ndk {
                abiFilters "arm64-v8a"
            }
        }
        vivo_32 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "vivo"]
            ndk {
                abiFilters "armeabi-v7a"
            }
        }
        vivo_64 {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "vivo"]
            ndk {
                abiFilters "arm64-v8a"
            }
        }
        cdz {
            manifestPlaceholders= [UMENG_CHANNEL_VALUE: "cdz"]
            ndk{
                abiFilters "armeabi-v7a","arm64-v8a"
            }
        }
//        wandoujia {} baidu {} anzhi {} pp {} vivo {} meizu {} sougou {} c360 {}
        productFlavors.all { flavor ->
            flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
            if (name == "vivo") {
           // flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
            if (name.contains("vivo") ) {
                resValue "string", "app_name", "一电充电桩"
                buildConfigField("String","PRIVACY_LINK","\"http://evcharge.cc/pc/privacy-vivo.html\"")
                buildConfigField("String","USER_AGREEMENT_LINK","\"http://evcharge.cc/activity/user-proto-vivo.html\"")

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

@@ -121,6 +121,7 @@ import com.electric.chargingpile.gen.DaoMaster;
import com.electric.chargingpile.gen.DaoSession;
import com.electric.chargingpile.gen.zhan_listDao;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.ActivityManagerApplication;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.DES3S;
@@ -158,6 +159,7 @@ import com.zhy.http.okhttp.callback.StringCallback;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -344,7 +346,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private TextView tv_tishi, paoName, paoName1, paoAddress, paoCostWay, paoDaohang, paoDistance,
            paoFast, paoSlow, paoAlter, paoTotal, tingche, fuwu, dian, tv_grade, tv_shaixuan, tv_recommend_tip,
            tv_daohang, tvOne, tvTwo, tv_num, tvThree, tv_sortDistance, tv_sortStarLevel, iv_list, tv_sortFreeTime;
            tv_daohang, tvOne, tvTwo, tv_num, tvThree, tv_sortDistance, tv_sortStarLevel, iv_list, tv_sortFreeTime,notificationText;
    public static TextView tv_atCity;
    public static RelativeLayout paoRl;
    public static LinearLayout rl_control;
@@ -358,7 +360,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private ListView lvZhan;
    private ZhanAdapter adapter;
    private long exitTime = 0;
    private ImageView iv_clear;
    private ImageView iv_clear,imgActivityCenter;
    private ImageView iv_sceen;
    private ImageView iv_refresh, iv_route;
    private ImageView iv_our;
@@ -646,32 +648,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                //城市站点数量
                case 4:
                    try {
//                        JSONObject jsonObj = new JSONObject(msg.obj.toString());
//                        String data = jsonObj.getString("data");
//                        String time = jsonObj.getString("time");
//                    String pic = jsonObj.getString("pic");
//                        Log.i("data-----",data);
////                    Log.i("pic------",pic);
//                        String zhan_data = DES3.decode(data);
//                        Log.i("zhan_data-----",zhan_data);
//
////                    Log.d("appTime---", DateUtils.getCurrentDate());
//
//                        long phpTime = Long.parseLong(time);
//
//                        Log.i("phpTime(long)---", phpTime+"");
//                        long appTime1 = System.currentTimeMillis()/1000;
//                        Log.i("appTime(long)---", appTime1+"");
//                        cha = appTime1 - phpTime;
//                    SharedPreferences mySharedPreferences= MainFragment.getSharedPreferences("userName",
//                            Activity.MODE_PRIVATE);
//                    SharedPreferences.Editor editor = mySharedPreferences.edit();
//                    editor.putInt("cha", cha);
//                    editor.commit();
//                        Log.d("cha(long)---", cha + "");
                        try {
                            String date = JsonUtils.getKeyResult(msg.obj.toString(), "data");
//                            Log.e("data", date);
@@ -933,6 +909,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
        showPostDelayedDialog();
        getSwitch();
//        ConfirmOrderActivity.actionStart(this);
//        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
//        startActivity(new Intent(this, SkipUserInfoActivity.class));
@@ -1033,6 +1010,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        windowComments = (RelativeLayout) findViewById(R.id.window_rl_comment);
        windowAd = (ImageView) findViewById(R.id.window_iv_ad);
        imgActivityCenter = (ImageView) findViewById(R.id.imgActivityCenter);
        windowGradeImg = (ImageView) findViewById(R.id.window_iv_zhan_grade);
        iv_tuijian_close = (ImageView) findViewById(R.id.iv_tuijian_close);
        iv_tuijian_tip_close = (ImageView) findViewById(R.id.iv_tuijian_tip_close);
@@ -1129,6 +1109,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        tv_sortStarLevel = (TextView) findViewById(R.id.tv_sortStarLevel);
        tv_sortStarLevel.setOnClickListener(this);
        tv_sortFreeTime = (TextView) findViewById(R.id.tv_sortFreeTime);
        notificationText = (TextView) findViewById(R.id.notificationText);
        tv_sortFreeTime.setOnClickListener(this);
        rl_mapList = (RelativeLayout) findViewById(R.id.rl_mapList);
        iv_roadCondition = (ImageView) findViewById(R.id.iv_roadCondition);
@@ -1186,7 +1167,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
////            clickMarker = false;
//            firstOpen = false;
//        }
//        getMessage();
        inBtn = (ImageView) findViewById(R.id.zoomin);
        inBtn.setOnClickListener(this);
@@ -1411,6 +1391,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        if (hasLocationPermission() && center == null && mlocationClient!=null) {
            mlocationClient.startLocation();
        }
        getMessage();
    }
    private void searchAll() {
@@ -3645,68 +3626,56 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    //获取系统消息
    private void getMessage() {
        new Thread(new Runnable() {
            @Override
            public void run() {
                long appTime1 = System.currentTimeMillis() / 1000;
//                Log.i("appTime(long)---", appTime1 + "");
                String token = String.valueOf(appTime1);
//                Log.e("token", token);
                String url = null;
                if (MainApplication.msgTime.equals("0")) {
                    MainApplication.firstOpenTime = token;
                    ProfileManager.getInstance().setFirstOpenTime(getApplicationContext(), token);
                    MainApplication.msgTime = token;
                    ProfileManager.getInstance().setSystemMsgTime(getApplicationContext(), token);
                }
                try {
                    url = MainApplication.url + "/zhannew/basic/web/index.php/zhangonggao/release?timer=" + MainApplication.msgTime;
//                    Log.e("890", url);
                } catch (Exception e) {
                    e.printStackTrace();
                }
                submitMessage(url);
            }
        }).start();
    }
        long appTime1 = System.currentTimeMillis() / 1000;
        String token = String.valueOf(appTime1);
    private void submitMessage(String sms) {
        if (MainApplication.msgTime.equals("0")) {
            MainApplication.firstOpenTime = token;
            ProfileManager.getInstance().setFirstOpenTime(getApplicationContext(), token);
            MainApplication.msgTime = token;
            ProfileManager.getInstance().setSystemMsgTime(getApplicationContext(), token);
        }
        String url = MainApplication.url + "/zhannew/basic/web/index.php/zhangonggao/release2?timer=" + MainApplication.msgTime;
//        Log.e(TAG, "onResponse hc url: "+url);
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
//        Log.e("url", sms);
        Request request = new Request.Builder().url(sms).build();
        Response response = null;
        try {
            if (request == null) {
                Message msg = new Message();
                msg.what = 5;
                hand.sendMessage(msg);
                return;
            }
            response = OkHttpUtil.execute(request);
            if (response.code() == 200) {
                String json = "";
            @Override
            public void onResponse(String response) {
                try {
                    json = response.body().string();
                    Message msg = new Message();
                    msg.obj = json;
                    msg.what = 7;
                    hand.sendMessage(msg);
//                    Log.e("url", json);
                } catch (Exception e) {
                    JSONArray jsonArray=new JSONArray(response);
                    if (jsonArray.length()>0){
                        JSONObject jsonObject = (JSONObject) jsonArray.get(0);
                        String content = jsonObject.optString("content");
                        String url = jsonObject.optString("url");
                        if (rl_charging_notice.getVisibility() != View.VISIBLE){
                            notificationText.setText(content);
                            rl_charging_notice.setOnClickListener(view -> {
                                if (!TextUtils.isEmpty(url)){
                                    Uri.Builder builder = Uri.parse(url).buildUpon();
                                    builder.appendQueryParameter("user_id", MainApplication.userId);
                                    builder.appendQueryParameter("tel", MainApplication.userPhone);
                                    builder.appendQueryParameter("token", MainApplication.userId);
                                    LogUtils.e(builder.toString());
                                    Intent intent = new Intent(getApplicationContext(), MyWebViewActivity.class);
                                    intent.putExtra("url", url);
                                    startActivity(intent);
                                }
                            });
                            rl_charging_notice.setVisibility(View.VISIBLE);
                        }
                    }
                } catch (JSONException e) {
                    e.printStackTrace();
                    Message msg = new Message();
                    msg.what = 5;
                    hand.sendMessage(msg);
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            Message msg = new Message();
            msg.what = 5;
            hand.sendMessage(msg);
        }
        });
    }
    public void MainMapp() {
        eteCityTime("{\"fun\":\"timer\"}");
        clickMarker = false;
@@ -3817,6 +3786,45 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    }
    /**
     * 是否展示 活动中心
     * */
    private void getSwitch(){
        String url =MainApplication.url+"/zhannew/basic/web/index.php/zhangonggao/switch";
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
            }
            @Override
            public void onResponse(String response) {
                String rtnCode = JsonUtils.getKeyResult(response, "code");
                if (!TextUtils.isEmpty(rtnCode) && rtnCode.equals("100")) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    String url = JsonUtils.getKeyResult(response, "url")==null ?"":JsonUtils.getKeyResult(response, "url");
                    if (!TextUtils.isEmpty(data) && data.equals("1")){
                        imgActivityCenter.setVisibility(View.VISIBLE);
                        imgActivityCenter.setOnClickListener(v->{
                            Uri.Builder builder = Uri.parse(url).buildUpon();
                            builder.appendQueryParameter("user_id", MainApplication.userId);
                            builder.appendQueryParameter("tel", MainApplication.userPhone);
                            builder.appendQueryParameter("token", MainApplication.userId);
                            LogUtils.e(builder.toString());
                            Intent intent = new Intent(getApplicationContext(), MyWebViewActivity.class);
                            intent.putExtra("url", url);
                            startActivity(intent);
                        });
                    }else{
                        imgActivityCenter.setVisibility(View.GONE);
                    }
                }
            }
        });
    }
    //登陆状态判断
    private void setlogin() {
        if (TextUtils
@@ -3952,6 +3960,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                    if ("306".equals(rtnCode)) {
                        LogUtils.e("有订单");
                        notificationText.setText("您有一笔订单正在进行中，点击查看详情...");
                        rl_charging_notice.setVisibility(View.VISIBLE);
                        if (firstCheck) {
                            if (isStatusBack == false) {

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

@@ -79,7 +79,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
    private TextView tvSearch;
    private Toast toast = null;
    private EditText etSearch;
    private ImageView ivClear;
    private ImageView ivClear,imgNoData;
    private ListView lvContent;
    private SearchAdapter adapter;
    private List<Map<String, String>> addressList = new ArrayList<Map<String, String>>();
@@ -132,6 +132,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
        ivClear = (ImageView) findViewById(R.id.iv_search_clear);
        ivClear.setOnClickListener(this);
        no_result = findViewById(R.id.no_result);
        imgNoData = findViewById(R.id.imgNoData);
        etSearch = (EditText) findViewById(R.id.et_search);
        etSearch.setOnClickListener(new OnClickListener() {
@@ -214,6 +215,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
                        lvContent.setVisibility(View.GONE);
                    } else {
                        no_result.setVisibility(View.GONE);
                        imgNoData.setVisibility(View.GONE);
                        keyWord = s;
                        doSearchQuery();
                        doPointNameSearchQuery();
@@ -488,8 +490,10 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
                            if (addressList.size() == 0 && pointList.size() == 0) {
                                no_result.setVisibility(View.VISIBLE);
                                imgNoData.setVisibility(View.VISIBLE);
                            } else {
                                no_result.setVisibility(View.GONE);
                                imgNoData.setVisibility(View.GONE);
                            }
                        } catch (Exception e) {
@@ -503,9 +507,12 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
                        if (addressList.size() == 0 && pointList.size() == 0) {
                            no_result.setVisibility(View.VISIBLE);
                            imgNoData.setVisibility(View.VISIBLE);
                        } else {
                            no_result.setVisibility(View.GONE);
                            imgNoData.setVisibility(View.GONE);
                        }
                    }
                }
            } else {
@@ -1020,8 +1027,10 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
                if (addressList.size() == 0 && pointList.size() == 0) {
                    no_result.setVisibility(View.VISIBLE);
                    imgNoData.setVisibility(View.VISIBLE);
                } else {
                    no_result.setVisibility(View.GONE);
                    imgNoData.setVisibility(View.GONE);
                }
            }
        });

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

@@ -664,7 +664,7 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                    MobclickAgent.onEvent(getApplicationContext(), "1093");
//                    startActivity(new Intent(getApplicationContext(), PersonalPageActivity.class));
//                    startActivity(new Intent(getApplicationContext(), UserInfoActivity.class));
                    startActivity(new Intent(getApplicationContext(), UserPageActivity.class));
//                    startActivity(new Intent(getApplicationContext(), UserPageActivity.class));
                }
            });
            ll_userLogin.setVisibility(View.INVISIBLE);
@@ -1609,53 +1609,11 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                    String log_day = JsonUtils.getKeyResult(rtnMsg, "log_day");
                    String score = JsonUtils.getKeyResult(rtnMsg, "plusScore");
                    String third = "", second = "", first = "";
                    int length = log_day.length();
                    char words[] = log_day.toCharArray();
                    if (length == 1) {
                        third = "";
                        second = "";
                        first = String.valueOf(words[0]);
                    } else if (length == 2) {
                        third = "";
                        second = String.valueOf(words[0]);
                        first = String.valueOf(words[1]);
                    } else if (length == 3) {
                        third = String.valueOf(words[0]);
                        second = String.valueOf(words[1]);
                        first = String.valueOf(words[2]);
                    }
//                    String weather = JsonUtils.getKeyResult(rtnMsg,"weather");
////                    Log.e(TAG, "onResponse: weather="+weather );
//                    String status = JsonUtils.getKeyResult(weather,"status");
////                    Log.e(TAG, "onResponse: status="+status );
//                    String results = JsonUtils.getKeyResult(weather,"results");
////                    Log.e(TAG, "onResponse: results="+results );
//                    try {
//                        JSONArray jsArray = new JSONArray(results);
////                        if (jsArray.length() >1) {
//                            String s = jsArray.getString(0);
//                            Log.e(TAG, "onResponse: s=" + s);
//                            String pm25 = JsonUtils.getKeyResult(s, "pm25");//*
//                            Log.e(TAG, "onResponse: pm25=" + pm25);
//                            String weather_data = JsonUtils.getKeyResult(s, "weather_data");
//                            Log.e(TAG, "onResponse: weather_data=" + weather_data);
//                            List<WeatherResults.WeatherDataBean> list = JsonUtils.parseToObjectList(weather_data, WeatherResults.WeatherDataBean.class);
//                            String now_weather = list.get(0).getWeather();//*
//                            String temperature = list.get(0).getTemperature();//*
//                            temperature = temperature.replace(" ", "");
//                            temperature = temperature.substring(0, temperature.length() - 1);
//                            String date = list.get(0).getDate();
//                            String now_temperature = date.substring(date.length() - 4, date.length() - 2);//*
//                            Log.e(TAG, "onResponse: now_weather=" + now_weather + "--temperature=" + temperature + "--now_temperature=" + now_temperature);
                    if (activity == null || activity.isFinishing()) {
                        return;
                    } else {
                        showDialog(third, second, first, score, now_temperature, now_weather, temperature, MainMapActivity.location_city);
                        showDialog(log_day, score, now_temperature, now_weather, temperature, MainMapActivity.location_city);
                    }
@@ -1687,11 +1645,11 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
    }
    private void showDialog(String third, String second, String first, String score, String now_temperature, String now_weather, String temperature, String city) {
    private void showDialog(String log_day, String score, String now_temperature, String now_weather, String temperature, String city) {
        SignInDialog signInDialog = new SignInDialog(this);
        signInDialog.builder()
                .setCancelable(true)
                .setTitle(third, second, first, score, city)
                .setTitle(log_day, score, city)
                .setWeatherUI(now_temperature, now_weather, temperature)
                .show();
    }

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

@@ -267,7 +267,18 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
            @Override
            public void afterTextChanged(Editable s) {
                if (et_pinglun.getText().toString().equals("") && NewZhanDetailsActivity.replaceBlank(et_pinglun.getText().toString()).equals("")) {
                String s1 = et_pinglun.getText().toString();
                s1= s1.replace(" " ,"");
                if (s1.length() >= 5){
                    tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                    tv_make_sure.setEnabled(true);
                }else{
                    tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
                    tv_make_sure.setEnabled(false);
                }
               /* if (s1.equals("") && NewZhanDetailsActivity.replaceBlank(s1).equals("")) {
                    if (!star_level.equals("") && !select_s.equals("")) {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
@@ -276,8 +287,8 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                        tv_make_sure.setEnabled(false);
                    }
                } else {
                    Log.e("edit===", et_pinglun.getText().toString());
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
                    Log.e("edit===", s1);
                    if (s1.equals("#" + MainApplication.huodonglabel + "# ")) {
                        if (!star_level.equals("") && !select_s.equals("")) {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                            tv_make_sure.setEnabled(true);
@@ -290,8 +301,8 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                        tv_make_sure.setEnabled(true);
                    }
                }
                if (!et_pinglun.getText().toString().contains("#" + MainApplication.huodonglabel + "#")) {
                }*/
                if (!s1.contains("#" + MainApplication.huodonglabel + "#")) {
                    final LayoutInflater mInflater = LayoutInflater.from(getApplicationContext());
                    mFlowLayoutTwo.setAdapter(new TagAdapter<String>(mValss) {
                        @Override
@@ -317,29 +328,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                star_level = String.valueOf(RatingScore);
                mFlowLayout.setVisibility(View.VISIBLE);
                select_s = "";
                if (et_pinglun.getText().toString().equals("") && NewZhanDetailsActivity.replaceBlank(et_pinglun.getText().toString()).equals("")) {
                    if (!star_level.equals("") && !select_s.equals("")) {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
                    } else {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
                        tv_make_sure.setEnabled(false);
                    }
                } else {
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
                        if (!star_level.equals("") && !select_s.equals("")) {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                            tv_make_sure.setEnabled(true);
                        } else {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
                            tv_make_sure.setEnabled(false);
                        }
                    } else {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
                    }
                }
                switch (RatingScore) {
                    case 1:
                        if (!MainApplication.level_one.equals("")) {
@@ -413,31 +402,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                    select_ss = MainApplication.huodonglabel;
                    setTopic();
                }
                if (et_pinglun.getText().toString().equals("") && NewZhanDetailsActivity.replaceBlank(et_pinglun.getText().toString()).equals("")) {
                    if (!star_level.equals("") && !select_s.equals("")) {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
                    } else {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
                        tv_make_sure.setEnabled(false);
                    }
                } else {
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
//                        tv_make_sure.setBackgroundResource(R.color.huise);
//                        tv_make_sure.setEnabled(false);
                        if (!star_level.equals("") && !select_s.equals("")) {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                            tv_make_sure.setEnabled(true);
                        } else {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
                            tv_make_sure.setEnabled(false);
                        }
                    } else {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
                    }
                }
//                Toast.makeText(getApplicationContext(), mVals[position], Toast.LENGTH_SHORT).show();
                return true;
            }
@@ -646,29 +611,6 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                }
                Log.e("select===", select_s);
                if (et_pinglun.getText().toString().equals("") && NewZhanDetailsActivity.replaceBlank(et_pinglun.getText().toString()).equals("")) {
                    if (!star_level.equals("") && !select_s.equals("")) {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
                    } else {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
                        tv_make_sure.setEnabled(false);
                    }
                } else {
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
                        if (!star_level.equals("") && !select_s.equals("")) {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                            tv_make_sure.setEnabled(true);
                        } else {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.huise));
                            tv_make_sure.setEnabled(false);
                        }
                    } else {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
                    }
                }
                return true;
            }
        });
@@ -1223,8 +1165,8 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                new Thread(new Runnable() {
                    @Override
                    public void run() {
                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                        tv_make_sure.setEnabled(true);
//                        tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
//                        tv_make_sure.setEnabled(true);
                    }
                }).start();
@@ -1235,10 +1177,10 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
    @Override
    protected void onResume() {
        super.onResume();
        if (Bimp.tempSelectBitmap.size() > 0) {
            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
            tv_make_sure.setEnabled(true);
        }
//        if (Bimp.tempSelectBitmap.size() > 0) {
//            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
//            tv_make_sure.setEnabled(true);
//        }
        mAdapter.notifyDataSetChanged();
        if (mInsterType == 1 && mAdapter.getItemCount() == 1) {

app/src/main/java/com/electric/chargingpile/adapter/CommentTopicAdapter.java

@@ -58,8 +58,8 @@ public class CommentTopicAdapter extends RecyclerView.Adapter<CommentTopicAdapte
        holder.title.setText(data.getMeg());
        holder.participateText.setText(Util.convetW(data.getPartake_number(),"暂无","车主参与"));
        holder.onlookersText.setText(Util.convetW(data.getLook_number(),"暂无","车主围观"));
        holder.participateText.setText(data.getPartake_number());
        holder.onlookersText.setText(data.getLook_number());
        holder.itemView.setOnClickListener(v->{
            if (mListener!=null)

app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java

@@ -156,14 +156,6 @@ public class NewPingLunAdapter extends BaseAdapter {
        {
            final View finalConvertView2 = convertView;
            try {
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                if (!TextUtils.isEmpty(is_play) && is_play.equals("1")){
                    convertView.setVisibility(View.VISIBLE);
                }else{
                    convertView.setVisibility(View.GONE);
                }
//                "fileUrl":"","thumUrl":""
                //父级评论图片
                String fileUrl = datas.get(position).getString("fileUrl");

app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java

@@ -433,13 +433,8 @@ public class ZhanCommentsAapter extends BaseAdapter {
                    }
                });
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
                if (!TextUtils.isEmpty(is_play) && is_play.equals("1")){
                    convertView.setVisibility(View.VISIBLE);
                }else{
                    convertView.setVisibility(View.GONE);
                }
                //父级评论图片
                String fileUrl = datas.get(position).getString("fileUrl");
@@ -448,7 +443,6 @@ public class ZhanCommentsAapter extends BaseAdapter {
                fileUrl = fileUrl == null?"":fileUrl;
                file2Url= file2Url == null?"":file2Url;
                file3Url= file3Url == null?"":file3Url;
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
                if (type.equals("23")){
                    holder.imgVideo.setVisibility(View.VISIBLE);
                    holder.imgStart.setVisibility(View.VISIBLE);

app/src/main/java/com/electric/chargingpile/fragment/NewMyMessageFragment.java

@@ -136,7 +136,12 @@ public class NewMyMessageFragment extends Fragment {
                                    JSONObject jsonObject4 = (JSONObject) jsonArray
                                            .opt(j);
                                    String is_play = TextUtils.isEmpty( jsonObject4.getString("is_play"))?"": jsonObject4.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    if (is_play.equals("1")){
                                    String type = TextUtils.isEmpty(jsonObject4.getString("type"))?"":jsonObject4.getString("type"); //23 视频，24 图片
                                    if (type.equals("23")){
                                        if (is_play.equals("1")){
                                            datas.add(jsonObject4);
                                        }
                                    }else{
                                        datas.add(jsonObject4);
                                    }
                                }

app/src/main/java/com/electric/chargingpile/fragment/ZhanCommentFragment.java

@@ -229,7 +229,7 @@ public class ZhanCommentFragment extends Fragment {
    public void initCommentData(RankinglistRefreshEvent event) {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
//        String url = MainApplication.url+"/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
//        Log.e(TAG, "getCommentsData=" + url);
        Log.e(TAG, "getCommentsData=" + url);
        OkHttpUtils.get().url(url)
                .build().connTimeOut(6000).readTimeOut(6000)
                .execute(new StringCallback() {
@@ -256,7 +256,12 @@ public class ZhanCommentFragment extends Fragment {
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    if (is_play.equals("1")){
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
                                    if (type.equals("23")){
                                        if (is_play.equals("1")){
                                            datas.add(jsonObject);
                                        }
                                    }else {
                                        datas.add(jsonObject);
                                    }
                                }
@@ -309,9 +314,14 @@ public class ZhanCommentFragment extends Fragment {
                                JSONArray jsonArray = new JSONArray(commentData);
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    if (is_play.equals("1")){
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
                                     if (type.equals("23")){
                                        if (is_play.equals("1")){
                                            datas.add(jsonObject);
                                        }
                                    }else{
                                        datas.add(jsonObject);
                                    }
                                }

app/src/main/java/com/electric/chargingpile/util/CarTypeUtil.java

@@ -26,6 +26,8 @@ public class CarTypeUtil {
                        name0 = strarray[0];
                    }
                    car = name0 + name1;
                }else{
                    car=s;
                }
            }
        }catch (Exception e) {

app/src/main/java/com/electric/chargingpile/view/SignInDialog.java

@@ -1,6 +1,8 @@
package com.electric.chargingpile.view;
import android.content.Context;
import android.text.Html;
import android.text.TextUtils;
import android.view.Display;
import android.view.LayoutInflater;
import android.view.View;
@@ -19,7 +21,7 @@ public class SignInDialog {
    private Context context;
    private android.app.Dialog dialog;
    private Display display;
    private TextView tv_num, tv_third, tv_second, tv_first, tv_now_temperature, tv_du, tv_w, tv_pm, tv_city;
    private TextView tv_num, tv_third, tv_second, tv_first, tv_now_temperature, tv_du, tv_w, tv_pm, tv_city,tv_2;
    private LinearLayout dialog_bg;
    public SignInDialog(Context context) {
@@ -37,6 +39,7 @@ public class SignInDialog {
        // 获取自定义Dialog布局中的控件
        dialog_bg = (LinearLayout) view.findViewById(R.id.dialog_bg);
        tv_num = (TextView) view.findViewById(R.id.tv_num);
        tv_2 = (TextView) view.findViewById(R.id.tv_2);
        tv_third = (TextView) view.findViewById(R.id.tv_third);
        tv_second = (TextView) view.findViewById(R.id.tv_second);
        tv_first = (TextView) view.findViewById(R.id.tv_first);
@@ -59,13 +62,33 @@ public class SignInDialog {
        return this;
    }
    public SignInDialog setTitle(String third, String second, String first, String score, String city) {
        if (score != null && !score.equals("")) {
            tv_num.setText(score);
        } else {
            tv_num.setText("");
    public SignInDialog setTitle(String log_day, String score, String city) {
        String third = "", second = "", first = "";
        if (TextUtils.isEmpty(log_day)){
            log_day="1";
        }
        tv_num.setText(score);
        int length = log_day.length();
        char words[] = log_day.toCharArray();
        if (length == 1) {
            third = "";
            second = "";
            first = String.valueOf(words[0]);
        } else if (length == 2) {
            third = "";
            second = String.valueOf(words[0]);
            first = String.valueOf(words[1]);
        } else if (length == 3) {
            third = String.valueOf(words[0]);
            second = String.valueOf(words[1]);
            first = String.valueOf(words[2]);
        }
        if (third.equals("")) {
            tv_third.setText("0");
        } else {
@@ -83,6 +106,21 @@ public class SignInDialog {
        } else {
            tv_first.setText(first);
        }
        if (score != null && !score.equals("")) {
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币"));
            int i = 7 - Integer.parseInt(log_day);
            if (i>=0){
                tv_2.setText("还有"+ i+"天获得充电优惠哦~");
            }
        } else {
            tv_num.setText("");
        }
        if (Integer.parseInt(log_day)>= 7){
            tv_num.setText("充电订单折扣优惠券已到账");
            tv_2.setText("充电订单八折");
        }
        return this;
    }

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

@@ -1497,6 +1497,9 @@
            android:visibility="gone">
            <TextView
                android:id="@+id/notificationText"
                android:maxLines="1"
                android:ellipsize="end"
                android:layout_width="match_parent"
                android:layout_height="27dp"
                android:drawableLeft="@drawable/icon_main_order"
@@ -1620,6 +1623,18 @@
                tools:visibility="visible" />
            <ImageView
                android:layout_centerVertical="true"
                android:id="@+id/imgActivityCenter"
                android:layout_width="80dp"
                android:layout_height="80dp"
                android:layout_alignParentRight="true"
                android:layout_marginTop="30dp"
                android:layout_marginRight="12dp"
                android:src="@drawable/ic_activity_center"
                android:visibility="gone"
                tools:visibility="visible" />
            <ImageView
                android:id="@+id/iv_route"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"

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

@@ -1,20 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <TextView
        android:id="@+id/no_result"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:gravity="center"
        android:text="没有匹配到搜索结果"
        android:textColor="#999999"
        android:visibility="gone"
        tools:visibility="visible"
        android:textSize="16sp" />
    <com.zhy.autolayout.AutoLinearLayout
        android:id="@+id/autoLinearLayout"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@color/activity_bgcolor"
@@ -189,5 +181,30 @@
            android:listSelector="@color/transparent" />
    </com.zhy.autolayout.AutoLinearLayout>
    <ImageView
        android:id="@+id/imgNoData"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:src="@drawable/ic_no_data_search"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        android:visibility="gone"
        app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" />
    <TextView
        android:layout_marginTop="28dp"
        android:id="@+id/no_result"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:gravity="center"
        android:text="小主没有您要的内容，请重新输入试试"
        android:textColor="#999999"
        android:textSize="16sp"
        android:visibility="gone"
        app:layout_constraintStart_toStartOf="@+id/imgNoData"
        app:layout_constraintEnd_toEndOf="@+id/imgNoData"
        app:layout_constraintTop_toBottomOf="@+id/imgNoData"
        tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -189,7 +189,7 @@
                android:layout_marginBottom="7dp"
                android:background="@color/white"
                android:gravity="left|top"
                android:hint="对本次充电感受如何？跟其他车友分享一下吧～"
                android:hint="您的充电体验、站点吐槽、充电趣事，来和其他车友分享吧~"
                android:paddingLeft="15dp"
                android:paddingTop="12dp"
                android:paddingRight="15dp"

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

@@ -158,28 +158,12 @@
            android:layout_marginBottom="6dp">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="今天签到获得"
                android:textSize="16sp"
                android:textColor="@color/ui_62"/>
            <TextView
                android:id="@+id/tv_num"
                android:layout_width="wrap_content"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text=""
                android:textSize="16sp"
                android:textColor="@color/lvse"/>
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="个充电币"
                android:textSize="16sp"
                android:textColor="@color/ui_62"/>
                android:textColor="@color/ui_62"
                android:textSize="16sp" />
        </LinearLayout>
        <TextView

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

@@ -63,6 +63,7 @@
                    android:orientation="horizontal">
                    <TextView
                        android:layout_gravity="center_vertical"
                        android:id="@+id/tv_pname"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
@@ -75,6 +76,7 @@
                        tools:text="gin" />
                    <ImageView
                        android:layout_gravity="center_vertical"
                        android:id="@+id/certified_icon"
                        android:layout_width="18dp"
                        android:layout_height="18dp"
@@ -83,6 +85,7 @@
                        android:src="@drawable/certified_icon" />
                    <TextView
                        android:layout_gravity="center_vertical"
                        android:id="@+id/tv_pcar"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"

app/src/main/res/values/strings.xml

@@ -18,7 +18,7 @@
    <string name="updated_at">上次更新于%1$s前</string>
    <string name="updated_just_now">刚刚更新</string>
    <string name="time_error">时间有问题</string>
    <string name="string_tab_qa">社区</string>
    <string name="string_tab_qa">互助</string>
    <string name="main_name">主界面</string>