diff --git a/example/build.gradle b/example/build.gradle index 3861a44..66b2e93 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -21,8 +21,10 @@ android { versionName "1.0" manifestPlaceholders = [ - qq_id: "XXXXXX" + qq_id: "XXXXXX", + FACEBOOK_ID:"XXXXXX" ] + resValue "string", "facebook_app_id", "XXXXXX" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml index 9fa57f1..2fede8c 100644 --- a/example/src/main/AndroidManifest.xml +++ b/example/src/main/AndroidManifest.xml @@ -32,6 +32,13 @@ + + \ No newline at end of file diff --git a/example/src/main/java/com/younglive/livestreaming/LoginActivity.java b/example/src/main/java/com/younglive/livestreaming/LoginActivity.java index b272767..e63947e 100644 --- a/example/src/main/java/com/younglive/livestreaming/LoginActivity.java +++ b/example/src/main/java/com/younglive/livestreaming/LoginActivity.java @@ -28,12 +28,12 @@ protected void onCreate(Bundle savedInstanceState) { .wxId("XXXXX") .weiboRedirectUrl("XXXXXX") .wxSecret("XXXXXX"); - ShareManager.init(config); + ShareManager.init(this,config); findViewById(R.id.login_qq).setOnClickListener(this); findViewById(R.id.login_weibo).setOnClickListener(this); findViewById(R.id.login_wx).setOnClickListener(this); - + findViewById(R.id.login_fb).setOnClickListener(this); mLoginListener = new LoginListener() { @Override public void loginSuccess(LoginResult result) { @@ -80,6 +80,9 @@ public void onClick(View view) { case R.id.login_wx: LoginUtil.login(this, LoginPlatform.WX, mLoginListener); break; + case R.id.login_fb: + LoginUtil.login(this, LoginPlatform.FB, mLoginListener); + break; } } } diff --git a/example/src/main/java/com/younglive/livestreaming/MainActivity.java b/example/src/main/java/com/younglive/livestreaming/MainActivity.java index 6b8026e..aa1fbba 100644 --- a/example/src/main/java/com/younglive/livestreaming/MainActivity.java +++ b/example/src/main/java/com/younglive/livestreaming/MainActivity.java @@ -23,7 +23,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); ShareConfig config = ShareConfig.instance().wxId(APP_ID).wxSecret(APP_SECRET); - ShareManager.init(config); + ShareManager.init(getApplicationContext(), config); findViewById(R.id.action_login).setOnClickListener(new View.OnClickListener() { @Override diff --git a/example/src/main/java/com/younglive/livestreaming/ShareActivity.java b/example/src/main/java/com/younglive/livestreaming/ShareActivity.java index 28389c0..ae0b556 100644 --- a/example/src/main/java/com/younglive/livestreaming/ShareActivity.java +++ b/example/src/main/java/com/younglive/livestreaming/ShareActivity.java @@ -53,6 +53,6 @@ public void shareCancel() { .qqId("XXXXXX") .weiboId("XXXXXX") .wxId("xXXXXX"); - ShareManager.init(config); + ShareManager.init(getApplicationContext(), config); } } diff --git a/example/src/main/java/com/younglive/livestreaming/ShareBottomDialog.java b/example/src/main/java/com/younglive/livestreaming/ShareBottomDialog.java index 831f593..c87f50f 100644 --- a/example/src/main/java/com/younglive/livestreaming/ShareBottomDialog.java +++ b/example/src/main/java/com/younglive/livestreaming/ShareBottomDialog.java @@ -28,6 +28,7 @@ public void bindView(final View v) { v.findViewById(R.id.share_weibo).setOnClickListener(this); v.findViewById(R.id.share_wx).setOnClickListener(this); v.findViewById(R.id.share_wx_timeline).setOnClickListener(this); + v.findViewById(R.id.share_facebook).setOnClickListener(this); mShareListener = new ShareListener() { @Override @@ -73,6 +74,10 @@ public void onClick(View view) { "http://www.google.com", "http://shaohui.me/images/avatar.gif", mShareListener); break; + case R.id.share_facebook: + ShareUtil.shareImage(getContext(),SharePlatform.FACEBOOK, "http://shaohui.me/images/avatar.gif", + mShareListener); + break; } dismiss(); } diff --git a/example/src/main/res/layout/activity_login.xml b/example/src/main/res/layout/activity_login.xml index 72b4eaa..edfd06c 100644 --- a/example/src/main/res/layout/activity_login.xml +++ b/example/src/main/res/layout/activity_login.xml @@ -36,6 +36,13 @@ android:layout_marginBottom="16dp" android:text="QQ登录" /> +