jet 8 éve
szülő
commit
4210fd9151
46 módosított fájl, 370 hozzáadás és 56 törlés
  1. 12 12
      Assets/Plugins/Android/ShareSDK/AndroidManifest.xml
  2. 3 3
      Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0808.1625.jar.meta
  3. 3 3
      Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0801.1522.jar.meta
  4. BIN
      Assets/Plugins/Android/ShareSDK/libs/OneKeyShare.jar
  5. 2 2
      Assets/Plugins/Android/ShareSDK/libs/OneKeyShare.jar.meta
  6. 2 2
      Assets/Plugins/Android/ShareSDK/libs/SSDKU3D.jar.meta
  7. 3 3
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.1.jar.meta
  8. 3 3
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.1.jar.meta
  9. 3 3
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.1.jar.meta
  10. 3 3
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.1.jar.meta
  11. 3 3
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.1.jar.meta
  12. 9 0
      Assets/Plugins/Android/ShareSDK/libs/armeabi-v7a.meta
  13. BIN
      Assets/Plugins/Android/ShareSDK/libs/armeabi-v7a/libweibosdkcore.so
  14. 8 0
      Assets/Plugins/Android/ShareSDK/libs/armeabi-v7a/libweibosdkcore.so.meta
  15. 9 0
      Assets/Plugins/Android/ShareSDK/libs/mips.meta
  16. BIN
      Assets/Plugins/Android/ShareSDK/libs/mips/libweibosdkcore.so
  17. 8 0
      Assets/Plugins/Android/ShareSDK/libs/mips/libweibosdkcore.so.meta
  18. 9 0
      Assets/Plugins/Android/ShareSDK/libs/x86.meta
  19. BIN
      Assets/Plugins/Android/ShareSDK/libs/x86/libweibosdkcore.so
  20. 8 0
      Assets/Plugins/Android/ShareSDK/libs/x86/libweibosdkcore.so.meta
  21. BIN
      Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_dingding.png
  22. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_dingding.png.meta
  23. BIN
      Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_meipai.png
  24. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_meipai.png.meta
  25. BIN
      Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_youtube.png
  26. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_youtube.png.meta
  27. 9 0
      Assets/Plugins/Android/ShareSDK/res/drawable-xxhdpi-v4.meta
  28. BIN
      Assets/Plugins/Android/ShareSDK/res/drawable-xxhdpi-v4/ssdk_weibo_empty_failed.png
  29. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable-xxhdpi-v4/ssdk_weibo_empty_failed.png.meta
  30. BIN
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_common_shadow_top.9.png
  31. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_common_shadow_top.9.png.meta
  32. 15 0
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_default.xml
  33. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_default.xml.meta
  34. 15 0
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_press.xml
  35. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_press.xml.meta
  36. 10 0
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_selector.xml
  37. 8 0
      Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_selector.xml.meta
  38. 9 0
      Assets/Plugins/Android/ShareSDK/res/layout.meta
  39. 73 0
      Assets/Plugins/Android/ShareSDK/res/layout/ssdk_weibo_web_layout.xml
  40. 8 0
      Assets/Plugins/Android/ShareSDK/res/layout/ssdk_weibo_web_layout.xml.meta
  41. 12 0
      Assets/Plugins/Android/ShareSDK/res/values-en/ssdk_strings.xml
  42. 3 3
      Assets/Plugins/Android/ShareSDK/res/values-en/ssdk_strings.xml.meta
  43. 16 0
      Assets/Plugins/Android/ShareSDK/res/values/ssdk_strings.xml
  44. 3 3
      Assets/Plugins/Android/ShareSDK/res/values/ssdk_strings.xml.meta
  45. 42 10
      Assets/Plugins/iOS/ShareSDKUnity3DBridge.m
  46. 3 3
      ToDoList.txt

+ 12 - 12
Assets/Plugins/Android/ShareSDK/AndroidManifest.xml

@@ -8,13 +8,13 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    --><!-- 蓝牙分享所需的权限 --><!--
+    <!-- 蓝牙分享所需的权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     
     <uses-sdk
         android:minSdkVersion="8"
@@ -34,7 +34,7 @@
             	则分享结束以后不能得到正确的回调
             -->
             <intent-filter android:priority="1000" >
-                <data android:scheme="tencent100371282" />
+                <data android:scheme="tencent1106316278" />
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -47,34 +47,34 @@
 						</intent-filter>
 						
 					 <!-- 集成Line客户端登录授权,需要添加如下格式的过滤器 -->
