解决冲突

WeiChat/src/main/AndroidManifest.xml

@@ -74,16 +74,14 @@
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <!-- 富媒体需要声明的权限 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
 
 
     <!-- 适配Android N系统必需的ContentProvider写权限声明，写权限包含应用包名-->
     <!--<uses-permission android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example" />-->
     <!--<permission-->
-        <!--android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example"-->
-        <!--android:protectionLevel="normal">-->
+    <!--android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example"-->
+    <!--android:protectionLevel="normal">-->
     <!--</permission>-->
 
     <!-- 百度自动更新 -->
@@ -323,7 +321,6 @@
         <!-- 文件选择的activity -->
         <activity
             android:name="com.ipaulpro.afilechooser.FileChooserActivity"
-            android:enabled="@bool/use_activity"
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
@@ -356,9 +353,6 @@
                 <action android:name="android.intent.action.SCREEN_ON" />
             </intent-filter>
         </receiver>
-        <!-- oA模块提醒功能本地推送 -->
-        <receiver android:name=".ui.erp.util.alarm.AlarmReceiver" />
-
         <activity
             android:name=".ui.message.InstantMessageActivity"
             android:launchMode="singleTask"
@@ -378,21 +372,21 @@
         <!-- baidu  push service start -->
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <!-- push富媒体，使用富媒体推送必须声明 -->
-     <!--   <activity
-            android:name="com.baidu.android.pushservice.richmedia.MediaViewActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="MediaViewActivity" >
-        </activity>
-        <activity
-            android:name="com.baidu.android.pushservice.richmedia.MediaListActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="MediaListActivity"
-            android:launchMode="singleTask" >
-        </activity>-->
+        <!--   <activity
+               android:name="com.baidu.android.pushservice.richmedia.MediaViewActivity"
+               android:configChanges="orientation|keyboardHidden"
+               android:label="MediaViewActivity" >
+           </activity>
+           <activity
+               android:name="com.baidu.android.pushservice.richmedia.MediaListActivity"
+               android:configChanges="orientation|keyboardHidden"
+               android:label="MediaListActivity"
+               android:launchMode="singleTask" >
+           </activity>-->
         <!-- push富媒体结束 -->
 
         <!-- push应用定义消息receiver声明 -->
-        <receiver android:name=".ui.PushNetMessageReceiver" >
+        <receiver android:name=".ui.PushNetMessageReceiver">
             <intent-filter android:priority="1000">
 
                 <!-- 接收push消息 -->
@@ -406,7 +400,7 @@
         <!-- push必须的receviver和service声明 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -431,7 +425,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter android:priority="1000">
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -447,7 +441,7 @@
         <service
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter android:priority="1000">
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
@@ -457,12 +451,12 @@
             android:exported="true" />
 
         <!-- 适配Android N系统必需的ContentProvider声明，写权限包含应用包名-->
-       <!-- <provider
-            android:name="com.baidu.android.pushservice.PushInfoProvider"
-            android:authorities="com.baidu.push.example.bdpush"
-            android:writePermission="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example"
-            android:protectionLevel = "signature"
-            android:exported="true" />-->
+        <!-- <provider
+             android:name="com.baidu.android.pushservice.PushInfoProvider"
+             android:authorities="com.baidu.push.example.bdpush"
+             android:writePermission="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example"
+             android:protectionLevel = "signature"
+             android:exported="true" />-->
 
         <!-- 在百度开发者中心查询应用的API Key -->
         <meta-data
@@ -485,18 +479,18 @@
         </activity>
 
         <!-- 百度 -->
-       <meta-data
+        <meta-data
             android:name="BDAPPID"
             android:value="7178311" />
         <meta-data
             android:name="BDAPPKEY"
             android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
         <!--<meta-data-->
-            <!--android:name="BDAPPID"-->
-            <!--android:value="8037149" />-->
+        <!--android:name="BDAPPID"-->
+        <!--android:value="8037149" />-->
         <!--<meta-data-->
-            <!--android:name="BDAPPKEY"-->
-            <!--android:value="GMZFDGbbchdQQXjpabX38rTlychRGnEF" />-->
+        <!--android:name="BDAPPKEY"-->
+        <!--android:value="GMZFDGbbchdQQXjpabX38rTlychRGnEF" />-->
 
         <service
             android:name="com.baidu.location.f"
@@ -762,8 +756,8 @@
         <service
             android:name=".ui.erp.util.alarm.AlarmService"
             android:enabled="true"
-            android:exported="true"></service>
-        <activity android:name=".ui.erp.activity.form.DataFormDetailActivity"></activity>
+            android:exported="true" />
+        <activity android:name=".ui.erp.activity.form.DataFormDetailActivity" />
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -441,17 +441,9 @@ public class FriendDao {
      */
     public boolean createOrUpdateFriend(Friend friend) {
         try {
-            Log.i("gongpengming","进来的friend.getRoomCreateUserId()="+friend.getRoomCreateUserId());
-
             CreateOrUpdateStatus status = friendDao.createOrUpdate(friend);
-            if (status.isCreated()) {
-                Log.i("gongpengming", "创建成功");
-            } else if (status.isUpdated()) {
-                Log.i("gongpengming", "更新成功");
-            }
             return status.isCreated() || status.isUpdated();
         } catch (SQLException e) {
-            Log.i("gongpengming", "更新失败" + e.getMessage());
             e.printStackTrace();
         }
         return false;

WeiChat/src/main/res/layout/fragment_me.xml

@@ -41,14 +41,24 @@
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
+                <ImageView
+                    android:id="@id/tag"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="8dp"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+
                 <TextView
                     android:id="@+id/phone_number_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:layout_toLeftOf="@id/tag"
                     android:drawablePadding="10dp"
-                    android:drawableRight="@drawable/oa_next"
+                    android:layout_marginRight="5dp"
                     android:textColor="@color/text_hine"
                     android:textSize="@dimen/text_hine" />