developer 分支备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SearchSelectActivity.java

@@ -31,6 +31,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,6 +77,7 @@ public class SearchSelectActivity extends BaseActivity {
             public void afterTextChanged(Editable s) {
                 String search = s.toString();
                 if (StringUtils.isEmpty(search)) {
+                    empty_rl.setVisibility(View.GONE);
                     if (!ListUtils.isEmpty(seachResult)) {
                         seachResult.clear();
                         mAdapter.notifyDataSetChanged();
@@ -129,6 +131,11 @@ public class SearchSelectActivity extends BaseActivity {
                 pullToRefreshListView.onRefreshComplete();
                 JSONObject object = JSON.parseObject(message);
                 JSONArray listdata = object.getJSONArray("listdata");
+                if (ListUtils.isEmpty(listdata))
+                    ToastUtil.showToast(ct, R.string.nothing_now);
+                if (SearchSelectActivity.this.page > 1) {
+                    listdata.addAll(0, seachResult);
+                }
                 if (ListUtils.isEmpty(listdata)) {//为空
                     empty_rl.setVisibility(View.VISIBLE);
                     clearData();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/OAModel.java

@@ -185,7 +185,7 @@ public class OAModel {
         if (startdate > 0) {
             builder.append(TimeUtils.long2str(startdate, formart));
             if (enddate > startdate)
-                builder.append("  " + TimeUtils.long2str(enddate, formart));
+                builder.append("--" + TimeUtils.long2str(enddate, formart));
         }
         return builder.toString();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/InfoCodeActivity.java

@@ -111,6 +111,7 @@ public class InfoCodeActivity extends BaseActivity implements View.OnClickListen
                             +  "\"uu_name\":\"" + uu_name + "\",\n"+
                             "\"uu_phone\":\"" + uu_phone + "\",\n"+
                              "\"uu_userid\":\"" + loginUserId + "\"\n"
+                            //TODO 需要更多字段自行添加即可
                             +"}";
                     if (mBitmap == null) {
                         Log.i("mBitmap","null");
@@ -120,7 +121,7 @@ public class InfoCodeActivity extends BaseActivity implements View.OnClickListen
                     }
                     Log.i("mBitmap",mBitmap.toString());
                     code_bitmap = cretaeBitmap(new String(s.getBytes(),
-                            "ISO-8859-1"));
+                            "ISO-8859-1"));  //解决客户端向服务器发送一个请求出现乱码问题
                     code_main.setImageBitmap(code_bitmap);
                     AvatarHelper.getInstance().display(loginUserId, photo_im, true, false);
                 } catch (WriterException e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -100,6 +100,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private RelativeLayout app_drafts_rl;
     @ViewInject(R.id.test_rl)
     private RelativeLayout test_rl;
+    @ViewInject(R.id.my_qr_code_rl)
+    private RelativeLayout my_qr_code_rl;
 
 
     @ViewInject(R.id.app_friend_rl)
@@ -252,8 +254,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 
         if (CommonUtil.isReleaseVersion()) {
             test_rl.setVisibility(View.GONE);
+            my_qr_code_rl.setVisibility(View.GONE);
         } else {
             test_rl.setVisibility(View.VISIBLE);
+            my_qr_code_rl.setVisibility(View.VISIBLE);
         }
 
         //init data
@@ -325,16 +329,13 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     }
 
     private void showInfoCode() {
-        rl_info.setOnLongClickListener(
-                new View.OnLongClickListener() {
+        my_qr_code_rl.setOnClickListener(new View.OnClickListener() {
             @Override
-            public boolean onLongClick(View v) {
-                if (!CommonUtil.isReleaseVersion()){
-                    startActivity(new Intent(ct,InfoCodeActivity.class));
-                }
-                return true;
+            public void onClick(View v) {
+                startActivity(new Intent(ct,InfoCodeActivity.class));
             }
         });
+
     }
 
     @Override

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

@@ -7,8 +7,10 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_above="@+id/ll_bottom"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:fillViewport="true">
 
         <LinearLayout
@@ -148,7 +150,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/business_name"
+                        android:text="@string/describe"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -159,7 +161,8 @@
 
                 <LinearLayout
                     style="@style/LinearLayout_horizontal"
-                    android:padding="5dp">
+                    android:padding="5dp"
+                    android:visibility="gone">
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
@@ -193,18 +196,17 @@
 
                 <LinearLayout
                     style="@style/LinearLayout_horizontal"
-                    android:padding="5dp"
-                    android:visibility="gone">
+                    android:padding="5dp">
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="商机类型"
+                        android:text="@string/Company_Name"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_type"
+                        android:id="@+id/bc_custname"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
@@ -217,50 +219,51 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/current_stage"
+                        android:text="@string/address"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_currentprocess"
+                        android:id="@+id/bc_address"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
                     style="@style/LinearLayout_horizontal"
-                    android:padding="5dp">
+                    android:padding="5dp"
+                    android:visibility="gone">
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="90dp"
+                        android:layout_width="70dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/creat_time"
+                        android:text="商机类型"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_recorddate"
+                        android:id="@+id/bc_type"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
                     style="@style/LinearLayout_horizontal"
-                    android:padding="5dp">
+                    android:padding="5dp"
+                    android:visibility="gone">
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/creater"
+                        android:text="@string/current_stage"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_recorder"
+                        android:id="@+id/bc_currentprocess"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
-
                 <LinearLayout
                     style="@style/LinearLayout_horizontal"
                     android:padding="5dp">
@@ -269,32 +272,34 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/last_followup_time"
+                        android:text="@string/creat_time"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_lastdate"
+                        android:id="@+id/bc_recorddate"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
                     style="@style/LinearLayout_horizontal"
-                    android:padding="5dp">
+                    android:padding="5dp"
+                    android:visibility="gone">
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/Follow_up_person"
+                        android:text="@string/creater"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_doman"
+                        android:id="@+id/bc_recorder"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
+
                 <LinearLayout
                     style="@style/LinearLayout_horizontal"
                     android:padding="5dp">
@@ -303,11 +308,11 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/Company_Name"
+                        android:text="@string/last_followup_time"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_custname"
+                        android:id="@+id/bc_lastdate"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
@@ -320,15 +325,16 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="@string/address"
+                        android:text="@string/Follow_up_person"
                         android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:id="@+id/bc_address"
+                        android:id="@+id/bc_doman"
                         style="@style/TextView_VerticalCenter"
                         android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
+
             </LinearLayout>
 
 
@@ -455,7 +461,8 @@
                 style="@style/crm_ll_card"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="20dp"
-                android:layout_marginTop="10dp">
+                android:layout_marginTop="10dp"
+                android:visibility="gone">
 
                 <LinearLayout style="@style/LinearLayout_horizontal">
 

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

@@ -576,6 +576,34 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/my_qr_code_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:layout_marginTop="7dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/icon_uu_setting"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="MY QR CODE"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <ImageView
+                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" />
+        </RelativeLayout>
+
     </LinearLayout>
 
 </ScrollView>

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

@@ -0,0 +1,327 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.test.MainActivity"
+    tools:ignore="MergeRootFrame"
+    android:padding="15dp"
+    android:layout_gravity="center"
+    android:background="#111"
+    >
+
+    <Button
+        android:id="@+id/button4"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button13"
+        android:layout_alignBottom="@+id/button13"
+        android:layout_toLeftOf="@+id/button2"
+        android:background="#a10b39"
+        android:padding="10dp"
+        android:text="="
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"/>
+
+    <Button
+        android:id="@+id/button9"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button10"
+        android:layout_alignBottom="@+id/button10"
+        android:layout_alignLeft="@+id/button6"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="7"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:layout_width="70dp"
+        android:layout_marginBottom="3dp"
+        />
+
+    <Button
+        android:id="@+id/button11"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button10"
+        android:layout_alignBottom="@+id/button10"
+        android:layout_toRightOf="@+id/button13"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="9"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:layout_width="70dp"
+        android:layout_marginBottom="3dp"
+        />
+
+    <Button
+        android:id="@+id/button10"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/button18"
+        android:layout_below="@+id/button17"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="8"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:layout_width="70dp"
+        android:layout_marginBottom="3dp"
+        />
+
+    <Button
+        android:id="@+id/button20"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/button14"
+        android:layout_alignParentRight="true"
+        android:background="#a10b39"
+        android:padding="10dp"
+        android:text="←"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp"/>
+
+    <Button
+        android:id="@+id/button19"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button20"
+        android:layout_alignBottom="@+id/button20"
+        android:layout_toLeftOf="@+id/button20"
+        android:background="#a10b39"
+        android:padding="10dp"
+        android:text="CE"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginBottom="3dp"
+        />
+
+    <Button
+        android:id="@+id/button18"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/button10"
+        android:layout_toLeftOf="@+id/button11"
+        android:background="#a10b39"
+        android:padding="10dp"
+        android:text="±"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginBottom="3dp"
+        />
+
+    <Button
+        android:id="@+id/button17"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/editText1"
+        android:layout_marginTop="5dp"
+        android:background="#a10b39"
+        android:padding="10dp"
+        android:text="√"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginBottom="3dp" />
+
+    <Button
+        android:id="@+id/button14"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/button18"
+        android:background="#d89218"
+        android:padding="10dp"
+        android:text="÷"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp" />
+
+    <Button
+        android:id="@+id/button7"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/button10"
+        android:layout_toRightOf="@+id/button6"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="5"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginRight="3dp"/>
+
+    <Button
+        android:id="@+id/button6"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button7"
+        android:layout_alignBottom="@+id/button7"
+        android:layout_alignParentLeft="true"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="4"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginBottom="3dp" />
+
+    <Button
+        android:id="@+id/button15"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button7"
+        android:layout_alignBottom="@+id/button7"
+        android:layout_alignParentRight="true"
+        android:background="#d89218"
+        android:padding="10dp"
+        android:text="×"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp" />
+
+    <Button
+        android:id="@+id/button8"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button7"
+        android:layout_alignBottom="@+id/button7"
+        android:layout_toRightOf="@+id/button10"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="6"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginRight="3dp" />
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/button7"
+        android:layout_toRightOf="@+id/button1"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="2"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginRight="3dp" />
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button3"
+        android:layout_alignBottom="@+id/button3"
+        android:layout_alignParentLeft="true"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="1"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginRight="3dp" />
+
+    <Button
+        android:id="@+id/button5"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button3"
+        android:layout_alignBottom="@+id/button3"
+        android:layout_toRightOf="@+id/button7"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="3"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginRight="3dp"/>
+
+    <Button
+        android:id="@+id/button16"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button5"
+        android:layout_alignBottom="@+id/button5"
+        android:layout_alignLeft="@+id/button15"
+        android:background="#d89218"
+        android:padding="10dp"
+        android:text="-"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginBottom="3dp" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button4"
+        android:layout_alignBottom="@+id/button4"
+        android:layout_alignParentRight="true"
+        android:background="#d89218"
+        android:padding="10dp"
+        android:text="+"
+        android:textColor="#fff"
+        android:textSize="28dp" />
+
+    <Button
+        android:id="@+id/button13"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/button3"
+        android:layout_toLeftOf="@+id/button4"
+        android:padding="10dp"
+        android:text="."
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp"
+        android:background="#d89218"  />
+
+    <Button
+        android:id="@+id/button12"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button13"
+        android:layout_alignBottom="@+id/button13"
+        android:layout_alignParentLeft="true"
+        android:background="#666"
+        android:padding="10dp"
+        android:text="0"
+        android:textColor="#fff"
+        android:textSize="28dp"
+        android:layout_marginRight="3dp" />
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/editText1"
+        android:layout_alignParentTop="true"
+        android:layout_alignRight="@+id/editText1"
+        android:background="#666"
+        android:text=" "
+        android:textColor="#fff"
+        android:textSize="15dp"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/editText1"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_alignLeft="@+id/button17"
+        android:layout_below="@+id/textView1"
+        android:background="#666"
+        android:ems="10"
+        android:singleLine="true"
+        android:textColor="#000"
+        android:textSize="28dp" />
+
+</RelativeLayout>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.10'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
     }