-            <!-- <intent-filter android:priority="1000">
+            <intent-filter android:priority="1000">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
   						 <data android:scheme="line.1477692153" />
-            </intent-filter>	 -->
+            </intent-filter>	
         </activity>
 		
         <!-- 微信分享回调 -->
-        <!-- <activity
+        <activity
             android:name=".wxapi.WXEntryActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:exported="true" /> -->
+            android:exported="true" />
         <!-- 易信分享回调 -->
-        <!-- <activity
+        <activity
             android:name=".yxapi.YXEntryActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:excludeFromRecents="true"
             android:exported="true"
-            android:launchMode="singleTop" />			 -->
+            android:launchMode="singleTop" />			
         <!-- 支付宝分享回调 -->
-        <!-- <activity
+        <activity
             android:name=".apshare.ShareEntryActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:exported="true"/> -->
+            android:exported="true"/>
 
         <meta-data android:name="Mob-AppKey" android:value="mob_a6b6c6d6"/>
         <meta-data android:name="Mob-AppSecret" android:value="b89d2427a3bc7ad1aea1e1e8c1d36bf3"/>				

+ 3 - 3
Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0808.1625.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 920b65b36bf241b47af4e3a7ad1aa137
-timeCreated: 1503473326
-licenseType: Pro
+guid: e159d6b509eec8f46977d69decda5a23
+timeCreated: 1502247330
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 3
Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0801.1522.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: bae7e35a2bd60d1439ade2545f085599
-timeCreated: 1503473326
-licenseType: Pro
+guid: ff4c39b79eba1e34e9d71fd975d4310c
+timeCreated: 1502247358
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

BIN
Assets/Plugins/Android/ShareSDK/libs/OneKeyShare.jar


+ 2 - 2
Assets/Plugins/Android/ShareSDK/libs/OneKeyShare.jar.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 2ce91c7ffb8c5e942a6de7e882335955
-timeCreated: 1482811317
+guid: e7afdb8d247844d4f93c20a53b81d5e8
+timeCreated: 1502248985
 licenseType: Free
 DefaultImporter:
   userData: 

+ 2 - 2
Assets/Plugins/Android/ShareSDK/libs/SSDKU3D.jar.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: a3b4331e55c549944bb1496e8097a54b
-timeCreated: 1482811318
+guid: b1eef4d960afda9419f7a9d735b0546d
+timeCreated: 1502247333
 licenseType: Free
 DefaultImporter:
   userData: 

+ 3 - 3
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.1.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: cf39d8c65dcaba347a925f59a18b7bfb
-timeCreated: 1503473400
-licenseType: Pro
+guid: 4618a46870f9a90479c17cae7e3c1db3
+timeCreated: 1502247356
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 3
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.1.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: fc9aafd9a5913334eb503feb503aae07
-timeCreated: 1503473425
-licenseType: Pro
+guid: e2ce2d791a21ba04f88f2bce05b3fed5
+timeCreated: 1502247358
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 3
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.1.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: a921d116065053045a3b39eb195968c3
-timeCreated: 1503471815
-licenseType: Pro
+guid: 6d94d8a4e902afb4ca7adcef3a0d584f
+timeCreated: 1502247356
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 3
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.1.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 7c1a1d2ff7c246c47b34b699219cb323
-timeCreated: 1503471815
-licenseType: Pro
+guid: ab3d31e32599f394e84cab166f88b23b
+timeCreated: 1502247357
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 3
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.1.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: e53d8e94426406c4581b9d812a150b61
-timeCreated: 1503471815
-licenseType: Pro
+guid: 99fe6bafe5658784989bfb93d7268af3
+timeCreated: 1502249251
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 9 - 0
Assets/Plugins/Android/ShareSDK/libs/armeabi-v7a.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 3bb7ca30a22f46645a2a506089f84681
+folderAsset: yes
+timeCreated: 1502247356
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/armeabi-v7a/libweibosdkcore.so


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/armeabi-v7a/libweibosdkcore.so.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b2ae163b2ba16be47b7a9bab183bd975
+timeCreated: 1502247358
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/Android/ShareSDK/libs/mips.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 87bfcba01dac31641985e930daa16a12
+folderAsset: yes
+timeCreated: 1502247357
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/mips/libweibosdkcore.so


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/mips/libweibosdkcore.so.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c10a36a1d7e18014ea66555a167f5af1
+timeCreated: 1502247359
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/Android/ShareSDK/libs/x86.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8c3ccee60921c2849be4ab2595867d8b
+folderAsset: yes
+timeCreated: 1502247357
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/x86/libweibosdkcore.so


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/x86/libweibosdkcore.so.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ee188182e9ec6dc4faa8081adbbf7020
+timeCreated: 1502247359
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_dingding.png


