Skip to content

Commit 831afc8

Browse files
committed
将user notification移至main,头像上传回调
1 parent 9b30e0f commit 831afc8

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

app/src/main/java/com/jude/fishing/module/main/MainActivity.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.jude.beam.bijection.RequiresPresenter;
1515
import com.jude.beam.expansion.BeamBaseActivity;
1616
import com.jude.fishing.R;
17+
import com.jude.fishing.model.AccountModel;
1718
import com.jude.fishing.module.blog.BlogFragment;
1819
import com.jude.fishing.module.place.PlaceFragment;
1920
import com.jude.fishing.module.social.MessageFragment;
@@ -23,6 +24,7 @@
2324

2425
import butterknife.ButterKnife;
2526
import butterknife.InjectView;
27+
import rx.Subscription;
2628

2729
@RequiresPresenter(MainPresenter.class)
2830
public class MainActivity extends BeamBaseActivity<MainPresenter> implements DrawerFragment.DrawerChangedListener{
@@ -116,12 +118,18 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
116118
}
117119

118120

121+
Subscription subscription;
119122
@Override
120123
public void onChange(View v) {
121124
Fragment fragment = (Fragment) pagerAdapter.instantiateItem(container, v.getId());
122125
pagerAdapter.setPrimaryItem(container, 0, fragment);
123126
pagerAdapter.finishUpdate(container);
124127
setTitle(pagerAdapter.getPageTitle(v.getId()));
128+
if (v.getId()==R.id.user){
129+
subscription = AccountModel.getInstance().updateNotificationCount();
130+
}else if (subscription!=null){
131+
subscription.unsubscribe();
132+
}
125133
closeDrawer();
126134
}
127135
}

app/src/main/java/com/jude/fishing/module/user/UserDataPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void onNext(Object o) {
107107
}
108108
});
109109
} else
110-
ImageModel.getInstance().putImage(new File(avatar.getPath()),null)
110+
ImageModel.getInstance().putImage(new File(avatar.getPath()), () -> JUtils.Log("putImage complete"))
111111
.doOnError(throwable -> {
112112
getView().getExpansion().dismissProgressDialog();
113113
JUtils.Toast("图片上传失败");

app/src/main/java/com/jude/fishing/module/user/UserPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected void onCreate(UserFragment view, Bundle savedState) {
2323
@Override
2424
protected void onResume() {
2525
super.onResume();
26-
AccountModel.getInstance().updateNotificationCount();
26+
// AccountModel.getInstance().updateNotificationCount();
2727
}
2828

2929
@Override

umengfamily/src/main/java/com/umeng/share/ShareManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private void setShareContent(Context context, String content, String targetUrl,
108108
// 配置SSO
109109
mController.getConfig().setSsoHandler(new SinaSsoHandler());
110110

111-
QZoneSsoHandler qZoneSsoHandler = new QZoneSsoHandler((Activity) context, "100424468", "c7394704798a158208a74ab60104f0ba");
111+
QZoneSsoHandler qZoneSsoHandler = new QZoneSsoHandler((Activity) context, "1104980016", "Dz9oJR8HGlmg6Prr");
112112
qZoneSsoHandler.addToSocialSDK();
113113
mController.setShareContent(content);
114114

0 commit comments

Comments
 (0)