diff --git a/iFish7/build.gradle b/iFish7/build.gradle
index 307800b58..11f22f90d 100644
--- a/iFish7/build.gradle
+++ b/iFish7/build.gradle
@@ -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'//分享核心库，必选
+ //在线依赖目前支持QQ、微信、新浪微博、支付宝、钉钉、抖音；若需支持其他平台，请选择手动下载SDK
+ 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')
+
+
}
\ No newline at end of file
diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml
index 8b9ea3db7..c7f159464 100644
--- a/iFish7/src/main/AndroidManifest.xml
+++ b/iFish7/src/main/AndroidManifest.xml
@@ -85,7 +85,8 @@
-
@@ -113,8 +114,8 @@
-
-
+
+
@@ -127,7 +128,8 @@
-
@@ -150,7 +152,8 @@
-
@@ -197,13 +200,17 @@
-
+
+
+
+
+
-
+
@@ -235,9 +243,9 @@
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
@@ -907,11 +915,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -919,25 +927,25 @@
android:name=".wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
- android:screenOrientation="portrait"
- android:theme="@style/Transparent" />
-
-
-
-
-
-
-
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1057,10 +1065,10 @@ android:configChanges="keyboardHidden|orientation|screenSize" />-->
+ android:screenOrientation="portrait">
diff --git a/iFish7/src/main/java/com/ifish/activity/BrandActivity.java b/iFish7/src/main/java/com/ifish/activity/BrandActivity.java
index f210441d2..fb7bbf0ff 100644
--- a/iFish7/src/main/java/com/ifish/activity/BrandActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/BrandActivity.java
@@ -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);
diff --git a/iFish7/src/main/java/com/ifish/activity/ImageSeeActivity.java b/iFish7/src/main/java/com/ifish/activity/ImageSeeActivity.java
index 6203fba3a..73e5cb707 100644
--- a/iFish7/src/main/java/com/ifish/activity/ImageSeeActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/ImageSeeActivity.java
@@ -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) {}
diff --git a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
index 3e0452dfc..5065f7094 100644
--- a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
@@ -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;
diff --git a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java
index c54548cb7..7b99711ea 100644
--- a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java
@@ -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;
diff --git a/iFish7/src/main/java/com/ifish/activity/LookAtReportShareActivity.java b/iFish7/src/main/java/com/ifish/activity/LookAtReportShareActivity.java
index c81ca0685..66216f2e8 100644
--- a/iFish7/src/main/java/com/ifish/activity/LookAtReportShareActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/LookAtReportShareActivity.java
@@ -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);
}
diff --git a/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java b/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java
index b651a7bbe..907f7dad8 100644
--- a/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java
@@ -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;
diff --git a/iFish7/src/main/java/com/ifish/activity/WBShareActivity.java b/iFish7/src/main/java/com/ifish/activity/WBShareActivity.java
index a4e701a28..8e8762306 100644
--- a/iFish7/src/main/java/com/ifish/activity/WBShareActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/WBShareActivity.java
@@ -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 {
+//
+//}
diff --git a/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java b/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java
index 7b9c5997e..1c533b420 100644
--- a/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java
@@ -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;
diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java
index 7e83502ea..0ed738103 100644
--- a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java
+++ b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java
@@ -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() {
diff --git a/iFish7/src/main/java/com/ifish/fragment/CameraGalleryFragment.java b/iFish7/src/main/java/com/ifish/fragment/CameraGalleryFragment.java
index fc82b830e..304e584e3 100644
--- a/iFish7/src/main/java/com/ifish/fragment/CameraGalleryFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/CameraGalleryFragment.java
@@ -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"));
diff --git a/iFish7/src/main/java/com/ifish/fragment/MineFragment.java b/iFish7/src/main/java/com/ifish/fragment/MineFragment.java
index 6e6a5d45c..4e46e5261 100644
--- a/iFish7/src/main/java/com/ifish/fragment/MineFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/MineFragment.java
@@ -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);
diff --git a/iFish7/src/main/res/layout/umeng_socialize_full_alert_dialog_item.xml b/iFish7/src/main/res/layout/umeng_socialize_full_alert_dialog_item.xml
deleted file mode 100644
index f381b0abb..000000000
--- a/iFish7/src/main/res/layout/umeng_socialize_full_alert_dialog_item.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/iFish7/src/main/res/layout/umeng_socialize_shareboard_item.xml b/iFish7/src/main/res/layout/umeng_socialize_shareboard_item.xml
deleted file mode 100644
index 4f8c4a0c0..000000000
--- a/iFish7/src/main/res/layout/umeng_socialize_shareboard_item.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/iFish7/src/main/res/xml/apk_path.xml b/iFish7/src/main/res/xml/apk_path.xml
index 974f7b998..9a3648e5a 100644
--- a/iFish7/src/main/res/xml/apk_path.xml
+++ b/iFish7/src/main/res/xml/apk_path.xml
@@ -5,11 +5,17 @@
path="." />
+ path="." />
+ path="Android/data/com.ifish.activity/download/" />
+
+
diff --git a/settings.gradle b/settings.gradle
index f2110fcba..7df3366f2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':umeng_sharesdk_library'
+//include ':umeng_sharesdk_library'
include ':iFish7'
include ':BageView'
include ':JCVideo_Library'
\ No newline at end of file