+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_dingding.png.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1909c9cedf987234495d62ce58d30980
+timeCreated: 1498723393
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_meipai.png


+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_meipai.png.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a5d86b6b07c5fb4e84d9185ad60c9f8
+timeCreated: 1498723393
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_youtube.png


+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable-xhdpi/ssdk_oks_classic_youtube.png.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6bfec4e8f3bf68542b3a251be5980ec9
+timeCreated: 1498723393
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/Android/ShareSDK/res/drawable-xxhdpi-v4.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 33aaa5a0ae34b7746b8e040a177914ae
+folderAsset: yes
+timeCreated: 1502249367
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/res/drawable-xxhdpi-v4/ssdk_weibo_empty_failed.png


+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable-xxhdpi-v4/ssdk_weibo_empty_failed.png.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 965d05d40d82db0489cfc835d70bc29e
+timeCreated: 1502249367
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_common_shadow_top.9.png


+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_common_shadow_top.9.png.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f5c02491ed7162f48a2bdcdc3598c530
+timeCreated: 1502247383
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_default.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="0.5dp"
+        android:color="#99aaaaaa"
+        />
+    <solid
+        android:color="#99eeeeee"/>
+    <corners
+        android:radius="9dp"
+        android:topLeftRadius="2dp"
+        android:topRightRadius="2dp"
+        android:bottomLeftRadius="2dp"
+        android:bottomRightRadius="2dp"/>
+</shape>

+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_default.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 100bef5d6866888458ed0683200daa9d
+timeCreated: 1502247383
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_press.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="0.5dp"
+        android:color="#99aaaaaa"
+       />
+    <solid
+        android:color="#99cccccc"/>
+    <corners
+        android:radius="9dp"
+        android:topLeftRadius="2dp"
+        android:topRightRadius="2dp"
+        android:bottomLeftRadius="2dp"
+        android:bottomRightRadius="2dp"/>
+</shape>

+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_press.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c27ede9e61437194fbec154b576202f3
+timeCreated: 1502247383
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 0
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_selector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:drawable="@drawable/ssdk_weibo_retry_btn_press" android:state_focused="true"></item>
+    <item android:drawable="@drawable/ssdk_weibo_retry_btn_press" android:state_pressed="true"></item>
+    <item android:drawable="@drawable/ssdk_weibo_retry_btn_press" android:state_selected="true"></item>
+    <item android:drawable="@drawable/ssdk_weibo_retry_btn_press" android:state_checked="true"></item>
+    <item android:drawable="@drawable/ssdk_weibo_retry_btn_default"></item>
+
+</selector>

+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/drawable/ssdk_weibo_retry_btn_selector.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e690df08ecae0c14586b9e4620a69d54
+timeCreated: 1502247383
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/Android/ShareSDK/res/layout.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1ca635562e74d2f4a925ff2a67328be8
+folderAsset: yes
+timeCreated: 1502249376
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 73 - 0
Assets/Plugins/Android/ShareSDK/res/layout/ssdk_weibo_web_layout.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <RelativeLayout
+        android:id="@+id/title_layout"
+        android:layout_width="match_parent"
+        android:layout_height="55dip"
+        android:background="#FDFDFD">
+        <TextView
+            android:layout_centerVertical="true"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:id="@+id/title_left_btn"
+            android:textSize="17sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:textColor="#FF525252"
+            android:textSize="18sp"
+            android:id="@+id/title_text"
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </RelativeLayout>
+    <WebView
+        android:layout_below="@id/title_layout"
+        android:id="@+id/web_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></WebView>
+    <cn.sharesdk.sina.weibo.LoadingBar
+        android:id="@+id/load_bar"
+        android:layout_below="@id/title_layout"
+        android:layout_width="match_parent"
+        android:layout_height="3dip" />
+    <View
+        android:layout_below="@id/title_layout"
+        android:background="@drawable/ssdk_weibo_common_shadow_top"
+        android:layout_width="match_parent"
+        android:layout_height="3dip"/>
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/retry_layout"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:layout_marginBottom="8dip"
+            android:src="@drawable/ssdk_weibo_empty_failed"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:textColor="#FFBDBDBD"
+            android:id="@+id/retry_title"
+            android:textSize="14sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <Button
+            android:background="@drawable/ssdk_weibo_retry_btn_selector"
+            android:text="重新加载"
+            android:gravity="center"
+            android:textSize="16sp"
+            android:textColor="#FF787878"
+            android:layout_marginTop="10dip"
+            android:id="@+id/retry_btn"
+            android:layout_width="142dip"
+            android:layout_height="46dip" />
+    </LinearLayout>
+
+
+</RelativeLayout>

