Skip to content

Commit

Permalink
iOS v4.0.3 Android v3.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jychenX committed Dec 7, 2017
1 parent e552f8e commit 1df0d03
Show file tree
Hide file tree
Showing 232 changed files with 378 additions and 399 deletions.
6 changes: 3 additions & 3 deletions Android_Java_Demo/assets/ShareSDK.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
AppSecret="38a4f8204cc784f81f9f0daaf31e02e3"
RedirectUrl="http://www.sharesdk.cn"
ShareByAppClient="true"
ShareByWebApi = "false"
Enable="true" />

<TencentWeibo
Expand All @@ -78,6 +77,7 @@
AppId="100371282"
AppKey="aed9b0303e3ed1e27bae87c33761161d"
BypassApproval="true"
BypassApproval = "false"
Enable="true" />

<!--
Expand All @@ -98,8 +98,8 @@
SortId="4"
AppId="wx4868b35061f87885"
AppSecret="64020361b8ec4c99936c0e3999a9f249"
userName="gh_afb25ac019c9"
path="pages/index/index.html?id=1"
UserName="gh_afb25ac019c9"
Path="pages/index/index.html?id=1"
BypassApproval="true"
Enable="true" />

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Alipay-3.1.1.jar
Binary file not shown.
Binary file added Android_Java_Demo/libs/ShareSDK-Alipay-3.1.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Core-3.1.1.jar
Binary file not shown.
Binary file added Android_Java_Demo/libs/ShareSDK-Core-3.1.2.jar
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Dingding-3.1.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Flickr-3.1.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Mingdao-3.1.1.jar
Binary file not shown.
Binary file added Android_Java_Demo/libs/ShareSDK-Mingdao-3.1.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-QQ-3.1.1.jar
Binary file not shown.
Binary file added Android_Java_Demo/libs/ShareSDK-QQ-3.1.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Telegram-3.1.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Twitter-3.1.1.jar
Binary file not shown.
Binary file added Android_Java_Demo/libs/ShareSDK-Twitter-3.1.2.jar
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Wechat-3.1.1.jar
Binary file not shown.
Binary file added Android_Java_Demo/libs/ShareSDK-Wechat-3.1.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android_Java_Demo/libs/ShareSDK-Yixin-3.1.1.jar
Binary file not shown.
Binary file added Android_Java_Demo/libs/ShareSDK-Yixin-3.1.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ public void setImageUrl(String imageUrl) {
}

