陶汉栋 / ParentWork

Download as
Browse Code »

Commit 1a085af78558ebcf7d37194a9dbf4647da42421d

Authored by 张道锋
2 parents 38a05c04 c0619d56
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer

Showing 2 changed files with 9 additions and 6 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
  Diff comments   View file @1a085af
... ... @@ -104,6 +104,7 @@ public class MessageManager {
104 104 session.setSessionName("作业通知");
105 105 session.setDate(new Date(customNotification.getTime()));
106 106 session.setSessionText(json.optString("title"));
  107 + ToastUtils.showToast(json.optString("title")+"uuid="+uuid);
107 108  
108 109 PHMessage message = new PHMessage();
109 110 PHMessageDao messageDao = AppContext.getInstance().getDaoSession().getPHMessageDao();
... ... @@ -115,7 +116,6 @@ public class MessageManager {
115 116 Long id = messageDao.insert(message);
116 117 notifyNotification(uuid, id, "收到一条作业通知");
117 118 }
118   -
119 119 } catch (JSONException e) {
120 120 e.printStackTrace();
121 121 }
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
  Diff comments   View file @1a085af
... ... @@ -20,6 +20,7 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
20 20 import com.shunzhi.parent.contract.consult.ConsultContract;
21 21 import com.shunzhi.parent.presenter.consult.ConsultPresenter;
22 22 import com.shunzhi.parent.ui.MainActivity;
  23 +import com.shunzhi.parent.ui.activity.StartActivity;
23 24 import com.shunzhi.parent.util.GlideUtils;
24 25 import com.stx.xhb.xbanner.XBanner;
25 26  
... ... @@ -75,7 +76,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
75 76  
76 77 if (isQidong)mPresenter.getBanners("0", "");
77 78 else mPresenter.getBanners("1", "");
78   -// showVideos();
  79 + showVideos();
79 80  
80 81 tvJump=view.findViewById(R.id.tvJump);
81 82  
... ... @@ -98,7 +99,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
98 99 } else {
99 100 jiecaoVideo.setVisibility(View.GONE);
100 101 xBanner.setVisibility(View.VISIBLE);
101   - mPresenter.getBanners("1", "");
  102 +// mPresenter.getBanners("1", "");
102 103 // mPresenter.getBanners("1", AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
103 104 }
104 105 }
... ... @@ -134,6 +135,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
134 135 try {
135 136 imgUrl = new ArrayList<>();
136 137 describeList = new ArrayList<>();
  138 +// Log.d("66666","isQidong="+isQidong);
137 139 if (isQidong) {
138 140 AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");
139 141 String fileUrl = "", describe = "";
... ... @@ -148,14 +150,15 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
148 150 describeList.add(guangGaoBeanList.get(i).describe);
149 151 }
150 152 }
151   -// Log.d("66666","fileUrl="+guangGaoBeanList);
  153 + Log.d("66666","fileUrl="+fileUrl);
152 154 if (!TextUtils.isEmpty(fileUrl)){
153 155 jiecaoVideo.setUp(fileUrl, JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, describe);
154 156 jiecaoVideo.startVideo();
155 157 }else {
156 158 isQidong=false;
157   - showVideos();
158   - showBanners();
  159 + startNewActivity(StartActivity.class);
  160 +// showVideos();
  161 +// showBanners();
159 162 }
160 163  
161 164 } else {
... ...