Browse Source

集成友盟

316044749 7 years ago
parent
commit
175a783d5a
52 changed files with 621 additions and 18 deletions
  1. 6 0
      app/build.gradle
  2. BIN
      app/libs/SocialSDK_QQ_Full.jar
  3. BIN
      app/libs/SocialSDK_Sina_Full.jar
  4. BIN
      app/libs/SocialSDK_WeiXin_Full.jar
  5. BIN
      app/libs/SocialSDK_alipay.jar
  6. BIN
      app/libs/SocialSDK_email.jar
  7. BIN
      app/libs/SocialSDK_sms.jar
  8. BIN
      app/libs/libapshare20161108.jar
  9. BIN
      app/libs/open_sdk_r5923_lite.jar
  10. BIN
      app/libs/umeng-common-1.4.4.jar
  11. BIN
      app/libs/umeng_social_api.jar
  12. BIN
      app/libs/umeng_social_net.jar
  13. BIN
      app/libs/umeng_social_tool.jar
  14. BIN
      app/libs/wechat-sdk-android-with-mta-1.1.6.jar
  15. BIN
      app/libs/weiboSDKCore.jar
  16. 48 0
      app/src/main/AndroidManifest.xml
  17. BIN
      app/src/main/assets/geo_global_ca.cer
  18. 11 0
      app/src/main/java/com/ynstkz/shitu/android/WBShareActivity.java
  19. 12 0
      app/src/main/java/com/ynstkz/shitu/android/activity/HomeActivity.java
  20. 90 13
      app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java
  21. 15 0
      app/src/main/java/com/ynstkz/shitu/android/application/STApplication.java
  22. 13 0
      app/src/main/java/com/ynstkz/shitu/android/base/BaseActivity.java
  23. 16 4
      app/src/main/java/com/ynstkz/shitu/android/common/Constants.java
  24. 1 1
      app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java
  25. 98 0
      app/src/main/java/com/ynstkz/shitu/android/helper/UmengLoginHelper.java
  26. 10 0
      app/src/main/java/com/ynstkz/shitu/android/wxapi/WXEntryActivity.java
  27. BIN
      app/src/main/jniLibs/armeabi-v7a/libweibosdkcore.so
  28. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_alipay.png
  29. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_back_icon.png
  30. 11 0
      app/src/main/res/drawable-xxhdpi/umeng_socialize_btn_bg.xml
  31. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_copy.png
  32. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_copyurl.png
  33. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_delete.png
  34. 11 0
      app/src/main/res/drawable-xxhdpi/umeng_socialize_edit_bg.xml
  35. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_fav.png
  36. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_gmail.png
  37. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_menu_default.png
  38. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_more.png
  39. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_qq.png
  40. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_qzone.png
  41. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_share_music.png
  42. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_share_video.png
  43. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_share_web.png
  44. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_sina.png
  45. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_sms.png
  46. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_wechat.png
  47. BIN
      app/src/main/res/drawable-xxhdpi/umeng_socialize_wxcircle.png
  48. 3 0
      app/src/main/res/layout/activity_login.xml
  49. 121 0
      app/src/main/res/layout/umeng_socialize_oauth_dialog.xml
  50. 18 0
      app/src/main/res/values/umeng_socialize_colors.xml
  51. 55 0
      app/src/main/res/values/umeng_socialize_strings.xml
  52. 82 0
      app/src/main/res/values/umeng_socialize_style.xml

+ 6 - 0
app/build.gradle