/** imageData是bitmap图片,微信、易信支持此字段 */
public void setImageData(String iamgeData) {
if(!TextUtils.isEmpty(iamgeData)) {
public void setImageData(Bitmap iamgeData) {
if(iamgeData != null) {
params.put("imageData", iamgeData);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
package cn.sharesdk.onekeyshare;

import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.os.Handler.Callback;
Expand Down Expand Up @@ -105,7 +103,7 @@ public final void show(Context context) {
/** 判断指定平台是否只能使用客户端分享 */
final boolean isUseClientToShare(Platform platform) {
String name = platform.getName();
if ("Wechat".equals(name) || "WechatMoments".equals(name)
if ("SinaWeibo".equals(name) || "Wechat".equals(name) || "WechatMoments".equals(name)
|| "WechatFavorite".equals(name) || "ShortMessage".equals(name)
|| "Email".equals(name) || "Qzone".equals(name)
|| "QQ".equals(name) || "Pinterest".equals(name)
Expand All @@ -126,23 +124,15 @@ final boolean isUseClientToShare(Platform platform) {
if ("true".equals(platform.getDevinfo("ShareByAppClient"))) {
return true;
}
} else if ("SinaWeibo".equals(name)) {
if ("true".equals(platform.getDevinfo("ShareByAppClient"))) {

Intent test = new Intent(Intent.ACTION_SEND);
test.setPackage("com.sina.weibo");
test.setType("image/*");
ResolveInfo ri = MobSDK.getContext().getPackageManager().resolveActivity(test, 0);
if(ri == null) {
test = new Intent(Intent.ACTION_SEND);
test.setPackage("com.sina.weibog3");
test.setType("image/*");
ri = MobSDK.getContext().getPackageManager().resolveActivity(test, 0);
}
return (ri != null);
} else if ("Facebook".equals(name)){
boolean shareByAppClient = "true".equals(platform.getDevinfo("ShareByAppClient"));
if(shareByAppClient && platform.isClientValid()){
return true;
} else if(shareParamsMap.containsKey("url") && !TextUtils.isEmpty((String)shareParamsMap.get("url"))){
System.out.println("Facebook:" + platform.getDevinfo("ShareByAppClient"));
return true;
}
}

return false;
}

Expand Down Expand Up @@ -264,19 +254,19 @@ final boolean formateShareData(Platform plat) {
shareType = Platform.SHARE_IMAGE;
if (imagePath.endsWith(".gif") && isWechat) {
shareType = Platform.SHARE_EMOJI;
} else if (shareParamsMap.containsKey("url") && !TextUtils.isEmpty(shareParamsMap.get("url").toString())) {
} else if (shareParamsMap.containsKey("url") && !TextUtils.isEmpty((String)shareParamsMap.get("url"))) {
shareType = Platform.SHARE_WEBPAGE;
if (shareParamsMap.containsKey("musicUrl") && !TextUtils.isEmpty(shareParamsMap.get("musicUrl").toString()) && isWechat) {
if (shareParamsMap.containsKey("musicUrl") && !TextUtils.isEmpty((String)shareParamsMap.get("musicUrl")) && isWechat) {
shareType = Platform.SHARE_MUSIC;
}
}
} else {
Bitmap viewToShare = ResHelper.forceCast(shareParamsMap.get("viewToShare"));
if (viewToShare != null && !viewToShare.isRecycled()) {
shareType = Platform.SHARE_IMAGE;
if (shareParamsMap.containsKey("url") && !TextUtils.isEmpty(shareParamsMap.get("url").toString())) {
if (shareParamsMap.containsKey("url") && !TextUtils.isEmpty((String)shareParamsMap.get("url"))) {
shareType = Platform.SHARE_WEBPAGE;
if (shareParamsMap.containsKey("musicUrl") && !TextUtils.isEmpty(shareParamsMap.get("musicUrl").toString()) && isWechat) {
if (shareParamsMap.containsKey("musicUrl") && !TextUtils.isEmpty((String)shareParamsMap.get("musicUrl")) && isWechat) {
shareType = Platform.SHARE_MUSIC;
}
}
Expand All @@ -286,9 +276,9 @@ final boolean formateShareData(Platform plat) {
shareType = Platform.SHARE_IMAGE;
if (String.valueOf(imageUrl).endsWith(".gif") && isWechat) {
shareType = Platform.SHARE_EMOJI;
} else if (shareParamsMap.containsKey("url") && !TextUtils.isEmpty(shareParamsMap.get("url").toString())) {
} else if (shareParamsMap.containsKey("url") && !TextUtils.isEmpty((String)shareParamsMap.get("url"))) {
shareType = Platform.SHARE_WEBPAGE;
if (shareParamsMap.containsKey("musicUrl") && !TextUtils.isEmpty(shareParamsMap.get("musicUrl").toString()) && isWechat) {
if (shareParamsMap.containsKey("musicUrl") && !TextUtils.isEmpty((String)shareParamsMap.get("musicUrl")) && isWechat) {
shareType = Platform.SHARE_MUSIC;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public PlatformPageLand(OnekeyShareThemeImpl impl) {
}

public void onCreate() {
requestLandscapeOrientation();
requestSensorLandscapeOrientation();
super.onCreate();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public PlatformPagePort(OnekeyShareThemeImpl impl) {
}

public void onCreate() {
requestPortraitOrientation();
requestSensorPortraitOrientation();
super.onCreate();
}

Expand Down
Binary file modified ShareSDKForU3D.unitypackage
Binary file not shown.
Binary file modified ShareSDKForU3DWithEditor.unitypackage
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.
Loading

0 comments on commit 1df0d03

Please sign in to comment.