huyuguo %!s(int64=5) %!d(string=hace) años
padre
commit
81b9235e20

+ 1 - 0
app/src/main/assets/ShareSDK.xml

46
<Telecom Enable="false" />
46
<Telecom Enable="false" />
47
<Accountkit Enable="false" />
47
<Accountkit Enable="false" />
48
<Douyin Enable="false" />
48
<Douyin Enable="false" />
49
<Wework Enable="false" />
49
</DevInfor>
50
</DevInfor>

+ 5 - 1
app/src/main/java/com/electric/chargingpile/activity/ChatActivity.java

135
135
136
        if (page == 0) {
136
        if (page == 0) {
137
            act_bar_title_recommend.setTextColor(getResources().getColor(R.color.ui_62));
137
            act_bar_title_recommend.setTextColor(getResources().getColor(R.color.ui_62));
138
139
            act_bar_title_help.setTextColor(getResources().getColor(R.color.ui_68));
138
            act_bar_title_help.setTextColor(getResources().getColor(R.color.ui_68));
140
            act_bar_help_question.setVisibility(View.GONE);
139
            act_bar_help_question.setVisibility(View.GONE);
141
            act_bar_help_search.setVisibility(View.GONE);
140
            act_bar_help_search.setVisibility(View.GONE);
141
            MobclickAgent.onEvent(getApplicationContext(), "1001");
142
142
143
        } else {
143
        } else {
144
            act_bar_title_recommend.setTextColor(getResources().getColor(R.color.ui_68));
144
            act_bar_title_recommend.setTextColor(getResources().getColor(R.color.ui_68));
146
            act_bar_title_help.setTextColor(getResources().getColor(R.color.ui_62));
146
            act_bar_title_help.setTextColor(getResources().getColor(R.color.ui_62));
147
            act_bar_help_question.setVisibility(View.VISIBLE);
147
            act_bar_help_question.setVisibility(View.VISIBLE);
148
            act_bar_help_search.setVisibility(View.VISIBLE);
148
            act_bar_help_search.setVisibility(View.VISIBLE);
149
            MobclickAgent.onEvent(getApplicationContext(), "1003");
149
        }
150
        }
150
    }
151
    }
