|
|
@@ -20,6 +20,7 @@ import android.os.PersistableBundle;
|
|
|
import android.support.v4.app.Fragment;
|
|
|
import android.support.v4.app.FragmentManager;
|
|
|
import android.support.v4.app.FragmentTransaction;
|
|
|
+import android.support.v4.content.LocalBroadcastManager;
|
|
|
import android.support.v7.widget.LinearLayoutManager;
|
|
|
import android.support.v7.widget.RecyclerView;
|
|
|
import android.text.TextUtils;
|
|
|
@@ -81,6 +82,7 @@ import com.core.net.volley.FastVolley;
|
|
|
import com.core.net.volley.Result;
|
|
|
import com.core.net.volley.StringJsonArrayRequest;
|
|
|
import com.core.utils.CommonInterface;
|
|
|
+import com.core.utils.FlexJsonUtil;
|
|
|
import com.core.utils.IntentUtils;
|
|
|
import com.core.utils.helper.LoginHelper;
|
|
|
import com.core.xmpp.CoreService;
|
|
|
@@ -100,6 +102,7 @@ import com.modular.login.activity.LoginActivity;
|
|
|
import com.uas.appcontact.listener.ImStatusListener;
|
|
|
import com.uas.appcontact.ui.fragment.ContactsFragment;
|
|
|
import com.uas.appcontact.ui.fragment.GroupChatFragment;
|
|
|
+import com.uas.appme.other.model.Master;
|
|
|
import com.uas.appme.pedometer.service.StepService;
|
|
|
import com.uas.appme.pedometer.utils.StepCountCheckUtil;
|
|
|
import com.uas.appme.pedometer.utils.StepUtils;
|
|
|
@@ -327,6 +330,22 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
}
|
|
|
};
|
|
|
|
|
|
+
|
|
|
+ //进来时候登陆
|
|
|
+ public void Login() {
|
|
|
+ Master master = new Master();
|
|
|
+ master.setMa_function(CommonUtil.getMaster());
|
|
|
+ String url = com.core.utils.CommonUtil.getAppBaseUrl(ct) + "mobile/login.action";
|
|
|
+ Map<String, Object> params = new HashMap<String, Object>();
|
|
|
+ String accountToken = CommonUtil.getSharedPreferences(ct, com.core.app.Constants.CACHE.ACCOUNT_CENTER_TOKEN);
|
|
|
+ params.put("token", accountToken);
|
|
|
+ params.put("master", CommonUtil.getMaster());
|
|
|
+ Message message = new Message();
|
|
|
+ LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
|
|
|
+ headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
|
|
|
+ ViewUtil.httpSendRequest(ct, url, params, mUserCheckHander, headers, 0x12312, message, null, "get");
|
|
|
+ }
|
|
|
+
|
|
|
private void delay() {
|
|
|
if (delayTimer == null) {
|
|
|
delayTimer = new Timer();
|
|
|
@@ -670,7 +689,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
|
|
|
//初始化面部识别
|
|
|
com.baidu.aip.excep.utils.FaceConfig.initFace(ct);
|
|
|
-
|
|
|
+ Login();
|
|
|
}
|
|
|
|
|
|
private AutoPresenter autoPresenter;
|
|
|
@@ -953,7 +972,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (systemSchedule!=null){
|
|
|
+ if (systemSchedule != null) {
|
|
|
for (int i = 0; i < systemSchedule.size(); i++) {
|
|
|
Schedule schedule = systemSchedule.get(i);
|
|
|
TimeHelperBean timeHelperBean = new TimeHelperBean();
|