Permalink
Browse files

iOS v4.0.4 Android v3.1.2

  • Loading branch information...
jychenX committed Dec 8, 2017
1 parent 7136412 commit 0eb8c1117a9d5d3c5eb6e989bec1579a76a2b930
Showing with 20 additions and 30 deletions.
  1. +2 −2 Android/jsdemo/assets/ShareSDK.xml
  2. BIN Android/jsdemo/libs/MobCommons-2017.1024.1907.jar
  3. BIN Android/jsdemo/libs/MobCommons-2017.1201.1507.jar
  4. BIN Android/jsdemo/libs/{MobTools-2017.1024.1907.jar → MobTools-2017.1201.1507.jar}
  5. BIN Android/jsdemo/libs/ShareSDK-Alipay-3.1.1.jar
  6. BIN Android/jsdemo/libs/ShareSDK-Alipay-3.1.2.jar
  7. BIN Android/jsdemo/libs/ShareSDK-Alipay-Core-3.1.1.jar
  8. BIN Android/jsdemo/libs/ShareSDK-Alipay-Core-3.1.2.jar
  9. BIN Android/jsdemo/libs/ShareSDK-Alipay-Moments-3.1.1.jar
  10. BIN Android/jsdemo/libs/ShareSDK-Alipay-Moments-3.1.2.jar
  11. BIN Android/jsdemo/libs/ShareSDK-Core-3.1.1.jar
  12. BIN Android/jsdemo/libs/ShareSDK-Core-3.1.2.jar
  13. BIN Android/jsdemo/libs/ShareSDK-Dingding-3.1.1.jar
  14. BIN Android/jsdemo/libs/ShareSDK-Dingding-3.1.2.jar
  15. BIN Android/jsdemo/libs/{ShareSDK-Douban-3.1.1.jar → ShareSDK-Douban-3.1.2.jar}
  16. BIN Android/jsdemo/libs/{ShareSDK-Dropbox-3.1.1.jar → ShareSDK-Dropbox-3.1.2.jar}
  17. BIN Android/jsdemo/libs/{ShareSDK-Email-3.1.1.jar → ShareSDK-Email-3.1.2.jar}
  18. BIN Android/jsdemo/libs/{ShareSDK-Evernote-3.1.1.jar → ShareSDK-Evernote-3.1.2.jar}
  19. BIN Android/jsdemo/libs/{ShareSDK-Facebook-3.1.1.jar → ShareSDK-Facebook-3.1.2.jar}
  20. BIN Android/jsdemo/libs/ShareSDK-FacebookMessenger-3.1.1.jar
  21. BIN Android/jsdemo/libs/ShareSDK-FacebookMessenger-3.1.2.jar
  22. BIN Android/jsdemo/libs/ShareSDK-Flickr-3.1.1.jar
  23. BIN Android/jsdemo/libs/ShareSDK-Flickr-3.1.2.jar
  24. BIN Android/jsdemo/libs/{ShareSDK-Foursquare-3.1.1.jar → ShareSDK-Foursquare-3.1.2.jar}
  25. BIN Android/jsdemo/libs/{ShareSDK-GooglePlus-3.1.1.jar → ShareSDK-GooglePlus-3.1.2.jar}
  26. BIN Android/jsdemo/libs/{ShareSDK-Instagram-3.1.1.jar → ShareSDK-Instagram-3.1.2.jar}
  27. BIN Android/jsdemo/libs/{ShareSDK-Instapaper-3.1.1.jar → ShareSDK-Instapaper-3.1.2.jar}
  28. BIN Android/jsdemo/libs/{ShareSDK-KaiXin-3.1.1.jar → ShareSDK-KaiXin-3.1.2.jar}
  29. BIN Android/jsdemo/libs/{ShareSDK-Kakao-Core-3.1.1.jar → ShareSDK-Kakao-Core-3.1.2.jar}
  30. BIN Android/jsdemo/libs/{ShareSDK-KakaoStory-3.1.1.jar → ShareSDK-KakaoStory-3.1.2.jar}
  31. BIN Android/jsdemo/libs/{ShareSDK-KakaoTalk-3.1.1.jar → ShareSDK-KakaoTalk-3.1.2.jar}
  32. BIN Android/jsdemo/libs/{ShareSDK-Line-3.1.1.jar → ShareSDK-Line-3.1.2.jar}
  33. BIN Android/jsdemo/libs/{ShareSDK-Linkedin-3.1.1.jar → ShareSDK-Linkedin-3.1.2.jar}
  34. BIN Android/jsdemo/libs/{ShareSDK-Meipai-3.1.1.jar → ShareSDK-Meipai-3.1.2.jar}
  35. BIN Android/jsdemo/libs/ShareSDK-Mingdao-3.1.1.jar
  36. BIN Android/jsdemo/libs/ShareSDK-Mingdao-3.1.2.jar
  37. BIN Android/jsdemo/libs/{ShareSDK-Pinterest-3.1.1.jar → ShareSDK-Pinterest-3.1.2.jar}
  38. BIN Android/jsdemo/libs/{ShareSDK-Pocket-3.1.1.jar → ShareSDK-Pocket-3.1.2.jar}
  39. BIN Android/jsdemo/libs/ShareSDK-QQ-3.1.1.jar
  40. BIN Android/jsdemo/libs/ShareSDK-QQ-3.1.2.jar
  41. BIN Android/jsdemo/libs/{ShareSDK-QZone-3.1.1.jar → ShareSDK-QZone-3.1.2.jar}
  42. BIN Android/jsdemo/libs/{ShareSDK-Renren-3.1.1.jar → ShareSDK-Renren-3.1.2.jar}
  43. BIN Android/jsdemo/libs/{ShareSDK-ShortMessage-3.1.1.jar → ShareSDK-ShortMessage-3.1.2.jar}
  44. BIN Android/jsdemo/libs/{ShareSDK-SinaWeibo-3.1.1.jar → ShareSDK-SinaWeibo-3.1.2.jar}
  45. BIN Android/jsdemo/libs/ShareSDK-Telegram-3.1.1.jar
  46. BIN Android/jsdemo/libs/{ShareSDK-TencentWeibo-3.1.1.jar → ShareSDK-TencentWeibo-3.1.2.jar}
  47. BIN Android/jsdemo/libs/{ShareSDK-Tumblr-3.1.1.jar → ShareSDK-Tumblr-3.1.2.jar}
  48. BIN Android/jsdemo/libs/ShareSDK-Twitter-3.1.1.jar
  49. BIN Android/jsdemo/libs/ShareSDK-Twitter-3.1.2.jar
  50. BIN Android/jsdemo/libs/{ShareSDK-VKontakte-3.1.1.jar → ShareSDK-VKontakte-3.1.2.jar}
  51. BIN Android/jsdemo/libs/ShareSDK-Wechat-3.1.1.jar
  52. BIN Android/jsdemo/libs/ShareSDK-Wechat-3.1.2.jar
  53. BIN Android/jsdemo/libs/ShareSDK-Wechat-Core-3.1.1.jar
  54. BIN Android/jsdemo/libs/ShareSDK-Wechat-Core-3.1.2.jar
  55. BIN Android/jsdemo/libs/ShareSDK-Wechat-Favorite-3.1.1.jar
  56. BIN Android/jsdemo/libs/ShareSDK-Wechat-Favorite-3.1.2.jar
  57. BIN Android/jsdemo/libs/ShareSDK-Wechat-Moments-3.1.1.jar
  58. BIN Android/jsdemo/libs/ShareSDK-Wechat-Moments-3.1.2.jar
  59. BIN Android/jsdemo/libs/{ShareSDK-WhatsApp-3.1.1.jar → ShareSDK-WhatsApp-3.1.2.jar}
  60. BIN Android/jsdemo/libs/ShareSDK-Yixin-3.1.1.jar
  61. BIN Android/jsdemo/libs/ShareSDK-Yixin-3.1.2.jar
  62. BIN Android/jsdemo/libs/{ShareSDK-Yixin-Core-3.1.1.jar → ShareSDK-Yixin-Core-3.1.2.jar}
  63. BIN Android/jsdemo/libs/ShareSDK-Yixin-Moments-3.1.1.jar
  64. BIN Android/jsdemo/libs/ShareSDK-Yixin-Moments-3.1.2.jar
  65. BIN Android/jsdemo/libs/{ShareSDK-YouDao-3.1.1.jar → ShareSDK-YouDao-3.1.2.jar}
  66. BIN Android/jsdemo/libs/{ShareSDK-Youtube-3.1.1.jar → ShareSDK-Youtube-3.1.2.jar}
  67. +2 −2 Android/jsdemo/src/cn/sharesdk/onekeyshare/OnekeyShare.java
  68. +14 −24 Android/jsdemo/src/cn/sharesdk/onekeyshare/OnekeyShareThemeImpl.java
  69. +1 −1 Android/jsdemo/src/cn/sharesdk/onekeyshare/themes/classic/land/PlatformPageLand.java
  70. +1 −1 Android/jsdemo/src/cn/sharesdk/onekeyshare/themes/classic/port/PlatformPagePort.java
@@ -92,8 +92,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" />
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 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 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.
@@ -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);
}
}
@@ -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;
@@ -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)
@@ -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;
}
@@ -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;
}
}
@@ -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;
}
}
@@ -22,7 +22,7 @@ public PlatformPageLand(OnekeyShareThemeImpl impl) {
}
public void onCreate() {
requestLandscapeOrientation();
requestSensorLandscapeOrientation();
super.onCreate();
}
@@ -22,7 +22,7 @@ public PlatformPagePort(OnekeyShareThemeImpl impl) {
}
public void onCreate() {
requestPortraitOrientation();
requestSensorPortraitOrientation();
super.onCreate();
}

0 comments on commit 0eb8c11

Please sign in to comment.