移除旧版友盟登录和分享,接入新版友盟,适配到android 13

This commit is contained in:
Lihongda 2024-01-05 03:13:02 +08:00
parent c9b6558b12
commit 615f97bf94
17 changed files with 148 additions and 179 deletions

View File

@ -41,7 +41,7 @@ android {
versionName project.versionName
multiDexEnabled true
ndk {
abiFilters 'armeabi','arm64-v8a'
abiFilters 'armeabi', 'arm64-v8a'
}
}
allprojects {
@ -73,9 +73,6 @@ dependencies {
implementation files('libs/xUtils-2.6.14.jar')
implementation files('libs/commons-logging-1.1.1.jar')
//
implementation project(':umeng_sharesdk_library')
implementation files('libs/umeng_social_sdk.jar')
implementation 'com.google.code.gson:gson:2.8.9'
//bugly
implementation files('libs/commons-io-1.4.jar')
@ -141,4 +138,18 @@ dependencies {
api "com.aliyun.ams:alicloud-android-third-push:${gradle.thirdPushVersion}"
api "com.aliyun.ams:alicloud-android-third-push-xiaomi:3.8.6.1"
api "com.aliyun.ams:alicloud-android-third-push-huawei:${gradle.thirdPushVersion}"
// SDK都依赖基础组件库
implementation 'com.umeng.umsdk:common:9.6.6'// ()
implementation 'com.umeng.umsdk:asms:1.8.0'//
implementation 'com.umeng.umsdk:share-core:7.3.3'//
//线QQSDK
implementation 'com.umeng.umsdk:share-wx:7.3.3' //
implementation 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.24' //
//
// implementation files('libs/umeng_social_sdk.jar')
}

View File

@ -85,7 +85,8 @@
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@ -113,8 +114,8 @@
<!-- 允许应用程序联网,以便向我们的服务器端发送数据 -->
<uses-permission android:name="android.permission.INTERNET" />
<!-- 定位所需的权限 -->
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
<!-- 推送相关的权限 -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" />
@ -127,7 +128,8 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@ -150,7 +152,8 @@
<uses-permission android:name="android.permission.FLASHLIGHT" />
<uses-permission android:name="android.permission.VIBRATE" />
<!-- 外置存储存取权限 -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<!-- 多媒体相关 -->
@ -197,13 +200,17 @@
<uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
<uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" />
<uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<!-- 允许task重排序 -->
<uses-permission android:name="android.permission.REORDER_TASKS" />
<!--Android 13上新增的通知权限-->
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<!--友盟微社区精简版-->
<queries>
<package android:name="com.tencent.mm" />
</queries>
<application
android:name="com.ifish.baseclass.BaseApplication"
android:allowBackup="false"
@ -225,9 +232,10 @@
android:resource="@xml/apk_path" />
</provider>
<receiver android:name="com.ifish.airkiss.UDPReceiver"
tools:ignore="Instantiatable"
android:exported="true">
<receiver
android:name="com.ifish.airkiss.UDPReceiver"
android:exported="true"
tools:ignore="Instantiatable">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
@ -235,9 +243,9 @@
<activity
android:name="com.ifish.activity.LoadingActivity"
android:exported="true"
android:launchMode="singleTop"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:exported="true">
android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@ -907,11 +915,11 @@
<!--mob短信接入-->
<!-- <activity-->
<!-- android:name="com.mob.tools.MobUIShell"-->
<!-- android:configChanges="keyboardHidden|orientation|screenSize"-->
<!-- android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
<!-- android:windowSoftInputMode="stateHidden|adjustResize" />-->
<!-- <activity-->
<!-- android:name="com.mob.tools.MobUIShell"-->
<!-- android:configChanges="keyboardHidden|orientation|screenSize"-->
<!-- android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
<!-- android:windowSoftInputMode="stateHidden|adjustResize" />-->
<!--mob短信接入-->
<!-- 微信 微博分享的Activity -->
@ -919,25 +927,25 @@
android:name=".wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
android:screenOrientation="portrait"
android:theme="@style/Transparent" />
<activity
android:name=".WBShareActivity"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait"
android:exported="true">
<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.sina.weibo.sdk.component.WeiboSdkBrowser"
android:configChanges="keyboardHidden|orientation"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/Transparent"
android:windowSoftInputMode="adjustResize"></activity>
android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
<!-- <activity-->
<!-- android:name=".WBShareActivity"-->
<!-- android:configChanges="keyboardHidden|orientation"-->
<!-- android:screenOrientation="portrait"-->
<!-- android:exported="true">-->
<!-- <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.sina.weibo.sdk.component.WeiboSdkBrowser"-->
<!-- android:configChanges="keyboardHidden|orientation"-->
<!-- android:exported="false"-->
<!-- android:screenOrientation="portrait"-->
<!-- android:theme="@style/Transparent"-->
<!-- android:windowSoftInputMode="adjustResize"></activity>-->
<!--<service
android:name="com.sina.weibo.sdk.net.DownloadService"
android:exported="false">
@ -946,17 +954,17 @@
<!-- 百度定位service -->
<!-- <service-->
<!-- android:name="com.baidu.location.f"-->
<!-- android:enabled="true"-->
<!-- android:process=":remote">-->
<!-- <intent-filter>-->
<!-- <action android:name="com.baidu.location.service_v2.2"></action>-->
<!-- </intent-filter>-->
<!-- </service>-->
<!-- <meta-data-->
<!-- android:name="com.baidu.lbsapi.API_KEY"-->
<!-- android:value="8iFyt073qxIK4vRU19nT5Q2O" />-->
<!-- <service-->
<!-- android:name="com.baidu.location.f"-->
<!-- android:enabled="true"-->
<!-- android:process=":remote">-->
<!-- <intent-filter>-->
<!-- <action android:name="com.baidu.location.service_v2.2"></action>-->
<!-- </intent-filter>-->
<!-- </service>-->
<!-- <meta-data-->
<!-- android:name="com.baidu.lbsapi.API_KEY"-->
<!-- android:value="8iFyt073qxIK4vRU19nT5Q2O" />-->
<!-- 8iFyt073qxIK4vRU19nT5Q2O 生产环境-->
<!-- 5uNPGFtw9y0aYg93OkBqrFXl 开发环境-->
<!-- meta-data需要写在application中 -->
@ -1057,10 +1065,10 @@ android:configChanges="keyboardHidden|orientation|screenSize" />-->
<activity
android:name="com.tencent.tauth.AuthActivity"
android:exported="true"
android:launchMode="singleTask"
android:noHistory="true"
android:screenOrientation="portrait"
android:exported="true">
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

View File

@ -17,8 +17,6 @@ import com.ifish.utils.Commons.NetWork;
import com.ifish.utils.Commons.Text;
import com.ifish.utils.ToastUtil;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.UMShareListener;
import com.umeng.socialize.bean.SHARE_MEDIA;
/**
* @ClassName: BrandActivity
@ -64,11 +62,7 @@ public class BrandActivity extends BaseActivity {
};
private void share() {
}
private UMShareListener umShareListener = new UMShareListener() {
public void onResult(SHARE_MEDIA platform) {}
public void onError(SHARE_MEDIA platform, Throwable t) {}
public void onCancel(SHARE_MEDIA platform) {}
};
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);

View File

@ -210,15 +210,20 @@ public class ImageSeeActivity extends BaseActivity {
};
private void share() {//微信 朋友圈 QQ 新浪
new ShareAction(ImageSeeActivity.this).setDisplayList(SHARE_MEDIA.WEIXIN,SHARE_MEDIA.WEIXIN_CIRCLE,SHARE_MEDIA.QQ,SHARE_MEDIA.SINA)
.withTitle(Text.AppName)//标题
.withText(Text.AppName)//标题
.withText(Text.ShareText)//文字
.withMedia(new UMImage(ImageSeeActivity.this,BitmapFactory.decodeFile(files[mViewPager.getCurrentItem()].getAbsolutePath())))//把本地图片当作分享的img上传至友盟
.withTargetUrl(HttpManager.LOOK_HTML_URL+data)//附带的html网址
.withText(HttpManager.LOOK_HTML_URL+data)//附带的html网址
.setCallback(umShareListener)//回调
.open();
}
private UMShareListener umShareListener = new UMShareListener() {
public void onResult(SHARE_MEDIA platform) {
@Override
public void onStart(SHARE_MEDIA shareMedia) {
}
public void onResult(SHARE_MEDIA platform) {
EventBus.getDefault().post(new ShareWechatBean("ImageListActivty"));
}
public void onError(SHARE_MEDIA platform, Throwable t) {}

View File

@ -55,8 +55,8 @@ import com.ifish.utils.SPUtil;
import com.ifish.utils.ToastUtil;
import com.ifish.view.SuperTextView;
import com.squareup.picasso.Picasso;
import com.tencent.mm.sdk.openapi.IWXAPI;
import com.tencent.mm.sdk.openapi.WXAPIFactory;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import java.net.URL;
import java.util.ArrayList;

View File

@ -43,7 +43,7 @@ import com.ifish.utils.HttpManager;
import com.ifish.utils.MD5Util;
import com.ifish.utils.SPUtil;
import com.ifish.utils.ToastUtil;
import com.tencent.mm.sdk.modelmsg.SendAuth;
import com.tencent.mm.opensdk.modelmsg.SendAuth;
import java.util.List;

View File

@ -121,15 +121,20 @@ public class LookAtReportShareActivity extends BaseActivity {
}
private void share() {//微信 朋友圈 QQ 新浪
new ShareAction(LookAtReportShareActivity.this).setDisplayList(SHARE_MEDIA.WEIXIN,SHARE_MEDIA.WEIXIN_CIRCLE,SHARE_MEDIA.QQ,SHARE_MEDIA.SINA)
.withTitle(Text.ShareReportTitle)//标题
.withText(Text.ShareReportTitle)//标题
.withText(lookReport.suggestion)//文字
.withMedia(new UMImage(LookAtReportShareActivity.this,HttpManager.LOOK_IMG_URL+lookReport.shareImg))//图片网址
.withTargetUrl(lookReport.htmlName)//附带的html网址
.withText(lookReport.htmlName)//附带的html网址
.setCallback(umShareListener)//回调
.open();
}
private UMShareListener umShareListener = new UMShareListener() {
public void onResult(SHARE_MEDIA platform) {
@Override
public void onStart(SHARE_MEDIA shareMedia) {
}
public void onResult(SHARE_MEDIA platform) {
ToastUtil.show(LookAtReportShareActivity.this, Text.SHARESUCCESS);
goldValue(Commons.GoldTasksKey.SHARELOOKREPORT);
}

View File

@ -38,7 +38,7 @@ import com.ifish.utils.HttpManager;
import com.ifish.utils.MD5Util;
import com.ifish.utils.SPUtil;
import com.ifish.utils.ToastUtil;
import com.tencent.mm.sdk.modelmsg.SendAuth;
import com.tencent.mm.opensdk.modelmsg.SendAuth;
import org.json.JSONException;
import org.json.JSONObject;

View File

@ -1,20 +1,20 @@
/**
* @Title: WBShareActivity.java
* @Package com.ifish.activity
* @Description: TODO
* @author Jacky dada
* @date 2016-9-6 下午4:16:24
*/
package com.ifish.activity;
import com.umeng.socialize.media.WBShareCallBackActivity;
/**
* @ClassName: WBShareActivity
* @Description: 微博分享回调 不可删除
* @author Jacky dada
* @date 2016-9-6 下午4:16:24
*/
public class WBShareActivity extends WBShareCallBackActivity {
}
///**
//* @Title: WBShareActivity.java
//* @Package com.ifish.activity
//* @Description: TODO
//* @author Jacky dada
//* @date 2016-9-6 下午4:16:24
// */
//package com.ifish.activity;
//
//import com.umeng.socialize.media.WBShareCallBackActivity;
//
///**
// * @ClassName: WBShareActivity
// * @Description: 微博分享回调 不可删除
// * @author Jacky dada
// * @date 2016-9-6 下午4:16:24
// */
//public class WBShareActivity extends WBShareCallBackActivity {
//
//}

View File

@ -3,18 +3,18 @@ package com.ifish.activity.wxapi;
import android.app.Activity;
import android.os.Bundle;
import androidx.annotation.Nullable;
import android.util.Log;
import com.ifish.basebean.ConnectMessageEvent;
import androidx.annotation.Nullable;
import com.ifish.basebean.WxLoginMessageEvent;
import com.tencent.mm.sdk.modelbase.BaseReq;
import com.tencent.mm.sdk.modelbase.BaseResp;
import com.tencent.mm.sdk.modelmsg.SendAuth;
import com.tencent.mm.sdk.modelmsg.SendMessageToWX;
import com.tencent.mm.sdk.openapi.IWXAPI;
import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
import com.tencent.mm.sdk.openapi.WXAPIFactory;
import com.tencent.mm.opensdk.modelbase.BaseReq;
import com.tencent.mm.opensdk.modelbase.BaseResp;
import com.tencent.mm.opensdk.modelmsg.SendAuth;
import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import de.greenrobot.event.EventBus;

View File

@ -22,7 +22,7 @@ import com.ifish.utils.SystemUtil;
import com.p2p.core.P2PSpecial.P2PSpecial;
import com.tencent.bugly.crashreport.CrashReport;
import com.tendcloud.tenddata.TCAgent;
import com.umeng.socialize.Config;
import com.umeng.commonsdk.UMConfigure;
import com.umeng.socialize.PlatformConfig;
/**
@ -142,13 +142,15 @@ public class BaseApplication extends MultiDexApplication {
//初始化友盟社会化分享
private void initShareSDK() {
UMConfigure.preInit(this,"","");
/**
* 在微博开放平台设置的授权回调REDIRECT_URL必须与代码中设置一致 http://open.weibo.com/apps/1240247140/info/advanced
*/
Config.REDIRECT_URL = "http://sns.whalecloud.com/sina2/callback";
// Config.REDIRECT_URL = "http://sns.whalecloud.com/sina2/callback";
PlatformConfig.setWeixin("wxb3b27d653ec3e3cb", "79d35215d7ef369b927f7cb21a2b8ff6");
PlatformConfig.setSinaWeibo("1240247140", "d5825aae9f4c8552b60e112b42c345f3");
PlatformConfig.setQQZone("1105206998", "rTiJNwzYY79DExD9");
PlatformConfig.setWXFileProvider("com.ifish.activity.fileprovider");
// PlatformConfig.setSinaWeibo("1240247140", "d5825aae9f4c8552b60e112b42c345f3");
// PlatformConfig.setQQZone("1105206998", "rTiJNwzYY79DExD9");
}
public boolean inMainProcess() {

View File

@ -166,6 +166,11 @@ public class CameraGalleryFragment extends BaseFragment {
//分享回调
private UMShareListener umShareListener = new UMShareListener() {
@Override
public void onStart(SHARE_MEDIA shareMedia) {
}
@Override
public void onResult(SHARE_MEDIA platform) {
EventBus.getDefault().post(new ShareWechatBean("DeviceFragment"));

View File

@ -7,6 +7,8 @@
*/
package com.ifish.fragment;
import static android.content.Context.NOTIFICATION_SERVICE;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
@ -40,7 +42,6 @@ import com.ifish.activity.MyLookAtActivity;
import com.ifish.activity.MyLookAtNullActivity;
import com.ifish.activity.MySettingActivity;
import com.ifish.activity.R;
import com.ifish.activity.SettingActivity;
import com.ifish.activity.TellIfishActivity;
import com.ifish.basebean.BaseBean;
import com.ifish.basebean.FinishMainActivity;
@ -76,8 +77,6 @@ import java.lang.reflect.Field;
import de.greenrobot.event.EventBus;
import static android.content.Context.NOTIFICATION_SERVICE;
/**
* @author Jacky dada
* @ClassName: MineFragment
@ -446,6 +445,11 @@ public class MineFragment extends BaseV4Fragment {
//分享回调
private UMShareListener umShareListener = new UMShareListener() {
@Override
public void onStart(SHARE_MEDIA shareMedia) {
}
@Override
public void onResult(SHARE_MEDIA platform) {
ToastUtil.show(getActivity(), Text.SHARESUCCESS);

View File

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<RelativeLayout
style="@style/umeng_socialize_list_item" >
<ImageView
android:id="@+id/umeng_socialize_full_alert_dialog_item_icon"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginLeft="25dp"
android:scaleType="fitXY"
android:src="@drawable/umeng_socialize_tx_on" />
<TextView
android:id="@+id/umeng_socialize_full_alert_dialog_item_text"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@id/umeng_socialize_full_alert_dialog_item_icon"
android:gravity="center_vertical"
android:textColor="@color/umeng_socialize_list_item_textcolor"
android:textSize="18sp" />
<TextView
android:id="@+id/umeng_socialize_full_alert_dialog_item_status"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_alignParentRight="true"
android:layout_marginRight="12dp"
android:gravity="center_vertical"
android:textColor="@color/umeng_socialize_list_item_textcolor"
android:textSize="15sp" />
</RelativeLayout>
<View
android:id="@+id/umeng_socialize_full_alert_dialog_divider"
style="@style/umeng_socialize_divider"/>
</LinearLayout>

View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="80dp"
android:layout_height="90dp"
android:background="@drawable/umeng_socialize_shareboard_item_background" >
<ImageView
android:id="@+id/umeng_socialize_shareboard_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
android:scaleType="fitXY"
android:src="@drawable/umeng_socialize_tx_on" />
<TextView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:id="@+id/umeng_socialize_shareboard_pltform_name"
android:layout_alignParentBottom="true"
android:layout_marginBottom="4dp"
android:layout_centerHorizontal="true"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:text="QQ空间"
android:singleLine="true"
android:textSize="11sp"
android:gravity="center"/>
</RelativeLayout>

View File

@ -5,11 +5,17 @@
path="." />
<external-path
name="apk_path"
path="."/>
path="." />
<external-path
name="external_files"
path="." />
<external-path
name="files_root"
path="Android/data/com.ifish.activity/download/"/>
path="Android/data/com.ifish.activity/download/" />
<external-files-path
name="umeng_cache"
path="umeng_cache/" />
<root-path
name="opensdk_root"
path="" />
</paths>

View File

@ -1,4 +1,4 @@
include ':umeng_sharesdk_library'
//include ':umeng_sharesdk_library'
include ':iFish7'
include ':BageView'
include ':JCVideo_Library'