@@ -9,6 +9,10 @@ android {
         versionCode 1
         versionCode 1
         versionName "1.0"
         versionName "1.0"
         javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
         javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
+
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a', mips, mips64...加入需要生成的文件夹
+        }
     }
     }
 
 
     signingConfigs {
     signingConfigs {
@@ -49,4 +53,6 @@ dependencies {
     compile 'com.amap.api:navi-3dmap:5.6.0_3dmap5.7.0'
     compile 'com.amap.api:navi-3dmap:5.6.0_3dmap5.7.0'
     //定位
     //定位
     compile 'com.amap.api:location:3.8.0'
     compile 'com.amap.api:location:3.8.0'
+    //友盟SDK
+    compile 'com.umeng.analytics:analytics:latest.integration'
 }
 }

BIN
app/libs/SocialSDK_QQ_Full.jar


BIN
app/libs/SocialSDK_Sina_Full.jar


BIN
app/libs/SocialSDK_WeiXin_Full.jar


BIN
app/libs/SocialSDK_alipay.jar


BIN
app/libs/SocialSDK_email.jar


BIN
app/libs/SocialSDK_sms.jar


BIN
app/libs/libapshare20161108.jar


BIN
app/libs/open_sdk_r5923_lite.jar


BIN
app/libs/umeng-common-1.4.4.jar


BIN
app/libs/umeng_social_api.jar


BIN
app/libs/umeng_social_net.jar


BIN
app/libs/umeng_social_tool.jar


BIN
app/libs/wechat-sdk-android-with-mta-1.1.6.jar


BIN
app/libs/weiboSDKCore.jar


+ 48 - 0
app/src/main/AndroidManifest.xml

@@ -141,6 +141,54 @@
         <meta-data android:name="com.amap.api.v2.apikey" android:value="45fb5d8b52ba4f9f214bfb4fdaf81a72"/>
         <meta-data android:name="com.amap.api.v2.apikey" android:value="45fb5d8b52ba4f9f214bfb4fdaf81a72"/>
         <service android:name="com.amap.api.location.APSService"/>
         <service android:name="com.amap.api.location.APSService"/>
 
 
+        <!--友盟-->
+        <meta-data android:value="5aa76aa9b27b0a5a550000b1" android:name="UMENG_APPKEY"/>
+
+        <activity
+            android:name="com.umeng.socialize.media.WBShareCallBackActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" >
+        </activity>
+
+        <activity
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:launchMode="singleTask"
+            android:name="com.sina.weibo.sdk.share.WbShareTransActivity">
+            <intent-filter>
+                <action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name="com.tencent.tauth.AuthActivity"
+            android:launchMode="singleTask"
+            android:noHistory="true" >
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tencent100424468" />
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name="com.tencent.connect.common.AssistActivity"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:configChanges="orientation|keyboardHidden|screenSize"/>
+
+        <activity
+            android:name=".wxapi.WXEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop" />
+
     </application>
     </application>
 
 
 </manifest>
 </manifest>

BIN
app/src/main/assets/geo_global_ca.cer


+ 11 - 0
app/src/main/java/com/ynstkz/shitu/android/WBShareActivity.java

@@ -0,0 +1,11 @@
+package com.ynstkz.shitu.android;
+
+import com.umeng.socialize.media.WBShareCallBackActivity;
+
+/**
+ * 作者:fuchangle on 2018/3/13 15:38
+ */
+
+public class WBShareActivity extends WBShareCallBackActivity {
+
+}

+ 12 - 0
app/src/main/java/com/ynstkz/shitu/android/activity/HomeActivity.java

@@ -3,6 +3,7 @@ package com.ynstkz.shitu.android.activity;
 import android.Manifest;
 import android.Manifest;
 import android.content.Intent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.Fragment;
@@ -94,6 +95,7 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
         mFragments[1] = getSupportFragmentManager().findFragmentById(R.id.fm_nearby);
         mFragments[1] = getSupportFragmentManager().findFragmentById(R.id.fm_nearby);
         mFragments[2] = getSupportFragmentManager().findFragmentById(R.id.fm_usercent);
         mFragments[2] = getSupportFragmentManager().findFragmentById(R.id.fm_usercent);
         changleLayout(0);
         changleLayout(0);
+        requestPermission();
     }
     }
 
 
     private void initData() {
     private void initData() {
@@ -214,6 +216,16 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
         }
         }
     }
     }
 
 