+ 8 - 0
Assets/Plugins/Android/ShareSDK/res/layout/ssdk_weibo_web_layout.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb777730caee9d642ade4be7df698059
+timeCreated: 1502249376
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 12 - 0
Assets/Plugins/Android/ShareSDK/res/values-en/ssdk_strings.xml

@@ -77,5 +77,17 @@
 	<string name="ssdk_mingdao_share_content">Share webpage</string>
 	<string name="ssdk_share_to_mingdao">Share To Mingdao</string>
 	<string name="ssdk_share_to_qzone_default">Shared from %s</string>
+	<string name="ssdk_share_to_youtube">Share To Youtube</string>
 	<string name="ssdk_use_login_button">use login button instead</string>
+	<string name="ssdk_dont_keep_activitys_client">Please turn off settings developers options don t keeps Activitys</string>
+
+	<string name="ssdk_gender_male">Male</string>
+	<string name="ssdk_gender_female">Female</string>
+	<string name="ssdk_symbol_ellipsis">...</string>
+
+	<!--sina web -->
+	<string name="ssdk_share_sina_web_close">Close</string>
+	<string name="ssdk_share_sina_web_net_error">A network error occurs, please tap the button to reload</string>
+	<string name="ssdk_share_sina_web_refresh">channel_data_error</string>
+	<string name="ssdk_share_sina_web_title">Weibo Share</string>
 </resources>

+ 3 - 3
Assets/Plugins/Android/ShareSDK/res/values-en/ssdk_strings.xml.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: c19813a428b660840a687b39377d3815
-timeCreated: 1456912833
+guid: 07632f0abe3e9554c989b5c3951ca19a
+timeCreated: 1502247470
 licenseType: Free
-TextScriptImporter:
+DefaultImporter:
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 16 - 0
Assets/Plugins/Android/ShareSDK/res/values/ssdk_strings.xml

@@ -16,6 +16,7 @@
     <string name="ssdk_laiwang_client_inavailable">目前您的来往版本过低或未安装,需要安装来往才能使用</string>
     <string name="ssdk_alipay_client_inavailable">目前您的支付宝版本过低或未安装,需要安装支付宝才能使用</string>
     <string name="ssdk_facebookmessenger_client_inavailable">目前您的FacebookMessenger版本过低或未安装,需要安装才能使用</string>
+	<string name="ssdk_dont_keep_activitys_client">由于您已开启 不保留活动 ,导致授权功能无法正常使用.我们建议您点击左下方 设置 按钮,在 开发者选项 中关闭 不保留活动 功能.</string>
     
 	<string name="ssdk_sinaweibo">新浪微博</string>
 	<string name="ssdk_tencentweibo">腾讯微博</string>
@@ -82,4 +83,19 @@
 	<string name="ssdk_gender_male">男</string>
 	<string name="ssdk_gender_female">女</string>
 	<string name="ssdk_symbol_ellipsis">...</string>
+
+	<!--sina web -->
+	<string name="ssdk_share_sina_web_close">关闭</string>
+	<string name="ssdk_share_sina_web_net_error">网络出错啦,请点击按钮重新加载</string>
+	<string name="ssdk_share_sina_web_refresh">重新加载</string>
+	<string name="ssdk_share_sina_web_title">微博分享</string>
+
+	
+	<!-- 短信登录资源 -->
+	<string name="ssdk_sms_btn_next">下一步</string>
+	<string name="ssdk_sms_btn_submit">提交</string>
+	<string name="ssdk_sms_dialog_btn_cancel">取消</string>
+	<string name="ssdk_sms_dialog_btn_ok">好</string>
+	<string name="ssdk_sms_dialog_title">确认手机号码</string>
+	<string name="ssdk_sms_dialog_text">我们将发送验证码短信到这个手机号码:%s</string>
 </resources>

