yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18142669586
2022-09-16 14:21:50 +08:00
parent 3225cf5d5f 1c16a673fd
commit 5e581dd65e
92 changed files with 3396 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@@ -282,6 +282,24 @@ public class EntryActivity extends AppCompatActivity {
}
}
});
MainNetManager.get(EntryActivity.this)
.FaceBookUp(new com.yunbao.common.http.base.HttpCallback<FaceBookUpModel>() {
@Override
public void onSuccess(FaceBookUpModel data) {
if(data.getType().equals("0")){
LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile"));
}else{
WebViewActivity.forward(EntryActivity.this, data.getLink()+"?");
}
}
@Override
public void onError(String error) {
}
});
LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile"));
// MainNetManager.get(EntryActivity.this)
// .FaceBookUp(new com.yunbao.common.http.base.HttpCallback<FaceBookUpModel>() {
@@ -815,3 +833,4 @@ public class EntryActivity extends AppCompatActivity {
}
}

4
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -657,7 +657,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onError(int code, String desc) {
Log.i("tx", "登录失败");
Log.i("tx", "登录失败： code = "+code+" desc = "+desc);
}
});
@@ -688,7 +688,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onError(int code, String desc) {
Log.i("tx", "登录失败");
Log.i("tx", "登录失败： code = "+code+" desc = "+desc);
}

9
main/src/main/res/layout/activity_entry.xml
View File

@@ -69,9 +69,9 @@
android:id="@+id/tt_login_button"
android:layout_width="match_parent"
android:layout_height="54dp"
android:visibility="invisible"
android:layout_marginLeft="42dp"
android:layout_marginRight="42dp" />
android:layout_marginRight="42dp"
android:visibility="invisible" />
<LinearLayout
android:id="@+id/lt_btn_twitter"
@@ -241,4 +241,9 @@
android:layout_marginTop="80dp"
android:src="@mipmap/white_logo" />
<com.yunbao.common.views.weight.NobleNoticeView
android:id="@+id/noble"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="200dp" />
</RelativeLayout>