Merge branch 'developer' into yxb_dev

姚旭斌
2 parents b932b573 1a085af7
Showing 5 changed files with 64 additions and 15 deletions Show diff stats
.idea/misc.xml
.idea/modules.xml
app/src/main/java/com/shunzhi/parent/AppContext.java
app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -4,8 +4,8 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
+      <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
       <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />
-      <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
       <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" />
       <module fileurl="file://$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" filepath="$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" />
     </modules>
 package com.shunzhi.parent;
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.text.TextUtils;
 import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
@@ -53,19 +55,22 @@ public class AppContext extends GlobalApplication {
     public AMapLocationClientOption mLocationOption = null;
     private MessageManager messageManager;
+
     @Override
     public void onCreate() {
         appContext = this;
         super.onCreate();
-        //开启地图地位
-        initMapLocal();
         NIMClient.init(this, loginInfo(), options());
-        initDB();
-        RetrofitCreateHelper.getInstance().setAuthorization(AppConfig.getAppConfig(this).get(AppConfig.ACCESS_TOKEN));
-        messageManager = MessageManager.getInstance();
+        if (inMainProcess(this)) {
+            //开启地图地位
+            initMapLocal();
+            initDB();
+            RetrofitCreateHelper.getInstance().setAuthorization(AppConfig.getAppConfig(this).get(AppConfig.ACCESS_TOKEN));
+            messageManager = MessageManager.getInstance();
+        }
     }
-    public MessageManager getMessageManager(){
+    public MessageManager getMessageManager() {
         return messageManager;
     }
@@ -105,6 +110,46 @@ public class AppContext extends GlobalApplication {
         return null;
     }
+    public static boolean inMainProcess(Context context) {
+        String packageName = context.getPackageName();
+        String processName = getProcessName(context);
+        return packageName.equals(processName);
+    }
+
+    /**
+     * 获取当前进程名
+     *
+     * @param context
+     * @return 进程名
+     */
+    public static final String getProcessName(Context context) {
+        String processName = null;
+
+        // ActivityManager
+        ActivityManager am = ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE));
+
+        while (true) {
+            for (ActivityManager.RunningAppProcessInfo info : am.getRunningAppProcesses()) {
+                if (info.pid == android.os.Process.myPid()) {
+                    processName = info.processName;
+                    break;
+                }
+            }
+
+            // go home
+            if (!TextUtils.isEmpty(processName)) {
+                return processName;
+            }
+
+            // take a rest and again
+            try {
+                Thread.sleep(100L);
+            } catch (InterruptedException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
     private void initMapLocal() {
         //初始化定位
         mLocationClient = new AMapLocationClient(getApplicationContext());
@@ -172,7 +217,8 @@ public class AppContext extends GlobalApplication {
                     sendBroadcast(intent);
                     stopLocation();
                 } else {
-                    cityName = "定位失败";district="定位失败";
+                    cityName = "定位失败";
+                    district = "定位失败";
 //                    Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo());
                 }
@@ -105,6 +105,7 @@ public class MessageManager {
                 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();
@@ -116,7 +117,6 @@ public class MessageManager {
                 Long id = messageDao.insert(message);
                 notifyNotification(uuid, id, "收到一条作业通知");
             }
-
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -20,6 +20,7 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import com.shunzhi.parent.presenter.consult.ConsultPresenter;
 import com.shunzhi.parent.ui.MainActivity;
+import com.shunzhi.parent.ui.activity.StartActivity;
 import com.shunzhi.parent.util.GlideUtils;
 import com.stx.xhb.xbanner.XBanner;
@@ -75,7 +76,7 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         if (isQidong)mPresenter.getBanners("0", "");
         else mPresenter.getBanners("1", "");
-//        showVideos();
+        showVideos();
         tvJump=view.findViewById(R.id.tvJump);
@@ -98,7 +99,7 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         } else {
             jiecaoVideo.setVisibility(View.GONE);
             xBanner.setVisibility(View.VISIBLE);
-            mPresenter.getBanners("1", "");
+//            mPresenter.getBanners("1", "");
 //            mPresenter.getBanners("1",  AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
         }
     }
@@ -134,6 +135,7 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         try {
             imgUrl = new ArrayList<>();
             describeList = new ArrayList<>();
+//            Log.d("66666","isQidong="+isQidong);
             if (isQidong) {
                 AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");
                 String fileUrl = "", describe = "";
@@ -148,14 +150,15 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
                         describeList.add(guangGaoBeanList.get(i).describe);
                     }
                 }
-//                Log.d("66666","fileUrl="+guangGaoBeanList);
+                Log.d("66666","fileUrl="+fileUrl);
                 if (!TextUtils.isEmpty(fileUrl)){
                     jiecaoVideo.setUp(fileUrl, JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, describe);
                     jiecaoVideo.startVideo();
                 }else {
                     isQidong=false;
-                    showVideos();
-                    showBanners();
+                    startNewActivity(StartActivity.class);
+//                    showVideos();
+//                    showBanners();
                 }
             } else {
	@@ -24,7 +24,7 @@		@@ -24,7 +24,7 @@
24	</value>	24	</value>
25	</option>	25	</option>
26	</component>	26	</component>
27	- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">	27	+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
28	<output url="file://$PROJECT_DIR$/build/classes" />	28	<output url="file://$PROJECT_DIR$/build/classes" />
29	</component>	29	</component>
30	<component name="ProjectType">	30	<component name="ProjectType">
1	package com.shunzhi.parent;	1	package com.shunzhi.parent;
2		2
		3	+import android.app.ActivityManager;
3	import android.content.Context;	4	import android.content.Context;
4	import android.content.Intent;	5	import android.content.Intent;
5	import android.content.SharedPreferences;	6	import android.content.SharedPreferences;
		7	+import android.text.TextUtils;
6		8
7	import com.amap.api.location.AMapLocation;	9	import com.amap.api.location.AMapLocation;
8	import com.amap.api.location.AMapLocationClient;	10	import com.amap.api.location.AMapLocationClient;
	@@ -53,19 +55,22 @@ public class AppContext extends GlobalApplication {		@@ -53,19 +55,22 @@ public class AppContext extends GlobalApplication {
53	public AMapLocationClientOption mLocationOption = null;	55	public AMapLocationClientOption mLocationOption = null;
54		56
55	private MessageManager messageManager;	57	private MessageManager messageManager;
		58	+
56	@Override	59	@Override
57	public void onCreate() {	60	public void onCreate() {
58	appContext = this;	61	appContext = this;
59	super.onCreate();	62	super.onCreate();
60	- //开启地图地位
61	- initMapLocal();
62	NIMClient.init(this, loginInfo(), options());	63	NIMClient.init(this, loginInfo(), options());
63	- initDB();
64	- RetrofitCreateHelper.getInstance().setAuthorization(AppConfig.getAppConfig(this).get(AppConfig.ACCESS_TOKEN));
65	- messageManager = MessageManager.getInstance();	64	+ if (inMainProcess(this)) {
		65	+ //开启地图地位
		66	+ initMapLocal();
		67	+ initDB();
		68	+ RetrofitCreateHelper.getInstance().setAuthorization(AppConfig.getAppConfig(this).get(AppConfig.ACCESS_TOKEN));
		69	+ messageManager = MessageManager.getInstance();
		70	+ }
66	}	71	}
67		72
68	- public MessageManager getMessageManager(){	73	+ public MessageManager getMessageManager() {
69	return messageManager;	74	return messageManager;
70	}	75	}
71		76
	@@ -105,6 +110,46 @@ public class AppContext extends GlobalApplication {		@@ -105,6 +110,46 @@ public class AppContext extends GlobalApplication {
105	return null;	110	return null;
106	}	111	}
107		112
		113	+ public static boolean inMainProcess(Context context) {
		114	+ String packageName = context.getPackageName();
		115	+ String processName = getProcessName(context);
		116	+ return packageName.equals(processName);
		117	+ }
		118	+
		119	+ /**
		120	+ * 获取当前进程名
		121	+ *
		122	+ * @param context
		123	+ * @return 进程名
		124	+ */
		125	+ public static final String getProcessName(Context context) {
		126	+ String processName = null;
		127	+
		128	+ // ActivityManager
		129	+ ActivityManager am = ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE));
		130	+
		131	+ while (true) {
		132	+ for (ActivityManager.RunningAppProcessInfo info : am.getRunningAppProcesses()) {
		133	+ if (info.pid == android.os.Process.myPid()) {
		134	+ processName = info.processName;
		135	+ break;
		136	+ }
		137	+ }
		138	+
		139	+ // go home
		140	+ if (!TextUtils.isEmpty(processName)) {
		141	+ return processName;
		142	+ }
		143	+
		144	+ // take a rest and again
		145	+ try {
		146	+ Thread.sleep(100L);
		147	+ } catch (InterruptedException ex) {
		148	+ ex.printStackTrace();
		149	+ }
		150	+ }
		151	+ }
		152	+
108	private void initMapLocal() {	153	private void initMapLocal() {
109	//初始化定位	154	//初始化定位
110	mLocationClient = new AMapLocationClient(getApplicationContext());	155	mLocationClient = new AMapLocationClient(getApplicationContext());
	@@ -172,7 +217,8 @@ public class AppContext extends GlobalApplication {		@@ -172,7 +217,8 @@ public class AppContext extends GlobalApplication {
172	sendBroadcast(intent);	217	sendBroadcast(intent);
173	stopLocation();	218	stopLocation();
174	} else {	219	} else {
175	- cityName = "定位失败";district="定位失败";	220	+ cityName = "定位失败";
		221	+ district = "定位失败";
176		222
177	// Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo());	223	// Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo());
178	}	224	}