|
|
@@ -100,6 +100,7 @@ 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;
|
|
|
import com.uas.appme.settings.activity.FeedbackActivity;
|
|
|
@@ -167,14 +168,14 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
* @注释:主界面Fragment
|
|
|
*/
|
|
|
private Fragment mLastFragment;
|
|
|
- private MessageFragment mMessageFragment;//消息
|
|
|
+ private MessageFragment mMessageFragment;
|
|
|
private MyFriendFragment mMyFriendFragment;//我的朋友---相互关注,单项关注,房间
|
|
|
private WorkPlatFragment mWorksFragment;//工作
|
|
|
// private WorksFragment mWorksFragment;//工作
|
|
|
|
|
|
private GroupChatFragment mGroupChatFragment;//群聊
|
|
|
private MeFragment mMeFragment;//我
|
|
|
- private ContactsFragment mBusinessCircleFragment;//通讯录
|
|
|
+ private ContactsFragment mBusinessCircleFragment;
|
|
|
public static String BAIDU_PUSH = "BAIDUPUSH";
|
|
|
public static String UU_STEP = "UUSTEP";
|
|
|
public static String Q_SEARCH = "Q_SEARCH";
|
|
|
@@ -684,7 +685,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
|
|
|
|
|
|
//初始化面部识别
|
|
|
- com.baidu.aip.excep.utils.FaceConfig.initFace(ct);
|
|
|
+ com.baidu.aip.excep.utils.FaceConfig.initFace(activity);
|
|
|
// Login();
|
|
|
}
|
|
|
|
|
|
@@ -696,13 +697,12 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
private void doHiTask() {
|
|
|
int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
|
|
|
if (isUUStep != 0 && StepCountCheckUtil.isSupportStepCountSensor(this)) { // 开启UU运动
|
|
|
- //防止每次都出现系统提示卸载
|
|
|
-// LogUtil.i("userid=" + MyApplication.getInstance().getLoginUserId());
|
|
|
-// startService(new Intent(mContext, StepService.class)
|
|
|
-// .putExtra("my_userid", MyApplication.getInstance().getLoginUserId())
|
|
|
-// .putExtra("token", MyApplication.getInstance().mAccessToken));
|
|
|
-// PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
|
|
|
-// PushManager.resumeWork(MyApplication.getInstance());
|
|
|
+ LogUtil.i("userid=" + MyApplication.getInstance().getLoginUserId());
|
|
|
+ startService(new Intent(mContext, StepService.class)
|
|
|
+ .putExtra("my_userid", MyApplication.getInstance().getLoginUserId())
|
|
|
+ .putExtra("token", MyApplication.getInstance().mAccessToken));
|
|
|
+ PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
|
|
|
+ PushManager.resumeWork(MyApplication.getInstance());
|
|
|
}
|
|
|
// doSendSignAutoLog(); // 获取数据库中监控日志上传至服务器操作
|
|
|
//桌面红点显示逻辑
|
|
|
@@ -832,7 +832,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
int dateInt = Integer.parseInt(currentDate);
|
|
|
|
|
|
if ((dateInt - cacheDate) >= 1) {
|
|
|
- HttpRequest.getInstance().sendRequest("https://mobile.ubtob.net:8443/",
|
|
|
+ HttpRequest.getInstance().sendRequest("https://mobile.ubtob.com:8443/",
|
|
|
new HttpParams.Builder()
|
|
|
.url("schedule/schedule/getByDaySchedule")
|
|
|
.method(Method.GET)
|
|
|
@@ -1109,6 +1109,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
|
|
|
}
|
|
|
if (mBusinessCircleFragment != null) {
|
|
|
fragmentTransaction.remove(mBusinessCircleFragment);
|
|
|
+
|
|
|
}
|
|
|
fragmentTransaction.commitAllowingStateLoss();
|
|
|
mMessageFragment = null;
|