陶汉栋 / ParentWork

Download as
Browse Code »

Commit c0619d56d27ba9b5573afe27e498b2a6fe6ee738

Authored by 陶汉栋
1 parent 7138f165
Exists in yxb_dev and in 2 other branches developer, wwx

no message

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