ChengJH пре 2 година
родитељ
комит
e75278ff14

+ 12 - 11
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -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;

+ 4 - 13
app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -53,7 +53,7 @@ import java.io.File;
  * Created by Arison on 2017/8/25.
  */
 public class MyApplication extends BaseApplication {
-
+    public static Context context;
     private static MyApplication INSTANCE = null;
     /*********************
      * 提供全局配置
@@ -97,14 +97,6 @@ public class MyApplication extends BaseApplication {
      ************************/
     private NetWorkObservable mNetWorkObservable;
 
-    protected ImageLoader imageLoader;
-    public static Context context;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-    }
 
     @Override
     public void initConfig() throws Exception {
@@ -112,12 +104,13 @@ public class MyApplication extends BaseApplication {
         context=this;
         //后台服务初始化application
         InitializeService.initApplication(this);
+
 //        LeakCanary.install(this);
         mRequestQueue = Volley.newRequestQueue(this);
         mHttpUtils = new HttpUtils();
         configHttpUtils();
-        imageLoader = ImageLoader.getInstance();
-        imageLoader.init(ImageLoaderConfiguration.createDefault(this));
+        MultiDex.install(this);
+
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -182,8 +175,6 @@ public class MyApplication extends BaseApplication {
         releaseFastVolley();
         android.os.Process.killProcess(android.os.Process.myPid());
         UasLocationHelper.getInstance().release();
-
-
     }
 
     private void initLocation() {

+ 3 - 1
app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1,5 +1,6 @@
 package com.core.net.http;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -68,7 +69,8 @@ import java.util.Map;
 
 
 public class ViewUtil {
-    public static Context ct = MyApplication.getInstance().getApplicationContext();
+    @SuppressLint("StaticFieldLeak")
+    public static Context ct;
     public static String erp_phone;
     public static String erp_password;
     public static String erp_master;

+ 11 - 10
app_core/common/src/main/java/com/core/service/InitializeService.java

@@ -1,5 +1,6 @@
 package com.core.service;
 
+import android.annotation.SuppressLint;
 import android.app.IntentService;
 import android.content.Context;
 import android.content.Intent;
@@ -28,7 +29,7 @@ import com.umeng.socialize.Config;
 import com.umeng.socialize.PlatformConfig;
 import com.uuzuche.lib_zxing.activity.ZXingLibrary;
 
-//import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
+import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
  * @author RaoMeng
@@ -38,7 +39,7 @@ import com.uuzuche.lib_zxing.activity.ZXingLibrary;
 
 public class InitializeService extends IntentService {
     private static final String ACTION_INIT_APPLICATION = "initApplication";
-
+    @SuppressLint("StaticFieldLeak")
     private static Context mContext;
 
     public InitializeService() {
@@ -66,13 +67,13 @@ public class InitializeService extends IntentService {
         Stetho.initializeWithDefaults(mContext);
         SpeechUtility.createUtility(mContext, SpeechConstant.APPID + "=5876dc99");
         //自定义闪退页面初始化
-//        CustomActivityOnCrash.install(mContext);
-//        //设置ErrorActivity在后台启动,默认为true
-//        CustomActivityOnCrash.setLaunchErrorActivityWhenInBackground(true);
-//        //设置展示详细错误信息,默认为true
-//        CustomActivityOnCrash.setShowErrorDetails(true);
-//        //启用APP Restart,默认为true
-//        CustomActivityOnCrash.setEnableAppRestart(true);
+        CustomActivityOnCrash.install(mContext);
+        //设置ErrorActivity在后台启动,默认为true
+        CustomActivityOnCrash.setLaunchErrorActivityWhenInBackground(true);
+        //设置展示详细错误信息,默认为true
+        CustomActivityOnCrash.setShowErrorDetails(true);
+        //启用APP Restart,默认为true
+        CustomActivityOnCrash.setEnableAppRestart(true);
         //设置重新启动的activity
         //  CustomActivityOnCrash.setRestartActivityClass(SplashActivity.class);
 
@@ -85,7 +86,7 @@ public class InitializeService extends IntentService {
         initShareAPI();
 
         initWxPay(mContext);
-
+        //  CrashReport.initCrashReport(getApplicationContext(), "900050585", false);
         PreferenceUtils.putBoolean(mContext, Constants.IS_NOTIFICATION, false);//不进行通知
 
         //定位场景设置

+ 2 - 3
app_modular/apputils/src/main/java/com/modular/apputils/utils/SignUtils.java

@@ -39,7 +39,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.core.net.http.ViewUtil.ct;
 import static com.core.utils.CommonUtil.getSharedPreferences;
 
 
@@ -211,11 +210,11 @@ public class SignUtils implements OnHttpResultListener {
                 //当没有获取到MACAddress的时候,判断wifi状态,如果wifi为未启动
                 //mac地址不合法时候   提示开启wifi
                 WifiReceiverUtil wifiReceiver = new WifiReceiverUtil();
-                wifiReceiver.regReceiver(ct, new WifiReceiverUtil.OnWifiStatusChangeLinstener() {
+                wifiReceiver.regReceiver(MyApplication.context, new WifiReceiverUtil.OnWifiStatusChangeLinstener() {
                     @Override
                     public void callBack(boolean isOpen) {
                         if (isOpen) {
-                            macAddress = SystemUtil.getMac(ct);
+                            macAddress = SystemUtil.getMac(MyApplication.context);
                         }
                     }
                 });