+    /**
+     * 获取权限
+     */
+    private void requestPermission(){
+        if(Build.VERSION.SDK_INT>=23){
+            String[] mPermissionList = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION,Manifest.permission.CALL_PHONE,Manifest.permission.READ_LOGS,Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.SET_DEBUG_APP,Manifest.permission.SYSTEM_ALERT_WINDOW,Manifest.permission.GET_ACCOUNTS,Manifest.permission.WRITE_APN_SETTINGS};
+            ActivityCompat.requestPermissions(this,mPermissionList,123);
+        }
+    }
+
     @Override
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
         switch (requestCode) {

+ 90 - 13
app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java

@@ -5,14 +5,17 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
 import com.common.library.okhttp.callback.Callback;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
+import com.umeng.socialize.UMShareAPI;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.LoginBean;
 import com.ynstkz.shitu.android.bean.LoginBean;
@@ -20,12 +23,15 @@ import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.event.LoginEvent;
 import com.ynstkz.shitu.android.event.LoginEvent;
 import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
 import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
+import com.ynstkz.shitu.android.helper.UmengLoginHelper;
 import com.ynstkz.shitu.android.utils.StatusBarUtil;
 import com.ynstkz.shitu.android.utils.StatusBarUtil;
 
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.greenrobot.eventbus.ThreadMode;
 
 
+import java.util.Map;
+
 import butterknife.Bind;
 import butterknife.Bind;
 import okhttp3.Call;
 import okhttp3.Call;
 import okhttp3.Response;
 import okhttp3.Response;
@@ -50,6 +56,14 @@ public class LoginActivity extends TitleBarActivity {
     TextView tvForgetPw;
     TextView tvForgetPw;
     @Bind(R.id.btn_login)
     @Bind(R.id.btn_login)
     Button btnLogin;
     Button btnLogin;
+    @Bind(R.id.rl_login_wx)
+    RelativeLayout rlLoginWx;
+    @Bind(R.id.rl_login_qq)
+    RelativeLayout rlLoginQq;
+    @Bind(R.id.rl_login_sina)
+    RelativeLayout rlLoginSina;
+
+    private UmengLoginHelper mLogin;
 
 
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -68,15 +82,15 @@ public class LoginActivity extends TitleBarActivity {
         return R.layout.activity_login;
         return R.layout.activity_login;
     }
     }
 
 
-    private void initView(){
+    private void initView() {
         EventBus.getDefault().register(this);
         EventBus.getDefault().register(this);
     }
     }
 
 
-    private void initData(){
+    private void initData() {
 
 
     }
     }
 
 
-    private void setListener(){
+    private void setListener() {
         //关闭
         //关闭
         ivCancel.setOnClickListener(new View.OnClickListener() {
         ivCancel.setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
@@ -111,19 +125,50 @@ public class LoginActivity extends TitleBarActivity {
             public void onClick(View view) {
             public void onClick(View view) {
                 String userName = editUsername.getText().toString().trim();
                 String userName = editUsername.getText().toString().trim();
                 String userPwd = editPassword.getText().toString().trim();
                 String userPwd = editPassword.getText().toString().trim();
-                if(verifyData(userName, userPwd)){
-                    login(userName,userPwd);
+                if (verifyData(userName, userPwd)) {
+                    login(userName, userPwd);
                 }
                 }
             }
             }
         });
         });
+
+        /**
+         * 微信登陆
+         */
+        rlLoginWx.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                threeLogin(UmengLoginHelper.WX);
+            }
+        });
+
+        /**
+         * qq登陆
+         */
+        rlLoginQq.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                threeLogin(UmengLoginHelper.QQ);
+            }
+        });
+
+        /**
+         * 新浪登陆
+         */
+        rlLoginSina.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                threeLogin(UmengLoginHelper.SINA);
+            }
+        });
     }
     }
 
 
     /**
     /**
      * 登陆
      * 登陆
+     *
      * @param userName
      * @param userName
      * @param userPwd
      * @param userPwd
      */
      */