+ 3 - 3
Assets/Plugins/Android/ShareSDK/res/values/ssdk_strings.xml.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 27db63411ac0c494285cb2cddd7ff0b0
-timeCreated: 1456912833
+guid: ee6beb96a6ea82e40980cceb7ebae4e9
+timeCreated: 1502247455
 licenseType: Free
-TextScriptImporter:
+DefaultImporter:
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 42 - 10
Assets/Plugins/iOS/ShareSDKUnity3DBridge.m

@@ -772,16 +772,26 @@ extern "C" {
                 }
             }
             
-            if ([[shareParamsDic objectForKey:@"advancedShare"] isKindOfClass:[NSNumber class]])
+            //v4.0.1 弃用
+//            if ([[shareParamsDic objectForKey:@"advancedShare"] isKindOfClass:[NSNumber class]])
+//            {
+//                NSInteger enable = [[shareParamsDic objectForKey:@"advancedShare"] integerValue];
+//                if (enable > 0)
+//                {
+//                    [params SSDKEnableAdvancedInterfaceShare];
+//                }
+//            }
+            
+            //使用新浪微博 api进行分享
+            if ([[shareParamsDic objectForKey:@"apiShare"] isKindOfClass:[NSNumber class]])
             {
-                NSInteger enable = [[shareParamsDic objectForKey:@"advancedShare"] integerValue];
+                NSInteger enable = [[shareParamsDic objectForKey:@"apiShare"] integerValue];
                 if (enable > 0)
                 {
-                    [params SSDKEnableAdvancedInterfaceShare];
+                    [params SSDKEnableSinaWeiboAPIShare];
                 }
             }
             
-            
             [params SSDKSetupShareParamsByText:text
                                         images:imageArray
                                            url:[NSURL URLWithString:url]
@@ -848,12 +858,23 @@ extern "C" {
                         }
                     }
                     
-                    if ([[value objectForKey:@"advancedShare"] isKindOfClass:[NSNumber class]])
+                    //v4.0.1 弃用
+                    //            if ([[shareParamsDic objectForKey:@"advancedShare"] isKindOfClass:[NSNumber class]])
+                    //            {
+                    //                NSInteger enable = [[shareParamsDic objectForKey:@"advancedShare"] integerValue];
+                    //                if (enable > 0)
+                    //                {
+                    //                    [params SSDKEnableAdvancedInterfaceShare];
+                    //                }
+                    //            }
+                    
+                    //使用新浪微博 api进行分享
+                    if ([[shareParamsDic objectForKey:@"apiShare"] isKindOfClass:[NSNumber class]])
                     {
-                        NSInteger enable = [[value objectForKey:@"advancedShare"] integerValue];
+                        NSInteger enable = [[shareParamsDic objectForKey:@"apiShare"] integerValue];
                         if (enable > 0)
                         {
-                            [params SSDKEnableAdvancedInterfaceShare];
+                            [params SSDKEnableSinaWeiboAPIShare];
                         }
                     }
                     
@@ -1147,12 +1168,23 @@ extern "C" {
                         }
                     }
                     
-                    if ([[value objectForKey:@"advancedShare"] isKindOfClass:[NSNumber class]])
+                    //v4.0.1 弃用
+                    //            if ([[shareParamsDic objectForKey:@"advancedShare"] isKindOfClass:[NSNumber class]])
+                    //            {
+                    //                NSInteger enable = [[shareParamsDic objectForKey:@"advancedShare"] integerValue];
+                    //                if (enable > 0)
+                    //                {
+                    //                    [params SSDKEnableAdvancedInterfaceShare];
+                    //                }
+                    //            }
+                    
+                    //使用新浪微博 api进行分享
+                    if ([[shareParamsDic objectForKey:@"apiShare"] isKindOfClass:[NSNumber class]])
                     {
-                        NSInteger enable = [[value objectForKey:@"advancedShare"] integerValue];
+                        NSInteger enable = [[shareParamsDic objectForKey:@"apiShare"] integerValue];
                         if (enable > 0)
                         {
-                            [params SSDKEnableAdvancedInterfaceShare];
+                            [params SSDKEnableSinaWeiboAPIShare];
                         }
                     }
                     

+ 3 - 3
ToDoList.txt

@@ -1,11 +1,11 @@
 是否要修改帧率
 
-Facebook 新浪微博不能分享
-
-QQ空间分享成功收不到回调
+QQ QQ空间分享
 
 分享按钮需要打入图集
 
+ShareSDK初始化很慢
+
 
 关闭调试模式