no message

陶汉栋
2 parents f96e1956 fc0ad32a
Showing 19 changed files with 124 additions and 77 deletions Show diff stats
app/src/main/AndroidManifest.xml
app/src/main/java/com/shunzhi/parent/AppConfig.java
app/src/main/java/com/shunzhi/parent/AppContext.java
app/src/main/java/com/shunzhi/parent/api/Consult.java
app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java
app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java
app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java
app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
app/src/main/java/com/shunzhi/parent/ui/service/BadgeIntentService.java
app/src/main/res/layout/fragment_apply_replacecard.xml
@@ -154,6 +154,7 @@
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <activity
             android:name=".ui.MainActivity"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.ChildDetialActivity"
@@ -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) {
@@ -63,6 +63,7 @@ public class AppContext extends GlobalApplication {
         super.onCreate();
         NIMClient.init(this, loginInfo(), options());
+
         if (inMainProcess(this)) {
             //开启地图地位
             initMapLocal();
@@ -32,4 +32,9 @@ public interface Consult {
     Observable<JsonObject> 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<JsonObject> loginVote(@Field("username") String username, @Field("password") String password);
+
 }
@@ -65,6 +65,7 @@ public class PHMessage {
         return dao.queryBuilder()
                 .where(PHMessageDao.Properties.SessionType.in(
                         PHMessageSession.sessionType_homework,
+                        PHMessageSession.sessionType_kaoqin,
                         PHMessageSession.sessionType_notification//新加通知类型请在此处加上，否则会导致计数不准确
                 ))
                 .count();
@@ -2,12 +2,14 @@ package com.shunzhi.parent.bean.message;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
+
 import org.greenrobot.greendao.annotation.Entity;
-import org.greenrobot.greendao.annotation.Id;
-import java.util.Date;
 import org.greenrobot.greendao.annotation.Generated;
+import org.greenrobot.greendao.annotation.Id;
 import org.greenrobot.greendao.annotation.Keep;
+import java.util.Date;
+
 /**
  * Created by 10501 on 2018/3/20.
  */
@@ -29,6 +31,8 @@ public class PHMessageSession {
     public static final int sessionType_notification = 101;
     @Keep
     public static final int sessionType_homework = 102;
+    @Keep
+    public static final int sessionType_kaoqin = 103;
     @Generated(hash = 1156938953)
     public PHMessageSession(Long id, String sessionId, String sessionText, String sessionName,
@@ -60,6 +64,10 @@ public class PHMessageSession {
                     session.setSessionId(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID) + "_homework_" + System.currentTimeMillis());
                     session.setSessionName("作业通知");
                     break;
+                case sessionType_kaoqin:
+                    session.setSessionId(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID) + "_kaoqin_" + System.currentTimeMillis());
+                    session.setSessionName("考勤通知");
+                    break;
             }
             AppContext.getInstance().getDaoSession().getPHMessageSessionDao().insert(session);
         }
@@ -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<JsonObject> getContextChannel(String areaName, int channel, int toFirstPage, int pageIndex);
         Observable<JsonObject> getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex);
+
+        Observable<JsonObject> loginVote(String phoneNum,String password);
     }
     interface IConsultView extends IBaseFragment {
-        void showTools();
+        void showVote(int position);
         void showBanners(List<GuangGaoBean> guangGaoBeanList);
@@ -75,7 +75,6 @@ public class MessageManager {
     private MessageManager() {
-        Log.d("77777","messageObserver="+messageObserver);
         NIMClient.getService(MsgServiceObserve.class).observeReceiveMessage(messageObserver, true);
         NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(customNotificationObserver, true);
         NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer<StatusCode>() {
@@ -100,11 +99,13 @@ public class MessageManager {
     }
     private void onCustomNotificationReceive(CustomNotification customNotification) {
+        Timber.d("sss-==" + customNotification.getContent());
         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("作业通知");
@@ -121,6 +122,24 @@ 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_kaoqin, true);
+                session.setSessionName("考勤通知");
+                session.setDate(new Date(customNotification.getTime()));
+                session.setSessionText(json.optString("title"));
+
+                PHMessage message = new PHMessage();
+                PHMessageDao messageDao = AppContext.getInstance().getDaoSession().getPHMessageDao();
+                message.setDate(new Date(customNotification.getTime()));
+                message.setMessageId(uuid);
+                message.setSessionId(session.getSessionId());
+                message.setMessageText("不能为空的字段。。。");
+                message.setExValue(customNotification.getContent());
+                message.setSessionType(session.getSessionType());
+                Long id = messageDao.insert(message);
+                Log.e("aaaaa","------"+id);
+                notifyNotification(uuid, id, "收到一条考勤通知");
             }
         } catch (JSONException e) {
             e.printStackTrace();
@@ -128,8 +147,9 @@ public class MessageManager {
     }
     public void notifyNotification(String uuid, long msgLongId, String text) {
-        if (!isNotiNotification)
+        if (!isNotiNotification) {
             return;
+        }
         int notificationCount = (int) PHMessage.findUnreadNotificationCount();//XSTMessage.findUnreadNotificationCount();
         boolean setBadgerSuccessful = ShortcutBadger.applyCount(AppContext.getInstance(), notificationCount);
         Timber.i("----== notificationCount : %s  ,setBadgerSuccessful : %s", notificationCount, setBadgerSuccessful);
@@ -170,10 +190,8 @@ public class MessageManager {
                 (NotificationManager) AppContext.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);
         notifyMgr.notify((int) msgLongId, mBuilder.build());
-
     }
-
     public Observable<NIMLoginResultBean> login(String account, String password) {
         final PublishSubject<NIMLoginResultBean> subject = PublishSubject.create();
         SharedPreferences sp = AppContext.getInstance().getApplicationContext().getSharedPreferences("info", Context.MODE_PRIVATE);
@@ -207,7 +225,6 @@ public class MessageManager {
         return subject;
     }
-
     public void logout() {
         SharedPreferences sp = AppContext.getInstance().getApplicationContext().getSharedPreferences("info", Context.MODE_PRIVATE);
         sp.edit().putString("account", "").apply();
@@ -47,6 +47,13 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM
                 .getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
+    @Override
+    public Observable<JsonObject> loginVote(String phoneNum, String password) {
+        return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL_VOTE)
+                .loginVote(phoneNum,password).compose(RxHelper.<JsonObject>rxSchedulerHelper());
+//        return  null;
+    }
+
     public static ConsultContract.IConsultModel newInstance() {
         return new ConsultModel();
     }
 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
@@ -71,7 +71,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
                     }
                     mIView.showBanners(guangGaoBeanList);
                 } else {
-//                    ToastUtils.showToast(jsonObject.get("message").getAsString());
+                    ToastUtils.showToast(jsonObject.get("message").getAsString());
                 }
             }
         }, new Consumer<Throwable>() {
@@ -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<ChannelContextBean> contextList = channelInfo.getChannelContent();
                 List<ChannelBean> 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<JsonObject>() {
+        mRxManager.register(mIModel.getInformationTopic(keyword, areaName, channel, toFirstPage, pageIndex).subscribe(new Consumer<JsonObject>() {
             @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<ChannelContextBean> 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<JsonObject>() {
+            @Override
+            public void accept(JsonObject jsonObject) throws Exception {
+                ToastUtils.showToast(jsonObject.toString());
+                mIView.showVote(position);
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) throws Exception {
+                mIView.showVote(position);
+            }
+        }));
+    }
+
+    @Override
     public ConsultContract.IConsultModel getModel() {
         return ConsultModel.newInstance();
     }
@@ -15,9 +15,7 @@ import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.message.PHMessage;
 import com.shunzhi.parent.bean.message.PHMessageDao;
-import com.shunzhi.parent.bean.message.PHMessageSession;
 import com.shunzhi.parent.manager.MessageManager;
-import com.shunzhi.parent.ui.fragment.CePingFragment;
 import com.shunzhi.parent.ui.fragment.ConsultFragment;
 import com.shunzhi.parent.ui.fragment.MineFragment;
 import com.shunzhi.parent.ui.fragment.ReportFragment;
@@ -36,6 +34,7 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
     Fragment[] fragments = null;
+
     private int CEPING_INDEX = 0, CONSULT_INDEX = 0, REPORT_INDEX = 1, MINE_INDEX = 2;
     FragmentTransaction fragmentTransaction = null;
@@ -43,10 +42,8 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
     @Override
     protected void initView(Bundle savedInstanceState) {
-
         PermissionUtils.requestMultiPermissions(this, this);
         bottom_navigationView = findViewById(R.id.bottom_navigationView);
-
         BottomNavigationViewHelper.disableShiftMode(bottom_navigationView);
         bottom_navigationView.setSelectedItemId(R.id.bottom_navigationView);
@@ -73,6 +70,8 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
         });
         initFragments();
+        handIntent(getIntent());
+
     }
     private void initFragments() {
@@ -113,7 +112,7 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-//        handIntent(intent);
+        handIntent(intent);
     }
     private void handIntent(Intent intent) {
@@ -121,8 +120,8 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
         PHMessageDao dao = AppContext.getInstance().getDaoSession().getPHMessageDao();
         PHMessage message = dao.queryBuilder().where(PHMessageDao.Properties.Id.eq(msgLongId)).unique();
         if (message == null) return;
-        if (message.getSessionType() == PHMessageSession.sessionType_homework) {
-            //TODO 跳转
+        if(msgLongId!=-1){
+            showFragment(2);
         }
     }
 package com.shunzhi.parent.ui.activity.message;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -14,9 +13,9 @@ import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
 import com.share.mvpsdk.utils.DateUtils;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.message.PHMessage;
-import com.shunzhi.parent.bean.message.PHMessageSession;
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +51,9 @@ public class MesageActivity extends BaseCompatActivity implements View.OnClickLi
         if (null==mEssageAdapter)mEssageAdapter=new MEssageAdapter();
         if (null==recyclerView.getAdapter())recyclerView.setAdapter(mEssageAdapter);
+
+
+        phMessages= AppContext.getInstance().getDaoSession().getPHMessageDao().loadAll();
         mEssageAdapter.addAll(phMessages);
         recyclerView.setAdapter(mEssageAdapter);
 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<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel> implements View.OnClickListener
         , ConsultContract.IConsultView, CityPickerListener {
@@ -164,7 +151,9 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() {
             @Override
             public void onItemClick(XBanner banner, int position) {
-                WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1);
+                mPresenter.loginVote(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME)
+                        , AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_PWD),position);
+//                WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1);
             }
         });
     }
