Browse Source

更新版本为3.5.14

hy 4 years ago
parent
commit
ddf855489e

+ 2 - 2
app/src/main/AndroidManifest.xml

2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3
    xmlns:tools="http://schemas.android.com/tools"
4
    package="com.electric.chargingpile"
4
    package="com.electric.chargingpile"
5
    android:versionCode="99"
6
    android:versionName="3.5.13">
5
    android:versionCode="100"
6
    android:versionName="3.5.14">
7
7
8
    <uses-permission android:name="android.permission.BLUETOOTH" />
8
    <uses-permission android:name="android.permission.BLUETOOTH" />
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

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

143
    private TextView tv_qaNum, tv_messageNum;
143
    private TextView tv_qaNum, tv_messageNum;
144
    private static final int RC_CAMERA_PERM = 123;
144
    private static final int RC_CAMERA_PERM = 123;
145
145
146
    private String mUrl="";
147
146
    private Handler handler = new Handler() {
148
    private Handler handler = new Handler() {
147
        // 主线程通过这个方法处理消息
149
        // 主线程通过这个方法处理消息
148
        @Override
150
        @Override
225
            getPingLun();
227
            getPingLun();
226
        }
228
        }
227
        showCarDialog();
229
        showCarDialog();
228
230
        requestWebLink();
229
        // ATTENTION: This was auto-generated to implement the App Indexing API.
231
        // ATTENTION: This was auto-generated to implement the App Indexing API.
230
        // See https://g.co/AppIndexing/AndroidStudio for more information.
232
        // See https://g.co/AppIndexing/AndroidStudio for more information.
231
        client = new GoogleApiClient.Builder(this).addApi(AppIndex.API).build();
233
        client = new GoogleApiClient.Builder(this).addApi(AppIndex.API).build();
936
//                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
938
//                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
937
//                startActivity(i);
939
//                startActivity(i);
938
                Intent i = new Intent(getApplication(), MyWebViewActivity.class);
940
                Intent i = new Intent(getApplication(), MyWebViewActivity.class);
939
                i.putExtra("url", "http://fans.d1ev.com/");
941
                i.putExtra("url", mUrl);
940
                startActivity(i);
942
                startActivity(i);
941
                break;
943
                break;
942
944
1648
        });
1650
        });
1649
    }
1651
    }
1650
1652
1653
    public void requestWebLink(){
1654
        String url = MainApplication.url + "/zhannew/basic/web/index.php/discovery/cheyouqun";
1655
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
1656
            @Override
1657
            public void onError(Call call, Exception e) {
1658
1659
            }
1660
1661
            @Override
1662
            public void onResponse(String response) {
1663
//                Log.e(TAG, "onResponse: signIn "+response );
1664
//                {"rtnCode":"01","rtnMsg":{"score":"10","log_day":"1"}}
1665
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
1666
                if (rtnCode.equals("01")) {
1667
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
1668
                    mUrl = JsonUtils.getKeyResult(response, "data");
1669
1670
                }
1671
            }
1672
        });
1673
1674
    }
1675
1651
    private void showDialog(String third, String second, String first, String score, String now_temperature, String now_weather, String temperature, String city) {
1676
    private void showDialog(String third, String second, String first, String score, String now_temperature, String now_weather, String temperature, String city) {
1652
        SignInDialog signInDialog = new SignInDialog(this);
1677
        SignInDialog signInDialog = new SignInDialog(this);
1653
        signInDialog.builder()
1678
        signInDialog.builder()

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

91
    public static String firstPoint = "";
91
    public static String firstPoint = "";
92
    public static Boolean firstSsyd;
92
    public static Boolean firstSsyd;
93
    public static String password = "";
93
    public static String password = "";
94
        public static String url = "http://59.110.68.162";// 充电桩测试环境
95
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
96
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
97
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
94
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
95
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
96
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
97
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
98

98

99
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
100
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
99
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
100
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
101

101

102

102

103
    //	public static String url = "https://cdz.d1ev.com";
103
    //	public static String url = "https://cdz.d1ev.com";