diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index 0f79642..cd91d07 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -24,8 +24,8 @@ public class AppConfig { public static String PARENT_ID = "parent_id"; public static String NIM_CONFIG_VIBRATE = "nim_config_vibrate";//收到通知震动 public static String NIM_CONFIG_SOUND = "nim_config_sound";//收到通知响铃 - public static String ISBINDING="isbinding"; - public static String CURRCHILDJSONSTR=""; + public static String ISBINDING = "isbinding"; + public static String CURRCHILDJSONSTR = ""; public static boolean ISLOGIN = false; @@ -39,16 +39,18 @@ public class AppConfig { public static String APP_IS_START = "app_is_start"; //测试 -// public static String BASE_URL="http://60.190.202.57:1000/"; -// public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; -// public static String BASE_URL_FILE="http://60.190.202.57:8196"; + public static String BASE_URL="http://60.190.202.57:1000/"; + public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; + public static String BASE_URL_FILE="http://60.190.202.57:8196"; + public static String BASE_URL_VOTE = "http://60.190.202.57:8812/"; //正式 - public static String BASE_URL="http://campus.myjxt.com/"; - public static String BASE_URL_ORDER="http://parent.myjxt.com/"; - public static String BASE_URL_FILE="http://manage.myjxt.com"; - public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3"; +// public static String BASE_URL = "http://campus.myjxt.com/"; +// public static String BASE_URL_ORDER = "http://parent.myjxt.com/"; +// public static String BASE_URL_FILE = "http://manage.myjxt.com"; +// public static String BASE_URL_VOTE = "www.sxspy.net/"; +// public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3"; //默认日志保存的路径 @@ -63,7 +65,7 @@ public class AppConfig { private static AppConfig appConfig = null; private static Context mContext = null; - public static String url_apk="http://update.myjxt.com/zh_parent.apk"; + public static String url_apk = "http://update.myjxt.com/zh_parent.apk"; public static AppConfig getAppConfig(Context context) { if (appConfig == null) { diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 60fb2bc..3e43895 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -63,6 +63,7 @@ public class AppContext extends GlobalApplication { super.onCreate(); NIMClient.init(this, loginInfo(), options()); + if (inMainProcess(this)) { //开启地图地位 initMapLocal(); diff --git a/app/src/main/java/com/shunzhi/parent/api/Consult.java b/app/src/main/java/com/shunzhi/parent/api/Consult.java index cd7726c..f346523 100644 --- a/app/src/main/java/com/shunzhi/parent/api/Consult.java +++ b/app/src/main/java/com/shunzhi/parent/api/Consult.java @@ -32,4 +32,9 @@ public interface Consult { Observable getInformationTopic(@Field("keyword") String keyword,@Field("areaName") String areaName, @Field("channel") String channel , @Field("toFirstPage") String toFirstPage, @Field("pageIndex") int pageIndex); + + @FormUrlEncoded + @POST("RoleLogin/GetToken") + Observable loginVote(@Field("username") String username, @Field("password") String password); + } diff --git a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java index 658e0e5..1f63ad8 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java @@ -28,6 +28,8 @@ public interface ConsultContract { public abstract void getContextChannel(String areaName, int channel, int toFirstPage, int pageIndex); public abstract void getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex); + + public abstract void loginVote(String phoneNum,String password,int position); } @@ -39,10 +41,12 @@ public interface ConsultContract { Observable getContextChannel(String areaName, int channel, int toFirstPage, int pageIndex); Observable getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex); + + Observable loginVote(String phoneNum,String password); } interface IConsultView extends IBaseFragment { - void showTools(); + void showVote(int position); void showBanners(List guangGaoBeanList); diff --git a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java index 526abfa..625cea6 100644 --- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java +++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java @@ -61,12 +61,14 @@ public class MessageManager { private Observer> messageObserver = new Observer>() { @Override public void onEvent(List imMessages) { + Log.e("aaaaa", "999999"); onMessageReceive(imMessages); } }; private Observer customNotificationObserver = new Observer() { @Override public void onEvent(CustomNotification customNotification) { + Log.e("aaaaa", "888888"); onCustomNotificationReceive(customNotification); } }; @@ -97,11 +99,13 @@ public class MessageManager { } private void onCustomNotificationReceive(CustomNotification customNotification) { + Timber.d("sss-==" + customNotification.getSessionId()); try { JSONObject json = new JSONObject(customNotification.getContent()); + Timber.d("sss-==" + json.toString()); String type = json.optString("type"); String uuid = json.optString("msgId"); - Timber.d("onCustomNotificationReceive%s","json="+json.toString()); + Timber.d("onCustomNotificationReceive%s", "json=" + json.toString()); if ("homework".equals(type)) { PHMessageSession session = PHMessageSession.findAndCreateSession(PHMessageSession.sessionType_homework, true); session.setSessionName("作业通知"); @@ -118,6 +122,23 @@ public class MessageManager { message.setSessionType(session.getSessionType()); Long id = messageDao.insert(message); notifyNotification(uuid, id, "收到一条作业通知"); + } else if ("attend".equals(type)) { + //考勤 + PHMessageSession session = PHMessageSession.findAndCreateSession(PHMessageSession.sessionType_homework, true); + 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(); + message.setDate(new Date(customNotification.getTime())); + message.setMessageId(uuid); + message.setSessionId(session.getSessionId()); + message.setExValue(customNotification.getContent()); + message.setSessionType(session.getSessionType()); + Long id = messageDao.insert(message); + notifyNotification(uuid, id, "收到一条考勤通知"); } } catch (JSONException e) { e.printStackTrace(); @@ -184,12 +205,12 @@ public class MessageManager { NIMLoginResultBean bean = new NIMLoginResultBean(true, 200, null); subject.onNext(bean); // Timber.i("----===onSuccess : %s", o); - Log.d("66666","云信服务器登录失败：" + o.toString()); + Log.d("66666", "云信服务器登录失败：" + o.toString()); } @Override public void onFailed(int i) { - Log.d("66666","云信服务器登录失败：" + i); + Log.d("66666", "云信服务器登录失败：" + i); // Timber.i("----===nim login failed : %s", i); NIMLoginResultBean bean = new NIMLoginResultBean(false, i, null); subject.onNext(bean); @@ -197,7 +218,7 @@ public class MessageManager { @Override public void onException(Throwable throwable) { - Log.d("66666","onException：" + throwable.toString()); + Log.d("66666", "onException：" + throwable.toString()); // Timber.i("----===onException"); if (throwable != null) throwable.printStackTrace(); NIMLoginResultBean bean = new NIMLoginResultBean(false, 0, throwable); diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java index c73addd..516939a 100644 --- a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java @@ -47,6 +47,13 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM .getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).compose(RxHelper.rxSchedulerHelper()); } + @Override + public Observable loginVote(String phoneNum, String password) { + return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL_VOTE) + .loginVote(phoneNum,password).compose(RxHelper.rxSchedulerHelper()); +// return null; + } + public static ConsultContract.IConsultModel newInstance() { return new ConsultModel(); } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java index d2dd7c0..90cfd37 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java @@ -1,6 +1,5 @@ package com.shunzhi.parent.presenter.consult; -import android.util.Log; import android.view.View; import android.widget.LinearLayout; @@ -8,6 +7,7 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.share.mvpsdk.utils.OkHttpExceptionUtil; +import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.R; import com.shunzhi.parent.bean.GuangGaoBean; import com.shunzhi.parent.bean.ToolBean; @@ -53,7 +53,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { }); layout_control.addView(textAndImgShowView); } - mIView.showTools(); +// mIView.showVote(); } @Override @@ -88,9 +88,9 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { @Override public void accept(JsonObject jsonObject) throws Exception { // ToastUtils.showToast(jsonObject.toString()); - JsonObject json=jsonObject.getAsJsonObject("data"); - Gson g=new Gson(); - ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class); + JsonObject json = jsonObject.getAsJsonObject("data"); + Gson g = new Gson(); + ChannelInfo channelInfo = g.fromJson(json.toString(), ChannelInfo.class); List contextList = channelInfo.getChannelContent(); List channelList = channelInfo.getSubchannel(); mIView.showChannel(channelList); @@ -105,20 +105,19 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { })); - } @Override public void getInformationTopic(String keyword, String areaName, String channel, String toFirstPage, int pageIndex) { - mRxManager.register(mIModel.getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).subscribe(new Consumer() { + mRxManager.register(mIModel.getInformationTopic(keyword, areaName, channel, toFirstPage, pageIndex).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { - JsonObject json=jsonObject.getAsJsonObject("data"); - Gson g=new Gson(); + JsonObject json = jsonObject.getAsJsonObject("data"); + Gson g = new Gson(); List channelList = new ArrayList<>(); - JsonArray jsonArray=json.getAsJsonArray("channelList"); + JsonArray jsonArray = json.getAsJsonArray("channelList"); for (int i = 0; i < jsonArray.size(); i++) { - ChannelContextBean channelBean=g.fromJson(jsonArray.get(i),ChannelContextBean.class); + ChannelContextBean channelBean = g.fromJson(jsonArray.get(i), ChannelContextBean.class); channelList.add(channelBean); } mIView.showContext(channelList); @@ -133,6 +132,22 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { } @Override + public void loginVote(String phoneNum, String password, final int position) { + mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer() { + @Override + public void accept(JsonObject jsonObject) throws Exception { + ToastUtils.showToast(jsonObject.toString()); + mIView.showVote(position); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + mIView.showVote(position); + } + })); + } + + @Override public ConsultContract.IConsultModel getModel() { return ConsultModel.newInstance(); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index 125d0dd..d836716 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -1,7 +1,5 @@ package com.shunzhi.parent.ui.fragment; -import android.annotation.TargetApi; -import android.app.DatePickerDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -13,18 +11,12 @@ import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; import android.support.v4.widget.NestedScrollView; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; -import com.bigkoo.pickerview.builder.TimePickerBuilder; -import com.bigkoo.pickerview.listener.CustomListener; -import com.bigkoo.pickerview.listener.OnTimeSelectListener; -import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.share.mvpsdk.base.BasePresenter; @@ -41,20 +33,15 @@ import com.shunzhi.parent.presenter.consult.ConsultPresenter; import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity; import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; import com.shunzhi.parent.util.AttrsUtils; -import com.shunzhi.parent.util.GlideUtils; import com.shunzhi.parent.views.TextAndImgShowView; import com.stx.xhb.xbanner.XBanner; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; import cn.jzvd.JZVideoPlayerStandard; import me.leefeng.citypicker.CityPicker; import me.leefeng.citypicker.CityPickerListener; -import timber.log.Timber; public class ConsultFragment extends BaseMVPCompatFragment implements View.OnClickListener , ConsultContract.IConsultView, CityPickerListener { @@ -164,7 +151,9 @@ public class ConsultFragment extends BaseMVPCompatFragment