@@ -240,8 +229,8 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     }
     @Override
-    public void showTools() {
-
+    public void showVote(int position) {
+        WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1);
     }
     @Override
@@ -21,7 +21,6 @@ import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.BuildConfig;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.message.PHMessage;
-import com.shunzhi.parent.bean.message.PHMessageSession;
 import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
 import com.shunzhi.parent.contract.mine.MineContract;
 import com.shunzhi.parent.manager.MessageManager;
 package com.shunzhi.parent.ui.fragment;
-import android.media.MediaMetadataRetriever;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -29,9 +27,6 @@ import com.stx.xhb.xbanner.XBanner;
 import java.util.ArrayList;
 import java.util.List;
-import cn.jzvd.JZVideoPlayerStandard;
-import timber.log.Timber;
-
 public class StartFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel>
         implements ConsultContract.IConsultView {
@@ -102,8 +97,9 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         return new ConsultPresenter();
     }
+
     @Override
-    public void showTools() {
+    public void showVote(int position) {
     }
@@ -72,7 +72,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment&lt;ApplyReplace
         switch (view.getId()) {
             case R.id.bt_sure:
                 cardnum = et_cardnum.getText().toString().trim();
-                ToastUtils.showToast("cardnum:" + cardnum);
+//                ToastUtils.showToast("cardnum:" + cardnum);
                 Log.i("ApplyReplaceCardFragment:data", cardnum);
                 if (TextUtils.isEmpty(cardnum)) {
                     ToastUtils.showToast("卡号不能为空，请重新输入!");
@@ -89,8 +89,8 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
     }
     private void getData() {
-        mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate);
-//        mPresenter.SigninDetail(185, 1, currdate);//测试接口
+//        mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate);
+        mPresenter.SigninDetail(185, 1, currdate);//测试接口
     }
     /**
@@ -121,7 +121,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
         Calendar startDate = Calendar.getInstance();
         startDate.set(1900, 0, 1);
         Calendar endDate = Calendar.getInstance();
-        endDate.set(2099, 11, 31);
+        endDate.set(2099, 11, 31);//注意：mouth是从0开始计算的，下面宕机的原因可能是之前这边设置的问题
         //AppContext.getInstance().startLocation();
         //时间选择器
         pvCustomLunar = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() {
@@ -7,9 +7,8 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
-import android.text.TextUtils;
+import android.util.Log;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
@@ -71,9 +70,10 @@ public class BadgeIntentService extends IntentService {
             //String uuid, long xstsid
             String uuid = intent.getStringExtra("uuid");
             long xstsid = intent.getLongExtra("xstsid", -1);
-            if (xstsid == -1 || TextUtils.isEmpty(uuid))
-                createIntentNotification(badgeCount, title, message);
-            if (xstsid != -1 && !TextUtils.isEmpty(uuid))
+            Log.e("1234-===","uuid=="+uuid+"xstsid=="+xstsid);
+//            if (xstsid == -1 || TextUtils.isEmpty(uuid))
+//                createIntentNotification(badgeCount, title, message);
+//            if (xstsid != -1 && !TextUtils.isEmpty(uuid))
                 createPendingIntentNotification(badgeCount, title, message, uuid, xstsid);
         }
@@ -89,13 +89,12 @@ public class BadgeIntentService extends IntentService {
             mNotificationManager.cancel(notificationId);
         notificationId++;
-
         Notification.Builder builder = new Notification.Builder(getApplicationContext())
                 .setContentTitle(title)
                 .setContentText(message)
                 .setSmallIcon(R.mipmap.ic_launcher);
         Notification notification = Build.VERSION.SDK_INT > 15 ? builder.build() : builder.getNotification();
-        ShortcutBadger.applyNotification(getApplicationContext(), notification, badgeCount);
+            ShortcutBadger.applyNotification(getApplicationContext(), notification, badgeCount);
         if (mNotificationManager != null)
             mNotificationManager.notify(notificationId, notification);
     }
@@ -104,7 +103,7 @@ public class BadgeIntentService extends IntentService {
         if (mNotificationManager == null) {
             mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         }
-        Intent resultIntent = new Intent(AppContext.getInstance(), MainActivity.class);
+        Intent resultIntent = new Intent(AppContext.getInstance(),MainActivity.class);
         resultIntent.putExtra("sid", xstsid);
         resultIntent.putExtra("uuid", uuid);
         mNotificationManager.cancel(notificationId);
@@ -37,15 +37,16 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="2"
+            android:gravity="center"
             android:background="@drawable/report_white"
             android:orientation="horizontal">
             <TextView
                 android:layout_weight="1.2"
                 android:id="@+id/tv_carduser"
-                android:layout_margin="@dimen/dp_8"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/margin_small"
                 android:text="补卡人:"
                 android:textColor="@color/hintTextColor"
                 android:textSize="@dimen/textSize16" />
@@ -66,6 +67,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="2"
+            android:gravity="center"
             android:orientation="horizontal">
             <TextView
@@ -73,7 +75,7 @@
                 android:layout_weight="1.2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
+                android:paddingLeft="@dimen/margin_small"
                 android:text="卡号:"
                 android:textColor="@color/hintTextColor"
                 android:textSize="@dimen/textSize16" />
	@@ -63,6 +63,7 @@ public class AppContext extends GlobalApplication {		@@ -63,6 +63,7 @@ public class AppContext extends GlobalApplication {
63	super.onCreate();	63	super.onCreate();
64		64
65	NIMClient.init(this, loginInfo(), options());	65	NIMClient.init(this, loginInfo(), options());
		66	+
66	if (inMainProcess(this)) {	67	if (inMainProcess(this)) {
67	//开启地图地位	68	//开启地图地位
68	initMapLocal();	69	initMapLocal();
	@@ -32,4 +32,9 @@ public interface Consult {		@@ -32,4 +32,9 @@ public interface Consult {
32	Observable<JsonObject> getInformationTopic(@Field("keyword") String keyword,@Field("areaName") String areaName, @Field("channel") String channel	32	Observable<JsonObject> getInformationTopic(@Field("keyword") String keyword,@Field("areaName") String areaName, @Field("channel") String channel
33	, @Field("toFirstPage") String toFirstPage, @Field("pageIndex") int pageIndex);	33	, @Field("toFirstPage") String toFirstPage, @Field("pageIndex") int pageIndex);
34		34
		35	+
		36	+ @FormUrlEncoded
		37	+ @POST("RoleLogin/GetToken")
		38	+ Observable<JsonObject> loginVote(@Field("username") String username, @Field("password") String password);
		39	+
35	}	40	}
	@@ -47,6 +47,13 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM		@@ -47,6 +47,13 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM
47	.getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).compose(RxHelper.<JsonObject>rxSchedulerHelper());	47	.getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).compose(RxHelper.<JsonObject>rxSchedulerHelper());
48	}	48	}
49		49
		50	+ @Override
		51	+ public Observable<JsonObject> loginVote(String phoneNum, String password) {
		52	+ return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL_VOTE)
		53	+ .loginVote(phoneNum,password).compose(RxHelper.<JsonObject>rxSchedulerHelper());
		54	+// return null;
		55	+ }
		56	+
50	public static ConsultContract.IConsultModel newInstance() {	57	public static ConsultContract.IConsultModel newInstance() {
51	return new ConsultModel();	58	return new ConsultModel();
52	}	59	}
	@@ -72,7 +72,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace		@@ -72,7 +72,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace
72	switch (view.getId()) {	72	switch (view.getId()) {
73	case R.id.bt_sure:	73	case R.id.bt_sure:
74	cardnum = et_cardnum.getText().toString().trim();	74	cardnum = et_cardnum.getText().toString().trim();
75	- ToastUtils.showToast("cardnum:" + cardnum);	75	+// ToastUtils.showToast("cardnum:" + cardnum);
76	Log.i("ApplyReplaceCardFragment:data", cardnum);	76	Log.i("ApplyReplaceCardFragment:data", cardnum);
77	if (TextUtils.isEmpty(cardnum)) {	77	if (TextUtils.isEmpty(cardnum)) {
78	ToastUtils.showToast("卡号不能为空，请重新输入!");	78	ToastUtils.showToast("卡号不能为空，请重新输入!");