gongpm 9 years ago
parent
commit
dd13f5c387

+ 16 - 14
WeiChat/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
     android:versionCode="41"
-    android:versionName="4.1">
+    android:versionName="4.1" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -69,7 +69,7 @@
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme" >
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
@@ -80,7 +80,7 @@
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -240,7 +240,7 @@
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme">
+            android:theme="@style/ChooserTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -257,13 +257,13 @@
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS">
+            android:permission="android.permission.MANAGE_DOCUMENTS" >
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -290,7 +290,7 @@
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -306,7 +306,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -325,7 +325,7 @@
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
             android:persistent="true"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
@@ -339,7 +339,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver">
+        <receiver android:name=".ui.PushNetMessageReceiver" >
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -360,7 +360,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".ui.message.SelectCardActivity">
+        <activity android:name=".ui.message.SelectCardActivity" >
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
@@ -384,7 +384,7 @@
 
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -399,7 +399,9 @@
         <activity android:name=".ui.erp.activity.ClientActivity" />
         <activity android:name=".ui.erp.activity.SubscribeActivity" />
         <activity android:name=".ui.message.SubscriptionActivity" />
-        <activity android:name=".ui.circle.PhoneSelectActivity"></activity>
+        <activity android:name=".ui.circle.PhoneSelectActivity" />
+        <activity android:name=".ui.message.SubscribeListActivity" >
+        </activity>
     </application>
 
-</manifest>
+</manifest>

+ 0 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/AvatarHelper.java

@@ -1,20 +1,15 @@
 package com.xzjmyk.pm.activity.helper;
 
-import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 import android.widget.ImageView;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 import com.nostra13.universalimageloader.core.assist.MemoryCacheUtil;
 import com.nostra13.universalimageloader.core.imageaware.ImageAware;
 import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -137,8 +132,6 @@ public class AvatarHelper {
     }
     public void displayAvatar(String userId, final ImageView imageView, final boolean isThumb) {
         final String url = getAvatarUrl(userId, isThumb);
-        Log.i("gongpengming",url);
-        Log.i("gongpengming",(String)(imageView.getTag(222)==null?"空的":imageView.getTag(222)));
         if (TextUtils.isEmpty(url)) {
             return;
         }

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -20,6 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.message.SubscribeListActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -113,6 +114,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 break;
             case R.id.my_data_rl:
 //                startActivity(new Intent(getActivity(), SubscriptionActivity.class));
+                startActivity(new Intent(getActivity(), SubscribeListActivity.class));
                 ToastUtil.showToast(getActivity(), "抱歉,该功能尚未完善");
                 break;
 

+ 0 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/HttpClient.java

@@ -208,10 +208,8 @@ public class HttpClient {
 		httpclient.getParams().setParameter(
 				CoreProtocolPNames.HTTP_CONTENT_CHARSET, "UTF-8");
 		httpGet.setHeader("Cookie", "JSESSIONID=" + params.get("sessionId"));
-		Log.i("Cookie","get() sessionId:"+params.get("sessionId") );
 		if (!TextUtils.isEmpty(MyApplication.getInstance().getJSESSION_B2B())) {
 			httpGet.addHeader("Cookie", "JSESSIONID="+ MyApplication.getInstance().getJSESSION_B2B());
-			Log.i("Jession_cookie","get请求  cookie="+MyApplication.getInstance().getJSESSION_B2B());
 		}
 		httpclient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,8000);
 		httpclient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT,8000);

+ 7 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -258,7 +258,6 @@ public class MessageFragment extends EasyFragment {
         //将头部四个放在这里
 
 
-
     }
 
     //by gongpm 刷新数据提取方法
@@ -330,7 +329,7 @@ public class MessageFragment extends EasyFragment {
 
     /**
      * 请求加载新的筛选条件的数据
-     * <p>
+     * <p/>
      * 是下拉刷新,还是上拉加载
      */
     private void loadData() {
@@ -340,7 +339,7 @@ public class MessageFragment extends EasyFragment {
                 String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
                 long startTime = System.currentTimeMillis();
                 final List<Friend> friends = FriendDao.getInstance().getNearlyFriendMsg(mLoginUserId);
-                Log.i("Arison","MessageFragment:run:337:"+JSON.toJSONString(friends));
+                Log.i("Arison", "MessageFragment:run:337:" + JSON.toJSONString(friends));
                 setFriendName(friends, mLoginUserId);
                 long delayTime = 200 - (startTime - System.currentTimeMillis());// 保证至少200ms的刷新过程
                 if (delayTime < 0) {
@@ -520,7 +519,7 @@ public class MessageFragment extends EasyFragment {
                 } else if (friend.getUserId().equals(Friend.ID_ERP_TASK)) {  //我的任务
                     avatar_img.setBackgroundResource(android.R.color.transparent);
                     avatar_img.setImageResource(R.drawable.home_image_02_u);
-                } else if (friend.getUserId().equals(Friend.ID_ERP_ZHIHUI)) {//
+                } else if (friend.getUserId().equals(Friend.ID_ERP_ZHIHUI)) {//通知公告
                     avatar_img.setBackgroundResource(android.R.color.transparent);
                     avatar_img.setImageResource(R.drawable.home_image_03_u);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_NEWS)) {
@@ -539,7 +538,7 @@ public class MessageFragment extends EasyFragment {
                         isRefeshed = false;
 
                     } else {
-                        avatar_img.setTag(222,friend.getUserId());
+
                         AvatarHelper.getInstance().displayAvatar(friend.getUserId(), avatar_img, false);
                     }
                 }
@@ -549,6 +548,7 @@ public class MessageFragment extends EasyFragment {
                     //					avatar_img.setImageResource(R.drawable.avatar_normal);
                     avatar_img.setImageResource(R.drawable.qunliao);
                 } else {
+                    if (position>=3)
                     AvatarHelper.getInstance().displayAvatarPng(friend.getRoomCreateUserId(), avatar_img, false);// 目前在备注名放房间的创建者Id
                     // avatar_img.setImageResource(R.drawable.qunliao);
                 }
@@ -599,7 +599,7 @@ public class MessageFragment extends EasyFragment {
                         ChatMessageDao.getInstance().deleteMessageTable(mLoginUserId, friend.getUserId());
                     } else {
                         //deleteRoom(mLoginUserId, mFriendList.get(position));
-                        deleteFriend(mLoginUserId,mFriendList.get(position));
+                        deleteFriend(mLoginUserId, mFriendList.get(position));
                     }
 
                 }
@@ -765,7 +765,6 @@ public class MessageFragment extends EasyFragment {
 
 
     private final int load_success_erpMsgNum = 5;
-
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(final Message msg) {
@@ -786,6 +785,7 @@ public class MessageFragment extends EasyFragment {
                     updateNews(msg);
                     break;
             }
+
         }
     };
 

+ 9 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/RoomInfoActivity.java

@@ -351,7 +351,7 @@ public class RoomInfoActivity extends BaseActivity {
                 remove_manage_rl.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        showCreateGroupChatDialog(REMOVE);
+                        showAdministratorsDialog(REMOVE);
                     }
                 });
             } else {
@@ -377,7 +377,7 @@ public class RoomInfoActivity extends BaseActivity {
             add_manage_rl.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    showCreateGroupChatDialog(ADD);
+                    showAdministratorsDialog(ADD);
                 }
             });
 