-    private void login(String userName, String userPwd){
+    private void login(String userName, String userPwd) {
 
 
         RequestGroup.login(userName, userPwd, new Callback() {
         RequestGroup.login(userName, userPwd, new Callback() {
             @Override
             @Override
@@ -138,10 +183,10 @@ public class LoginActivity extends TitleBarActivity {
 
 
             @Override
             @Override
             public void onResponse(Object response, int id) {
             public void onResponse(Object response, int id) {
-                LoginBean loginBean = (LoginBean)response;
-                if(loginBean != null){
-                    if("200".equals(loginBean.getCode())){
-                        if(loginBean.getData() != null){
+                LoginBean loginBean = (LoginBean) response;
+                if (loginBean != null) {
+                    if ("200".equals(loginBean.getCode())) {
+                        if (loginBean.getData() != null) {
 
 
                             SharedPreferencesUtils.setLogin(true);
                             SharedPreferencesUtils.setLogin(true);
                             EventBus.getDefault().post(new LoginEvent());
                             EventBus.getDefault().post(new LoginEvent());
@@ -161,17 +206,42 @@ public class LoginActivity extends TitleBarActivity {
     }
     }
 
 
     /**
     /**
+     *
+     */
+    private void threeLogin(String type){
+
+        mLogin = new UmengLoginHelper(LoginActivity.this, new UmengLoginHelper.Callback() {
+            @Override
+            public void onComplete(Map<String, String> data) {
+                Log.d("login", data.toString());
+            }
+
+            @Override
+            public void onError() {
+
+            }
+
+            @Override
+            public void onCancel() {
+
+            }
+        });
+        mLogin.oAuth(type);
+    }
+
+    /**
      * 校验数据
      * 校验数据
+     *
      * @param userName
      * @param userName
      * @param userPwd
      * @param userPwd
      * @return
      * @return
      */
      */
-    private boolean verifyData(String userName, String userPwd){
-        if(TextUtils.isEmpty(userName)){
+    private boolean verifyData(String userName, String userPwd) {
+        if (TextUtils.isEmpty(userName)) {
             showToast("用户名不能为空!");
             showToast("用户名不能为空!");
             return false;
             return false;
         }
         }
-        if(TextUtils.isEmpty(userPwd)){
+        if (TextUtils.isEmpty(userPwd)) {
             showToast("密码不能为空!");
             showToast("密码不能为空!");
             return false;
             return false;
         }
         }
@@ -183,6 +253,13 @@ public class LoginActivity extends TitleBarActivity {
         finish();
         finish();
     }
     }
 
 
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
+    }
+
     @Override
     @Override
     protected void onDestroy() {
     protected void onDestroy() {
         super.onDestroy();
         super.onDestroy();

+ 15 - 0
app/src/main/java/com/ynstkz/shitu/android/application/STApplication.java

@@ -4,6 +4,9 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Context;
 
 
 import com.common.library.okhttp.OkHttpUtils;
 import com.common.library.okhttp.OkHttpUtils;
+import com.umeng.socialize.PlatformConfig;
+import com.umeng.socialize.UMShareAPI;
+import com.ynstkz.shitu.android.common.Constants;
 
 
 /**
 /**
  * 作者:fuchangle on 2018/1/27 21:56
  * 作者:fuchangle on 2018/1/27 21:56
@@ -19,6 +22,9 @@ public class STApplication extends Application{
         super.onCreate();
         super.onCreate();
         context = getApplicationContext();
         context = getApplicationContext();
         instance = this;
         instance = this;
+        //注册第三方登陆信息
+        UMShareAPI.get(this);
+        registThreeLoginConfig();
         if(com.common.library.Constants.DEVELOP_MODE){
         if(com.common.library.Constants.DEVELOP_MODE){
             OkHttpUtils.getInstance().debug("okhttp", true);
             OkHttpUtils.getInstance().debug("okhttp", true);
         }
         }
@@ -27,4 +33,13 @@ public class STApplication extends Application{
     public static Context getContext(){
     public static Context getContext(){
         return context;
         return context;
     }
     }
+
+    /**
+     * 注册第三方登陆信息
+     */
+    private void registThreeLoginConfig(){
+        PlatformConfig.setWeixin(Constants.WX_KEY, Constants.WX_SECRET);
+        PlatformConfig.setSinaWeibo(Constants.SINA_KEY, Constants.SINA_SECRET,"http://www.baidu.com");
+        PlatformConfig.setQQZone(Constants.QQ_KEY, Constants.QQ_SECRET);
+    }
 }
 }

+ 13 - 0
app/src/main/java/com/ynstkz/shitu/android/base/BaseActivity.java

@@ -11,6 +11,7 @@ import android.view.View;
 
 
 import com.common.library.base.LibBaseActivity;
 import com.common.library.base.LibBaseActivity;
 import com.muddzdev.styleabletoastlibrary.StyleableToast;
 import com.muddzdev.styleabletoastlibrary.StyleableToast;
+import com.umeng.analytics.MobclickAgent;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 
 
 /**
 /**
@@ -51,4 +52,16 @@ public class BaseActivity extends LibBaseActivity{
             activity.getWindow().getDecorView().setSystemUiVisibility(flag);
             activity.getWindow().getDecorView().setSystemUiVisibility(flag);
         }
         }
     }
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPause(this);
+    }
 }
 }

+ 16 - 4
app/src/main/java/com/ynstkz/shitu/android/common/Constants.java

@@ -6,11 +6,23 @@ package com.ynstkz.shitu.android.common;
 
 
 public class Constants {
 public class Constants {
 
 
-    public final static String ST_SHAREPREFREENCE="stsharepref";//SharePreference名字
+    public static final String ST_SHAREPREFREENCE="stsharepref";//SharePreference名字
 
 
-    public final static String CACHE_USER_KEY = "UserBean";
+    public static final String CACHE_USER_KEY = "UserBean";
 
 
-    public final static int IMAGE_CACHE_SIZE = 20 * 1024 * 1024;
+    public static final int IMAGE_CACHE_SIZE = 20 * 1024 * 1024;
 
 
-    public final static String DOWNLOAD_IMAGE_NAME = "image";
+    public static final String DOWNLOAD_IMAGE_NAME = "image";
+
+    public static final String QQ_KEY = "1106743412";
+
+    public static final String QQ_SECRET = "KEYaREJsqSU3Ep4msfM";
+
+    public static final String WX_KEY = "wxdef12ce6777b9477";
+
+    public static final String WX_SECRET = "7854e61bf525343f98abea8a6c4f42f0";
+
+    public static final String SINA_KEY = "3644208114";
+
+    public static final String SINA_SECRET = "ad39abe7c879ee6889954cfe00537b08";
 }
 }

+ 1 - 1
app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -248,10 +248,10 @@ public class RequestGroup {
 
 
     /**
     /**
      * 选择城市
      * 选择城市
-     * @param callback
      */
      */
     public static void getLocalCity(Callback callback){
     public static void getLocalCity(Callback callback){
         Map<String, String> params = getSystemParams();
         Map<String, String> params = getSystemParams();
+        params.put("parentId", "30");
         OkHttpUtils.get().url(UrlCat.URL_LOCAL_CITY).params(params).build().execute(callback);
         OkHttpUtils.get().url(UrlCat.URL_LOCAL_CITY).params(params).build().execute(callback);
     }
     }
 
 

+ 98 - 0
app/src/main/java/com/ynstkz/shitu/android/helper/UmengLoginHelper.java

@@ -0,0 +1,98 @@
+package com.ynstkz.shitu.android.helper;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.util.Log;
+
+import com.common.library.Constants;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+
+import java.util.Map;
+
+/**
+ * 作者:fuchangle on 2018/3/13 15:22
+ */
+
+public class UmengLoginHelper {
+
+    public static final String WX = "wx";
+    public static final String QQ = "qq";
+    public static final String SINA = "sina";
+
+    private Activity mActivity;
+    private Callback mCallback;
+
+    public interface Callback {
+        public void onComplete(Map<String, String> data);
+
+        public void onError();
+
+        public void onCancel();
+    }
+
+    private UMShareAPI mShareAPI;
+
+    /**
+     * OAuth鉴权登录接口,前提:application中调用applationEntryInit
+     * 注意在调用的activity添加 onActivityResult
+     *
+     * @param activity
+     * @param callback
+     */
+    public UmengLoginHelper(Activity activity, Callback callback) {
+        mActivity = activity;
+        mCallback = callback;
+        mShareAPI = UMShareAPI.get(activity);
+    }
+
+    public void oAuth(String type) {
+        SHARE_MEDIA platform = null;
+        if (type.equals(WX)) {
+            platform = SHARE_MEDIA.WEIXIN;
+        } else if (type.equals(QQ)) {
+            platform = SHARE_MEDIA.QQ;
+        } else if (type.equals(SINA)) {
+            platform = SHARE_MEDIA.SINA;
+        }
+        mShareAPI.getPlatformInfo(mActivity, platform, umAuthInfoListener);
+    }
+
+    private UMAuthListener umAuthInfoListener = new UMAuthListener() {
+
+        @Override
+        public void onStart(SHARE_MEDIA share_media) {
+            if (mCallback != null){
+
+            }
+        }
+
+        @Override
+        public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            if (mCallback != null)
+                mCallback.onComplete(data);
+        }
+
+        @Override
+        public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+            if (mCallback != null){
+                mCallback.onError();
+            }
+            if(Constants.DEVELOP_MODE){
+                Log.e("login", "error: " + action);
+            }
+        }
+
+        @Override
+        public void onCancel(SHARE_MEDIA platform, int action) {
+            if (mCallback != null){
+                mCallback.onCancel();
+            }
+            if(Constants.DEVELOP_MODE){
+                Log.e("login", "error: " + action);
+            }
+        }
+    };
+
+}

+ 10 - 0
app/src/main/java/com/ynstkz/shitu/android/wxapi/WXEntryActivity.java

@@ -0,0 +1,10 @@
+package com.ynstkz.shitu.android.wxapi;
+
+import com.umeng.socialize.weixin.view.WXCallbackActivity;
+
+/**
+ * 作者:fuchangle on 2018/3/13 15:39
+ */
+
+public class WXEntryActivity extends WXCallbackActivity {
+}

BIN
app/src/main/jniLibs/armeabi-v7a/libweibosdkcore.so


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_alipay.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_back_icon.png


+ 11 - 0
app/src/main/res/drawable-xxhdpi/umeng_socialize_btn_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp"
+        android:color="#ffffff"
+
+        />
+
+
+</shape>

BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_copy.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_copyurl.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_delete.png


+ 11 - 0
app/src/main/res/drawable-xxhdpi/umeng_socialize_edit_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp"
+        android:color="#C3C6C9"
+
+        />
+
+
+</shape>

BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_fav.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_gmail.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_menu_default.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_more.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_qq.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_qzone.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_share_music.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_share_video.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_share_web.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_sina.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_sms.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_wechat.png


BIN
app/src/main/res/drawable-xxhdpi/umeng_socialize_wxcircle.png


+ 3 - 0
app/src/main/res/layout/activity_login.xml

@@ -153,6 +153,7 @@
                     android:orientation="horizontal">
                     android:orientation="horizontal">
 
 
                     <RelativeLayout
                     <RelativeLayout
+                        android:id="@+id/rl_login_wx"
                         android:layout_width="0dp"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1">
                         android:layout_weight="1">
@@ -166,6 +167,7 @@
                     </RelativeLayout>
                     </RelativeLayout>
 
 
                     <RelativeLayout
                     <RelativeLayout
+                        android:id="@+id/rl_login_qq"
                         android:layout_width="0dp"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1">
                         android:layout_weight="1">
@@ -179,6 +181,7 @@
                     </RelativeLayout>
                     </RelativeLayout>
 
 
                     <RelativeLayout
                     <RelativeLayout
+                        android:id="@+id/rl_login_sina"
                         android:layout_width="0dp"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1">
                         android:layout_weight="1">

+ 121 - 0
app/src/main/res/layout/umeng_socialize_oauth_dialog.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#D4E0E5">
+
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:background="#0086DC">
+
+        <TextView
+            android:id="@+id/umeng_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text=""
+            android:textColor="#ffffff"
+            android:textSize="18sp" />
+
+        <RelativeLayout
+            android:id="@+id/umeng_back"
+            android:layout_width="60dp"
+            android:layout_height="match_parent"
+
+            android:onClick="onCancel"
+            android:visibility="visible">
+
+            <ImageButton
+
+                android:layout_width="12dp"
+                android:layout_height="20dp"
+                android:layout_centerVertical="true"
+                android:background="@drawable/umeng_socialize_back_icon"
+                android:layout_marginLeft="15dp"
+                android:scaleType="center" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/umeng_share_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerInParent="true"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/umeng_socialize_btn_bg"
+            android:padding="4dp"
+            android:text="分享"
+            android:textColor="#ffffff" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_follow"
+        android:layout_width="fill_parent"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:background="#AAAAAA"
+        android:visibility="visible">
+
+        <CheckBox
+            android:id="@+id/umeng_socialize_follow_check"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:checked="true"
+            android:visibility="gone" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/umeng_socialize_follow_check"
+            android:text="关注官方微博"
+            android:textColor="#f8f8f8"
+            android:textSize="16sp"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+    <!--<LinearLayout-->
+        <!--android:id="@+id/webView_container"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:layout_above="@id/umeng_socialize_follow"-->
+        <!--android:layout_below="@id/umeng_socialize_titlebar"-->
+        <!--android:orientation="horizontal"-->
+        <!--android:visibility="visible" />-->
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="#F2F5F6"
+        android:layout_above="@id/umeng_socialize_follow"
+        android:layout_below="@id/umeng_socialize_titlebar"
+        android:visibility="visible" />
+
+    <RelativeLayout
+        android:id="@+id/progress_bar_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/umeng_socialize_titlebar"
+        android:background="#F2F5F6" >
+
+        <LinearLayout
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerInParent="true"
+            android:orientation="horizontal">
+
+            <ProgressBar
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_margin="10dp" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</RelativeLayout>

+ 18 - 0
app/src/main/res/values/umeng_socialize_colors.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+
+
+
+	<!--<color name="umeng_socialize_list_item_bgcolor">#FFFFFF</color>-->
+	<!--<color name="umeng_socialize_divider">#E6E6E6</color>-->
+	<!--<color name="umeng_socialize_text_time">#999999</color>-->
+	<!--<color name="umeng_socialize_text_title">#464f61</color>-->
+	<!--<color name="umeng_socialize_text_friends_list">#959696</color>-->
+	<!--<color name="umeng_socialize_text_share_content">#666666</color>-->
+	<!--<color name="umeng_socialize_ucenter_bg">#EEEEEE</color>-->
+	<!--<color name="umeng_socialize_text_ucenter">#595959</color>-->
+	<!--<color name="umeng_socialize_edit_bg">#C4C4C4</color>-->
+	<!--<color name="umeng_socialize_grid_divider_line">#F8F8F8</color>-->
+	<!--<color name="umeng_socialize_web_bg">#F4F4F4</color>-->
+	<!--<color name="umeng_socialize_shareactivity">#D4E0E5</color>-->
+	<!--<color name="umeng_socialize_shareactivitydefault">#ffffff</color>-->
+</resources>

+ 55 - 0
app/src/main/res/values/umeng_socialize_strings.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+    <!-- 平台名称 -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</resources>

+ 82 - 0
app/src/main/res/values/umeng_socialize_style.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--<style name="ACPLDialog">-->
+        <!--<item name="android:windowFrame">@null</item>-->
+        <!--<item name="android:windowNoTitle">true</item>-->
+        <!--<item name="android:windowIsFloating">true</item>-->
+        <!--<item name="android:windowContentOverlay">@null</item>-->
+    <!--</style>-->
+    <!--<style name="umeng_socialize_action_bar_itemlayout">-->
+        <!--<item name="android:layout_height">fill_parent</item>-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_weight">1</item>-->
+        <!--<item name="android:paddingLeft">4dp</item>-->
+        <!--<item name="android:paddingTop">4dp</item>-->
+        <!--<item name="android:paddingRight">4dp</item>-->
+        <!--<item name="android:gravity">center_vertical</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_action_bar_item_im">-->
+        <!--<item name="android:layout_width">25dp</item>-->
+        <!--<item name="android:layout_height">25dp</item>-->
+        <!--<item name="android:scaleType">fitCenter</item>-->
+        <!--<item name="android:layout_centerVertical">true</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_action_bar_item_tv">-->
+        <!--<item name="android:layout_width">wrap_content</item>-->
+        <!--<item name="android:layout_height">fill_parent</item>-->
+        <!--<item name="android:layout_marginLeft">5dp</item>-->
+        <!--<item name="android:text">999</item>-->
+        <!--<item name="android:gravity">center</item>-->
+        <!--<item name="android:textColor">#ffffff</item>-->
+        <!--<item name="android:textSize">12sp</item>-->
+        <!--<item name="android:textStyle">bold</item>-->
+    <!--</style>-->
+
+    <!--网页授权的布局-->
+    <style name="umeng_socialize_popup_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+    </style>
+
+
+    <!--<style name="Theme.UMDialog" parent="android:style/Theme.Dialog">-->
+        <!--<item name="android:windowNoTitle">true</item>-->
+        <!--<item name="android:windowBackground">@android:color/transparent</item>-->
+    <!--</style>-->
+
+    <style name="Theme.UMDefault" parent="android:style/Theme.NoTitleBar"></style>
+
+    <!--<style name="umeng_socialize_divider">-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_height">1dp</item>-->
+        <!--<item name="android:background">@color/umeng_socialize_divider</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_list_item">-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_height">55dp</item>-->
+        <!--<item name="android:background">@color/umeng_socialize_list_item_bgcolor</item>-->
+        <!--<item name="android:paddingBottom">5dp</item>-->
+        <!--<item name="android:paddingTop">5dp</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_edit_padding">-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_height">fill_parent</item>-->
+        <!--<item name="android:background">@color/umeng_socialize_list_item_bgcolor</item>-->
+        <!--<item name="android:layout_marginLeft">6dp</item>-->
+        <!--<item name="android:layout_marginRight">6dp</item>-->
+        <!--<item name="android:layout_marginTop">6dp</item>-->
+        <!--<item name="android:layout_marginBottom">6dp</item>-->
+    <!--</style>-->
+
+
+</resources>