陈奇
2018-12-07 4203968ed148a7e56ab460c8d6edb744cb1645e4
[*]优化微信登陆用户信息
14 files modified
69 ■■■■ changed files
.gradle/4.1/fileHashes/fileHashes.bin patch | view | raw | blame | history
.gradle/4.1/fileHashes/fileHashes.lock patch | view | raw | blame | history
.gradle/4.1/javaCompile/classAnalysis.bin patch | view | raw | blame | history
.gradle/4.1/javaCompile/javaCompile.lock patch | view | raw | blame | history
.gradle/4.1/javaCompile/taskHistory.bin patch | view | raw | blame | history
.gradle/4.1/taskHistory/fileSnapshots.bin patch | view | raw | blame | history
.gradle/4.1/taskHistory/taskHistory.bin patch | view | raw | blame | history
.gradle/4.1/taskHistory/taskHistory.lock patch | view | raw | blame | history
app/build.gradle 1 ●●●● patch | view | raw | blame | history
app/src/main/AndroidManifest.xml 3 ●●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java 7 ●●●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/wxapi/WXEntryActivity.java 36 ●●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/wxapi/data/WXUserBean.java 18 ●●●●● patch | view | raw | blame | history
conf.gradle 4 ●●●● patch | view | raw | blame | history
.gradle/4.1/fileHashes/fileHashes.bin
Binary files differ
.gradle/4.1/fileHashes/fileHashes.lock
Binary files differ
.gradle/4.1/javaCompile/classAnalysis.bin
Binary files differ
.gradle/4.1/javaCompile/javaCompile.lock
Binary files differ
.gradle/4.1/javaCompile/taskHistory.bin
Binary files differ
.gradle/4.1/taskHistory/fileSnapshots.bin
Binary files differ
.gradle/4.1/taskHistory/taskHistory.bin
Binary files differ
.gradle/4.1/taskHistory/taskHistory.lock
Binary files differ
app/build.gradle
@@ -22,7 +22,6 @@
            keyPassword 'moral123456'
            storeFile file('/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/key.jks')
            //md5 6B:AD:23:76:61:03:1D:9A:B8:E2:05:90:3E:4D:9F:00
            //md5 6B:AD:23:76:61:03:1D:9A:B8:E2:05:90:3E:4D:9F:00
            storePassword 'moral123456'
        }
    }
app/src/main/AndroidManifest.xml
@@ -72,6 +72,7 @@
            android:screenOrientation="portrait" />
        <activity
            android:name="com.moral.yunfushao.activity.LoginActivity"
            android:launchMode="singleTask"
            android:screenOrientation="portrait" />
        <activity
            android:name="com.moral.yunfushao.activity.RegisterActivity"
@@ -123,8 +124,8 @@
        <activity
            android:name=".wxapi.WXEntryActivity"
            android:exported="true"
            android:taskAffinity="com.moral.yunfushao"
            android:launchMode="singleTask"
            android:taskAffinity="com.moral.yunfushao"
            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
        <!-- Bugly升级SDK配置结束-->
    </application>
app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
@@ -127,13 +127,6 @@
    protected void onErrorPageClick() {
    }
    @Override
    protected void onStop() {
        super.onStop();
        finish();
    }
    private void login(String tel, final String pwd) {
        final String url = API.LOGIN;
        Map<String, String> params = new HashMap<>();
app/src/main/java/com/moral/yunfushao/wxapi/WXEntryActivity.java
@@ -121,13 +121,13 @@
            @Override
            public void onFail(int errno, String s) {
                T.show("登陆失败");
                loginFailed();
            }
        });
    }
    /**
     * 刷新调用接扣口超时
     * 调用微信超时更新时间
     *
     * @param refresh_tocken
     */
@@ -138,7 +138,7 @@
            public void onSuccess(String res, String msg) {
                AccessTokenBean accessTokenBean = GsonUtil.toObj(msg, AccessTokenBean.class);
                if (accessTokenBean.getErrcode() == 40030) {
                    T.show("登陆失败");
                    loginFailed();
                } else {
                    loginSuccess(accessTokenBean.getAccess_token(), accessTokenBean.getOpenid());
                }
@@ -151,7 +151,7 @@
            @Override
            public void onFail(int errno, String s) {
                T.show("登陆失败");
                loginFailed();
            }
        });
    }
@@ -171,7 +171,7 @@
                AccessTokenBean accessTokenBean = GsonUtil.toObj(msg, AccessTokenBean.class);
                if (accessTokenBean.getErrcode() == 40029) {
                    //登陆错误
                    T.show("登陆失败");
                    loginFailed();
                    return;
                }
                if (accessTokenBean.getAccess_token() != null && accessTokenBean.getOpenid() != null) {
@@ -186,7 +186,7 @@
            @Override
            public void onFail(int errno, String s) {
                T.show("登陆失败");
                loginFailed();
            }
        });
    }
@@ -206,11 +206,18 @@
            @Override
            public void onSuccess(String res, String msg) {
                WXUserBean bean = new WXUserBean();
                MainApp.theApp.userId = bean.getNickname();
                User user = new User();
                if (bean.getErrcode() == 40003) {
                    MainApp.theApp.userId = "null";
                    user.set_id(bean.getOpenid());
                    user.setNickname(MainApp.theApp.userId);
                    user.setLogin_type(2);
                } else {
                    MainApp.theApp.userId = bean.getNickname();
                user.set_id(bean.getOpenid());
                user.setNickname(bean.getNickname());
                user.setLogin_type(2);
                }
                MainApp.theApp.sharedPreferencesUtil.saveLoginInfo(user);
            }
@@ -221,17 +228,28 @@
            @Override
            public void onFail(int errno, String s) {
                T.show("登陆失败");
                loginFailed();
            }
        });
    }
    private void loginFailed() {
        finish();
        T.show("登陆失败");
    }
    /**
     * 登陆成功
     *
     * @param strings
     */
    private void loginSuccess(String... strings) {
        //校验完毕之后跳
        Intent intent = new Intent(WXEntryActivity.this, MainActivity.class);
        WXEntryActivity.this.startActivity(intent);
        finish();
        getUserInfor(strings[0], strings[1]);
        finish();
    }
    private void goToGetMsg() {
app/src/main/java/com/moral/yunfushao/wxapi/data/WXUserBean.java
@@ -31,6 +31,24 @@
    private String headimgurl;
    private String unionid;
    private List<String> privilege;
    private String errmsg;
    private int errcode;
    public String getErrmsg() {
        return errmsg;
    }
    public void setErrmsg(String errmsg) {
        this.errmsg = errmsg;
    }
    public int getErrcode() {
        return errcode;
    }
    public void setErrcode(int errcode) {
        this.errcode = errcode;
    }
    public String getOpenid() {
        return openid;
conf.gradle
@@ -2,8 +2,8 @@
    android = [
            compileSdkVersion: 25,
            buildToolsVersion: "26.0.2",
            versionCode      : 4,
            versionName      : "1.0.3.1",
            versionCode      : 5,
            versionName      : "1.0.3.2",
            minSdkVersion    : 21,
            targetSdkVersion : 25,
            debugVersion     : "_sp2",