Jelajahi Sumber

正式版本5.6.1 ;

Arison 9 tahun lalu
induk
melakukan
d61b1b9bc0

+ 1 - 1
WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 33 - 16
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailInfoActivity.java

@@ -183,21 +183,21 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         }
 
 
-            List<SimpleData> hasHeaderIdList = new ArrayList<SimpleData>();
-            int groupId = 1;
-            for (int i = 0; i < 25; i++) {
-                SimpleData item = new SimpleData();
-                item.setLeft("左边"+i);
-                item.setRight("右边"+i);
-                item.setGroupId(groupId);
-                item.setGroup("组名" + groupId);
-                if (i % 5 == 0) {
-                    groupId++;
-                }
-                hasHeaderIdList.add(item);
-            }
-        mAapter=new StickyListAdapter(mContext,hasHeaderIdList);
-        mList.setAdapter(mAapter);
+//            List<SimpleData> hasHeaderIdList = new ArrayList<SimpleData>();
+//            int groupId = 1;
+//            for (int i = 0; i < 25; i++) {
+//                SimpleData item = new SimpleData();
+//                item.setLeft("左边"+i);
+//                item.setRight("右边"+i);
+//                item.setGroupId(groupId);
+//                item.setGroup("组名" + groupId);
+//                if (i % 5 == 0) {
+//                    groupId++;
+//                }
+//                hasHeaderIdList.add(item);
+//            }
+//        mAapter=new StickyListAdapter(mContext,hasHeaderIdList);
+//        mList.setAdapter(mAapter);
         
     }
 
@@ -506,7 +506,24 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                      Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                      json = msg.getData().getString("result");
                      LogUtil.d(JSON.toJSONString(json));
-                     
+                     JSONArray data=JSON.parseObject(json).getJSONArray("data");
+                     int size=data.size();
+                     List<SimpleData> simpleDatas=new ArrayList<>();
+                     JSONArray value=data.getJSONObject(0).getJSONArray("value");
+                     for (int j=0;j<value.size();j++){
+                         for(int i=0;i<data.size();i++){
+                             SimpleData simpleData=new SimpleData();
+                             simpleData.setLeft(data.getJSONObject(i).getString("caption"));
+                             simpleData.setRight(data.getJSONObject(i).getJSONArray("value").get(j).toString());
+                             simpleData.setGroupId(j);
+                             simpleDatas.add(simpleData);
+                         }
+                     }
+
+                    mAapter=new StickyListAdapter(mContext,simpleDatas);
+                    mList.setAdapter(mAapter);
+                    
+                    
                     break;
             }
         }

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -1155,6 +1155,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 data.setIsDefault(items.getIntValue("mdg_isdefault"));
                 data.setIsNeed(items.getIntValue("mdg_isdefault"));
                 data.setType(items.getString("dg_type"));
+                data.setMaxlength(String.valueOf(items.getIntValue("dg_maxlength")));
                 data.setGroupId(groupId);//设置组id
                 groupid = items.getInteger("dg_group");
                 if (formid == 0) {

+ 11 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/StickyListAdapter.java

@@ -55,9 +55,9 @@ public class StickyListAdapter extends BaseAdapter implements StickyListHeadersA
 
         if (convertView == null) {
             holder = new ViewHolder();
-            convertView = inflater.inflate(android.R.layout.simple_list_item_2, parent, false);
-            holder.text = (TextView) convertView.findViewById(android.R.id.text1);
-            holder.text2 = (TextView) convertView.findViewById(android.R.id.text2);
+            convertView = inflater.inflate(R.layout.simple_list_item_3, parent, false);
+            holder.text = (TextView) convertView.findViewById(R.id.text1);
+            holder.text2 = (TextView) convertView.findViewById(R.id.text2);
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
@@ -75,15 +75,17 @@ public class StickyListAdapter extends BaseAdapter implements StickyListHeadersA
         HeaderViewHolder holder;
         if (convertView == null) {
             holder = new HeaderViewHolder();
-            convertView = inflater.inflate(R.layout.grid_item_header, parent, false);
-            holder.text = (TextView) convertView.findViewById(R.id.tv_name);
+            convertView = inflater.inflate(R.layout.list_item_header, parent, false);
+            holder.view_line=convertView.findViewById(R.id.view_line);
             convertView.setTag(holder);
         } else {
             holder = (HeaderViewHolder) convertView.getTag();
         }
-        //set header text as first char in name
-        String headerText = "" +simpleDatas.get(position).getGroup();
-        holder.text.setText(headerText);
+        if (simpleDatas.get(position).getGroupId()==0){
+            holder.view_line.setVisibility(View.GONE);
+        }else{
+            holder.view_line.setVisibility(View.VISIBLE);
+        }
         return convertView;
     }
 
@@ -91,6 +93,7 @@ public class StickyListAdapter extends BaseAdapter implements StickyListHeadersA
 
     class HeaderViewHolder {
         TextView text;
+         View  view_line;
     }
 
     class ViewHolder {

+ 0 - 1
WeiChat/src/main/res/layout/activity_business_detail_info.xml

@@ -357,7 +357,6 @@
 
             <com.xzjmyk.pm.activity.view.stickylistheaders.StickyListHeadersListView
                 android:id="@+id/lv_business"
-              
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
             </LinearLayout>

+ 0 - 1
WeiChat/src/main/res/layout/grid_item_header.xml

@@ -2,7 +2,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:visibility="gone"
     android:layout_marginTop="10dp"
     android:orientation="vertical">
     <TextView

+ 10 - 0
WeiChat/src/main/res/layout/list_item_header.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <View 
+        android:id="@+id/view_line"
+        style="@style/line_horizontal_style_one"
+        android:background="@drawable/bg_bar"
+        android:padding="10dp"></View>
+</LinearLayout>

+ 40 - 0
WeiChat/src/main/res/layout/simple_list_item_3.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="20dp">
+
+    <TextView android:id="@+id/text1"
+         style="@style/TextView_VerticalCenter"
+        android:layout_width="90dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="5dp"
+        android:textColor="@color/gray_light"
+        android:layout_centerVertical="true"
+        android:text="left"
+     />
+
+    <TextView android:id="@id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_centerVertical="true"
+        android:text="left"
+        android:layout_toRightOf="@+id/text1"/>
+
+</RelativeLayout>

+ 1 - 1
WeiChat/src/main/res/values/styles.xml

@@ -317,7 +317,7 @@
 
     <style name="form_relative_right_text">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_marginRight">20dp</item>