aa

WeiChat/build.gradle

@@ -67,4 +67,5 @@ dependencies {
     compile files('libs/flexjson-2.1.jar')
     compile 'com.android.support:support-v4:22+'
     compile 'com.umeng.analytics:analytics:latest.integration'
+    compile 'com.android.support:cardview-v7:22.2.0'
 }

WeiChat/src/main/AndroidManifest.xml

@@ -83,6 +83,7 @@
             android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -398,6 +399,8 @@
         </activity>
         <activity android:name=".ui.erp.activity.SubscribeActivity" >
         </activity>
+        <activity android:name=".ui.message.SubscriptionActivity" >
+        </activity>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/SubscriptionBean.java

@@ -0,0 +1,78 @@
+package com.xzjmyk.pm.activity.bean.message;
+
+import java.util.ArrayList;
+
+/**
+ * Created by gongpm on 2016/6/3.
+ */
+public class SubscriptionBean {
+
+    private String time;//消息时间
+    private int size;  //当天消息列表
+    private ArrayList<SubscriptionMessage> SubscriptionMessages; //当天消息列表
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public ArrayList<SubscriptionMessage> getSubscriptionMessages() {
+        return SubscriptionMessages;
+    }
+
+    public void setSubscriptionMessages(ArrayList<SubscriptionMessage> subscriptionMessages) {
+        SubscriptionMessages = subscriptionMessages;
+    }
+    public SubscriptionMessage getSubscriptionMessage(){
+        return new SubscriptionMessage();
+    }
+    public class SubscriptionMessage {
+        private String sub;//简介
+        private String ImgUrl;//图片网址
+        private String url;
+        private int tag;  //标识（1为大图 else 为小图）
+
+        public String getSub() {
+            return sub;
+        }
+
+        public void setSub(String sub) {
+            this.sub = sub;
+        }
+
+        public String getImgUrl() {
+            return ImgUrl;
+        }
+
+        public void setImgUrl(String imgUrl) {
+            ImgUrl = imgUrl;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public int getTag() {
+            return tag;
+        }
+
+        public void setTag(int tag) {
+            this.tag = tag;
+        }
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -47,6 +47,9 @@ public abstract class BaseActivity extends ActionBackActivity {
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
     }
 
+    public void setTouch(boolean b) {
+        setNotTouchEvent(b);
+    }
 
     @Override
     protected void onDestroy() {
@@ -58,8 +61,6 @@ public abstract class BaseActivity extends ActionBackActivity {
     @Override
     protected void onStop() {
         super.onStop();
-//		Log.i("Arison","BaseActivity onStop()");
-        //PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, true);//进行通知
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/DefaultResourceActivity.java

@@ -2,22 +2,21 @@ package com.xzjmyk.pm.activity.ui.base;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 
 /**
  * 让App字体不受系统设置字体的影响
- * 
+ *
  * @author Dean Tao
- * 
  */
-public class DefaultResourceActivity extends ActionBarActivity {
-	/* System default config */
-	private static Configuration config = new Configuration();
+public class DefaultResourceActivity extends AppCompatActivity {
+    /* System default config */
+    private static Configuration config = new Configuration();
 
-	@Override
-	public Resources getResources() {
-		Resources res = super.getResources();
-		res.updateConfiguration(config, res.getDisplayMetrics());
-		return res;
-	}
+    @Override
+    public Resources getResources() {
+        Resources res = super.getResources();
+        res.updateConfiguration(config, res.getDisplayMetrics());
+        return res;
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -11,6 +11,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -466,6 +467,9 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         FileDataHelper.readArrayData(this, mLoginUserId, FileDataHelper.FILE_BUSINESS_CIRCLE, new StringJsonArrayRequest.Listener<PublicMessage>() {
             @Override
             public void onResponse(ArrayResult<PublicMessage> result) {
+                for (int i = 0; i < result.getData().size(); i++) {
+                    Log.i("gong", result.getData().get(i).getLocation()==null?"":result.getData().get(i).getLocation());
+                }
                 if (result != null && result.getData() != null) {
                     mMessages.clear();
                     mMessages.addAll(result.getData());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -10,16 +10,17 @@ import android.widget.RelativeLayout;
 
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConfig;
-import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
+import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+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.SubscriptionActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -112,6 +113,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 startActivity(intent);
                 break;
             case R.id.my_data_rl:
+                startActivity(new Intent(getActivity(), SubscriptionActivity.class));
                 ToastUtil.showToast(getActivity(), "抱歉，该功能尚未完善");
                 break;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -0,0 +1,167 @@
+package com.xzjmyk.pm.activity.ui.message;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.message.SubscriptionBean;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+import java.util.ArrayList;
+
+
+public class SubscriptionActivity extends BaseActivity {
+    private static final int TAG_BIG = 1;
+    private static final int TAG_SUB = 2;
+    private PullToRefreshListView listView;
+    private ArrayList<SubscriptionBean> SubscriptionBeans;
+    private SubscriptionAdapter adapter;
+    private SubscriptionActivity activity = this;
+
+    @Override//设置右划退出
+    public void setTouch(boolean b) {
+        super.setTouch(false);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_subscription);
+        initView();
+        init();//初始化数据
+    }
+
+    private void init() {
+        //TODO SubscriptionBeans获取数据 。。。。
+        SubscriptionBean bean = null;
+        SubscriptionBeans = new ArrayList<>();
+        ArrayList<SubscriptionBean.SubscriptionMessage> messages = null;
+        for (int i = 0; i < 5; i++) {
+            bean = new SubscriptionBean();
+            bean.setSize(5);
+            bean.setTime("2012-11-0" + (++i));
+            messages = new ArrayList<>();
+            for (int j = 0; j < 6; j++) {
+                SubscriptionBean.SubscriptionMessage message = bean.getSubscriptionMessage();
+                message.setImgUrl("https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1642940013,2147239593&fm=111&gp=0.jpg");
+                message.setSub("这个一个测试信息:" + "其中j==" + j + "\ni==" + i);
+                message.setTag((int) (Math.random() * 2));
+                message.setUrl("ss");
+                messages.add(message);
+            }
+            bean.setSubscriptionMessages(messages);
+            SubscriptionBeans.add(bean);
+        }
+        listView.getRefreshableView().setAdapter(adapter);
+
+    }
+
+    private void initView() {
+        listView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
+        adapter = new SubscriptionAdapter();
+    }
+
+
+    //外层list
+    class SubscriptionAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return SubscriptionBeans.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return SubscriptionBeans.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+
+        @Override
+        public View getView(int position, View contextView, ViewGroup viewGroup) {
+            ListView listview = null;
+            if (contextView == null) {
+                contextView = LayoutInflater.from(activity).inflate(R.layout.subscription, null);
+                listview = (ListView) contextView.findViewById(R.id.listview);
+                contextView.setTag(listview);
+            } else {
+                listview = (ListView) contextView.getTag();
+            }
+            listview.setAdapter(new ListAdapter(SubscriptionBeans.get(position).getSubscriptionMessages()));
+            return contextView;
+        }
+    }
+
+    //内层list
+    class ListAdapter extends BaseAdapter {
+
+        private ArrayList<SubscriptionBean.SubscriptionMessage> SubscriptionMessages; //当天消息列表
+
+        private ListAdapter(ArrayList<SubscriptionBean.SubscriptionMessage> SubscriptionMessages) {
+            this.SubscriptionMessages = SubscriptionMessages;
+        }
+
+        @Override
+        public int getCount() {
+            return SubscriptionMessages.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return SubscriptionMessages.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return SubscriptionMessages.get(position).getTag();
+        }
+
+        @Override
+        public View getView(int i, View contextView, ViewGroup viewGroup) {
+            VieweHolder holder = null;
+            if (contextView == null) {
+                holder = new VieweHolder();
+                contextView = LayoutInflater.from(activity).inflate(R.layout.bigimage_subscription, null);
+                holder.ll = (LinearLayout) contextView.findViewById(R.id.small_ll);
+                holder.rl = (RelativeLayout) contextView.findViewById(R.id.big_rl);
+                contextView.setTag(holder);
+            } else {
+                holder = (VieweHolder) contextView.getTag();
+            }
+            if (getItemViewType(i) == TAG_BIG) {
+                holder.ll.setVisibility(View.GONE);
+                holder.rl.setVisibility(View.VISIBLE);
+            } else {
+                holder.ll.setVisibility(View.VISIBLE);
+                holder.rl.setVisibility(View.GONE);
+            }
+            return contextView;
+        }
+
+
+        class VieweHolder {
+            LinearLayout ll;
+            RelativeLayout rl;
+
+        }
+
+
+    }
+}
+

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/CoreService.java

@@ -109,7 +109,6 @@ public class CoreService extends Service {
                 content = "不明确类型";
                 break;
         }
-        Log.i("gongpengming", content);
         NotificationManager mNotificationManager = null;
         if (mNotificationManager == null) {
             mNotificationManager = (NotificationManager) getApplicationContext().getSystemService(NOTIFICATION_SERVICE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XChatManager.java

@@ -145,7 +145,6 @@ public class XChatManager {
 
                 if (chatMessage != null && chatMessage.getFromUserId() != mLoginUserId) {
                     mService.notificationMesage(chatMessage);
-                    Log.i("gongpengming", "sssss");
                 }
             }
             Log.d("roamer", "将消息保存到本地");

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.handmark.pulltorefresh.library.PullToRefreshListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ptr="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pull_refresh_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_above="@+id/bottom_view"
+    android:divider="#00000000"
+    ptr:ptrAnimationStyle="flip"
+    ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
+    ptr:ptrDrawableStart="@drawable/default_ptr_flip"
+    ptr:ptrHeaderTextColor="@color/black"
+    ptr:ptrMode="both"
+    ptr:ptrOverScroll="false"
+    ptr:ptrScrollingWhileRefreshingEnabled="true"
+    ptr:ptrShowIndicator="false" />

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/small_ll"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:background="@color/table_background"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:text="公司发布啊收到回复啊一般的方式发白色的发挥"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:src="@drawable/head1" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/big_rl"
+        android:layout_width="match_parent"
+        android:layout_height="130dp"
+        android:background="@color/table_background"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/head1" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:paddingLeft="10dp"
+            android:text="公司发布啊收到回复啊一般的方式发白色的发挥"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+    </RelativeLayout>
+</FrameLayout>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="10dp"
+    card_view:background="@color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tvTime"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="2014-11-11" />
+
+        <com.xzjmyk.pm.activity.view.MyListView
+            android:id="@+id/listview"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/multi_praise_tv"
+            android:paddingTop="5dp" />
+    </LinearLayout>
+
+</RelativeLayout>

WeiChat/src/main/res/values-v14/styles.xml

@@ -20,6 +20,7 @@
     </style>
 
     <style name="IMActionBar" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="android:actionBarSize">11dp</item>
         <item name="android:icon">@drawable/action_bar_divider</item>
         <item name="android:background">@drawable/BackBar</item>
         <item name="android:titleTextStyle">@style/IMActionBar.TitleTextStyle</item>

WeiChat/src/main/res/values/styles.xml

@@ -1,12 +1,16 @@
 <resources>
+
     <style name="style_bg_bar">
         <item name="android:background">@color/antionbarcolor</item>
     </style>
+
     <drawable name="BackBar">@color/antionbarcolor</drawable>
+
     <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
-          <item name="android:buttonStyle">@android:style/Widget.Button</item>
+        <item name="android:buttonStyle">@android:style/Widget.Button</item>
         <item name="android:windowAnimationStyle">@style/IMAnimationStyle</item>
         <item name="actionBarStyle">@style/style_bg_bar</item>
+
         <item name="android:listViewStyle">@style/IMListView</item>
         <item name="actionBarItemBackground">@drawable/actionbar_menu_selector</item>
         <item name="homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
@@ -36,6 +40,7 @@
         <item name="android:windowEnterAnimation">@anim/pop_slide_right_in</item>
         <item name="android:windowExitAnimation">@anim/pop_slide_right_out</item>
     </style>
+
     <style name="Buttom.Popwindow" parent="@android:style/Animation">
         <item name="android:windowEnterAnimation">@anim/input_method_enter</item>
         <item name="android:windowExitAnimation">@anim/input_method_exit</item>
@@ -65,6 +70,7 @@
         <item name="android:activityCloseEnterAnimation">@anim/anim_not_change</item>
         <item name="android:activityCloseExitAnimation">@anim/pop_out</item>
     </style>
+
     <style name="IMTabButton">
         <item name="android:layout_gravity">center</item>
         <item name="android:textSize">@dimen/SmallerTextSize</item>
@@ -158,6 +164,7 @@
         <item name="android:paddingLeft">9dp</item>
         <item name="android:paddingRight">5dp</item>
     </style>
+
     <style name="IMTbleLine_UP_Me">
         <item name="android:background">@color/item_color1</item>
         <item name="android:layout_width">match_parent</item>
@@ -166,6 +173,7 @@
         <item name="android:paddingLeft">9dp</item>
         <item name="android:paddingRight">5dp</item>
     </style>
+
     <style name="IMTbleLine_UP">
         <item name="android:background">@color/item_color2</item>
         <item name="android:layout_width">match_parent</item>
@@ -237,8 +245,10 @@
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
- <style name="ChooserTheme" parent="android:Theme.Light" />
- <style name="fileChooserName">
+
+    <style name="ChooserTheme" parent="android:Theme.Light" />
+
+    <style name="fileChooserName">
         <item name="android:drawablePadding">@dimen/list_item_padding</item>
         <item name="android:ellipsize">end</item>
         <item name="android:gravity">center_vertical</item>
@@ -430,6 +440,7 @@
         <item name="android:background">@drawable/line</item>
         <item name="android:contentDescription">@string/app_name</item>
     </style>
+
     <style name="from_button_base_white">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">45dp</item>
@@ -437,6 +448,7 @@
         <item name="android:textSize">@dimen/text_main</item>
         <item name="android:textColor">@color/text_main</item>
     </style>
+
     <style name="from_button_base_bule">
         <item name="android:layout_marginTop">20dp</item>
         <item name="android:layout_width">match_parent</item>
@@ -458,6 +470,7 @@
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:layout_marginTop">7dp</item>
     </style>
+
     <style name="item_relative_style_value">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>

pullToRefershLibraryMy/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-
 android {
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
@@ -16,3 +15,6 @@ android {
         }
     }
 }
+
+dependencies {
+}