151
152
154
        switch (v.getId()) {
155
        switch (v.getId()) {
155
            case R.id.act_bar_title_recommend: // 点击推荐标题栏,切换到推荐页面
156
            case R.id.act_bar_title_recommend: // 点击推荐标题栏,切换到推荐页面
156
                chat_view_pager.setCurrentItem(0, true);
157
                chat_view_pager.setCurrentItem(0, true);
158
                MobclickAgent.onEvent(getApplicationContext(), "1001");
157
                break;
159
                break;
158
            case R.id.act_bar_title_help: // 点击互助标题栏,切换到互助页面
160
            case R.id.act_bar_title_help: // 点击互助标题栏,切换到互助页面
159
                chat_view_pager.setCurrentItem(1, true);
161
                chat_view_pager.setCurrentItem(1, true);
162
                MobclickAgent.onEvent(getApplicationContext(), "1003");
160
                break;
163
                break;
161
            case R.id.act_bar_help_search: // 点击互助页面搜索按钮,切换到互助搜索页面
164
            case R.id.act_bar_help_search: // 点击互助页面搜索按钮,切换到互助搜索页面
162
                MobclickAgent.onEvent(this, "0506");
165
                MobclickAgent.onEvent(this, "0506");
176
                break;
179
                break;
177
            case R.id.tab_qa:
180
            case R.id.tab_qa:
178
                chatRecommendFragment.refresh();
181
                chatRecommendFragment.refresh();
182
                MobclickAgent.onEvent(getApplicationContext(), "0999");
179
                break;
183
                break;
180
            case R.id.tab_screening: // 充电
184
            case R.id.tab_screening: // 充电
181
                if (!MainApplication.isLogin()) {
185
                if (!MainApplication.isLogin()) {

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

268
                overridePendingTransition(0, 0);
268
                overridePendingTransition(0, 0);
269
                break;
269
                break;
270
            case R.id.tab_qa:
270
            case R.id.tab_qa:
271
                MobclickAgent.onEvent(getApplicationContext(), "0103");
271
                MobclickAgent.onEvent(getApplicationContext(), "0999");
272
                Intent i = new Intent(getApplication(), ChatActivity.class);
272
                Intent i = new Intent(getApplication(), ChatActivity.class);
273
                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
273
                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
274
                startActivity(i);
274
                startActivity(i);

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

1361
                startActivity(i);
1361
                startActivity(i);
1362
                overridePendingTransition(0, 0);
1362
                overridePendingTransition(0, 0);
1363
                if (count == 1) {
1363
                if (count == 1) {
1364
                    MobclickAgent.onEvent(getApplicationContext(), "0103");
1364
                    MobclickAgent.onEvent(getApplicationContext(), "0999");
1365
                    count = 2;
1365
                    count = 2;
1366
                }
1366
                }
1367
            }
1367
            }
3016
                startActivity(i);
3016
                startActivity(i);
3017
                overridePendingTransition(0, 0);
3017
                overridePendingTransition(0, 0);
3018
                if (count == 1) {
3018
                if (count == 1) {
3019
                    MobclickAgent.onEvent(getApplicationContext(), "0103");
3019
                    MobclickAgent.onEvent(getApplicationContext(), "0999");
3020
                    count = 2;
3020
                    count = 2;
3021
                }
3021
                }
3022
                break;
3022
                break;
5210
5210
5211
        // 气泡红包显示
5211
        // 气泡红包显示
5212
        windowRedPaperBag.setVisibility("1".equals(own_pay) ? View.VISIBLE : View.GONE);
5212
        windowRedPaperBag.setVisibility("1".equals(own_pay) ? View.VISIBLE : View.GONE);
5213
        windowLabelPublic.setText("0".equals(belong_attribute) ? "公共" : "私人");
5213
        windowLabelPublic.setText(belong_attribute);
5214
        windowLabelGround.setText("0".equals(park_location) ? "地下" : "地上");
5214
        windowLabelGround.setText("0".equals(park_location) ? "地下" : "地上");
5215
        windowLabelFreePark.setVisibility(stop_cost.contains("免费") ? View.VISIBLE : View.GONE);
5215
        windowLabelFreePark.setVisibility(stop_cost.contains("免费") ? View.VISIBLE : View.GONE);
5216
5216

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

370
                overridePendingTransition(0, 0);
370
                overridePendingTransition(0, 0);
371
                break;
371
                break;
372
            case R.id.tab_qa:
372
            case R.id.tab_qa:
373
                MobclickAgent.onEvent(getApplicationContext(), "0103");
373
                MobclickAgent.onEvent(getApplicationContext(), "0999");
374
                Intent intent = new Intent(getApplication(), ChatActivity.class);
374
                Intent intent = new Intent(getApplication(), ChatActivity.class);
375
                intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
375
                intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
376
                startActivity(intent);
376
                startActivity(intent);

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

860
                }
860
                }
861
                break;
861
                break;
862
            case R.id.tab_qa:
862
            case R.id.tab_qa:
863
                MobclickAgent.onEvent(getApplicationContext(), "0103");
863
                MobclickAgent.onEvent(getApplicationContext(), "0999");
864
                Intent intent7 = new Intent(getApplication(), ChatActivity.class);
864
                Intent intent7 = new Intent(getApplication(), ChatActivity.class);
865
                intent7.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
865
                intent7.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
866
                startActivity(intent7);
866
                startActivity(intent7);

+ 2 - 0
app/src/main/java/com/electric/chargingpile/adapter/ChatRecommendAdapter.java

33
import com.electric.chargingpile.util.ScreenUtils;
33
import com.electric.chargingpile.util.ScreenUtils;
34
import com.electric.chargingpile.util.ToastUtil;
34
import com.electric.chargingpile.util.ToastUtil;
35
import com.squareup.picasso.Picasso;
35
import com.squareup.picasso.Picasso;
36
import com.umeng.analytics.MobclickAgent;
36
import com.zhy.http.okhttp.OkHttpUtils;
37
import com.zhy.http.okhttp.OkHttpUtils;
37
import com.zhy.http.okhttp.callback.StringCallback;
38
import com.zhy.http.okhttp.callback.StringCallback;
38
39
217
                public void onClick(View view) {
218
                public void onClick(View view) {
218
                    if (bean.likeFlg == 0) {
219
                    if (bean.likeFlg == 0) {
219
                        doLike(position);
220
                        doLike(position);
221
                        MobclickAgent.onEvent(context, "1002");
220
                    }
222
                    }
221
                }
223
                }
222
            });
224
            });

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

73
    public static String firstPoint = "";
73
    public static String firstPoint = "";
74
    public static Boolean firstSsyd;
74
    public static Boolean firstSsyd;
75
    public static String password = "";
75
    public static String password = "";
76
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
76
    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
78
    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
79
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
79
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
80
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
80
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";

BIN
app/src/main/res/drawable-xhdpi/bg_w_1.9.png