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

张道锋
2 parents 38a05c04 c0619d56
Showing 2 changed files with 9 additions and 6 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -104,6 +104,7 @@ public class MessageManager {
                 session.setSessionName("作业通知");
                 session.setDate(new Date(customNotification.getTime()));
                 session.setSessionText(json.optString("title"));
+                ToastUtils.showToast(json.optString("title")+"uuid="+uuid);
                 PHMessage message = new PHMessage();
                 PHMessageDao messageDao = AppContext.getInstance().getDaoSession().getPHMessageDao();
@@ -115,7 +116,6 @@ public class MessageManager {
                 Long id = messageDao.insert(message);
                 notifyNotification(uuid, id, "收到一条作业通知");
             }
-
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -20,6 +20,7 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import com.shunzhi.parent.presenter.consult.ConsultPresenter;
 import com.shunzhi.parent.ui.MainActivity;
+import com.shunzhi.parent.ui.activity.StartActivity;
 import com.shunzhi.parent.util.GlideUtils;
 import com.stx.xhb.xbanner.XBanner;
@@ -75,7 +76,7 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         if (isQidong)mPresenter.getBanners("0", "");
         else mPresenter.getBanners("1", "");
-//        showVideos();
+        showVideos();
         tvJump=view.findViewById(R.id.tvJump);
@@ -98,7 +99,7 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         } else {
             jiecaoVideo.setVisibility(View.GONE);
             xBanner.setVisibility(View.VISIBLE);
-            mPresenter.getBanners("1", "");
+//            mPresenter.getBanners("1", "");
 //            mPresenter.getBanners("1",  AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
         }
     }
@@ -134,6 +135,7 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         try {
             imgUrl = new ArrayList<>();
             describeList = new ArrayList<>();
+//            Log.d("66666","isQidong="+isQidong);
             if (isQidong) {
                 AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");
                 String fileUrl = "", describe = "";
@@ -148,14 +150,15 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
                         describeList.add(guangGaoBeanList.get(i).describe);
                     }
                 }
-//                Log.d("66666","fileUrl="+guangGaoBeanList);
+                Log.d("66666","fileUrl="+fileUrl);
                 if (!TextUtils.isEmpty(fileUrl)){
                     jiecaoVideo.setUp(fileUrl, JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, describe);
                     jiecaoVideo.startVideo();
                 }else {
                     isQidong=false;
-                    showVideos();
-                    showBanners();
+                    startNewActivity(StartActivity.class);
+//                    showVideos();
+//                    showBanners();
                 }
             } else {