@@ -490,7 +490,12 @@ public class RoomInfoActivity extends BaseActivity {
     private int REMOVE = 0;
     List<MucRoomMember> members;
 
-    private void showCreateGroupChatDialog(final int h) {
+    /**
+     * 管理员操作选项
+     *
+     * @param h //操作 add为添加  remover删除
+     */
+    private void showAdministratorsDialog(final int h) {
         View rootView = LayoutInflater.from(mContext).inflate(R.layout.activity_select_contacts, null);
         ListView list = (ListView) rootView.findViewById(R.id.list_view);
         Button ok_btn = (Button) rootView.findViewById(R.id.ok_btn);
@@ -641,6 +646,7 @@ public class RoomInfoActivity extends BaseActivity {
             CheckBox cb;
         }
     }
+
     private void showNewNoticeDialog(final String notice) {
         final EditText editText = new EditText(this);
         editText.setLines(2);

+ 102 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscribeListActivity.java

@@ -1,13 +1,113 @@
 package com.xzjmyk.pm.activity.ui.message;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 
-public class SubscribeListActivity extends AppCompatActivity {
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.StringRequest;
+import com.xzjmyk.pm.activity.AppConfig;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.volley.ObjectResult;
+import com.xzjmyk.pm.activity.volley.Result;
+import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class SubscribeListActivity extends BaseActivity {
+
+    private AppConfig mConfig;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subscribe_list);
+        mConfig = MyApplication.getInstance().getConfig();
+
+        initData();
     }
+
+    private void updata() {
+//        String url = "common/desktop/subs/getSubs.action";
+        String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "common/desktop/subs/getSubs.action";
+        Map<String, String> params = new HashMap<>();
+        params.put("count", 2 + "");
+        params.put("condition", "where 1=1");
+        Log.i("gongpengming", url);
+        StringJsonObjectRequest<SubscriptionMessage> request = new StringJsonObjectRequest<SubscriptionMessage>(url, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                Log.i("gongpengming", arg0.getMessage() == null ? "空的" : arg0.getMessage());
+                ToastUtil.showErrorNet(mContext);
+            }
+        }, new StringJsonObjectRequest.Listener<SubscriptionMessage>() {
+            @Override
+            public void onResponse(ObjectResult<SubscriptionMessage> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    ToastMessage("操作成功");
+                }
+                Log.i("gongpengming", result.getData().getData_());
+            }
+        }, SubscriptionMessage.class, params);
+        addShortRequest(request);
+    }
+
+    public void updata2() {
+//        String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "common/desktop/subs/getSubs.action?count=2&condition=where 1=1";
+        String url = "http://218.17.158.219:8090/ERP//common/desktop/subs/getSubs.action?count=2&condition=where 1=1";
+        Log.i("gongpengming", url);
+        StringRequest sss = new StringRequest(url, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String s) {
+                Log.i("gongpengming", "ok" + s);
+            }
+        }, new Response.ErrorListener() {
+
+            @Override
+            public void onErrorResponse(VolleyError volleyError) {
+                Log.i("gongpengming", "not" + volleyError.getMessage());
+                Log.i("gongpengming", "not" + volleyError.getLocalizedMessage());
+                Log.i("gongpengming", "not" + volleyError.toString());
+            }
+        });
+        addShortRequest(sss);
+    }
+
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            if (msg.what == 2) {
+                String message = (String) msg.getData().get("result");
+                Log.i("gongpengming", message);
+            } else if (Constants.APP_SOCKETIMEOUTEXCEPTION == msg.what) {
+                String message = (String) msg.getData().get("result");
+                Log.i("gongpengming", message);
+            }
+        }
+    };
+
+    public void initData() {
+        String url = "http://218.17.158.219:8090/ERP//common/desktop/subs/getSubs.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("count", 2);
+        param.put("condition", "where 1=1");
+        param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
+        Log.i("gongpengming", CommonUtil.getSharedPreferences(this, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, param, handler, headers, 2, null, null, "get");
+    }
+
 }