Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v1.0

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -927,6 +927,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 		Log.i("new_function_notice", new_function_notice + "");
 
 		platform = ApiUtils.getApiModel() instanceof ApiPlatform;
+		initPermission();
 	}
 
 	private void changeFragment(Fragment addFragment, String tag) {
@@ -997,7 +998,6 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 	@Override
 	protected void onResume() {
 		super.onResume();
-		initPermission();
 		LogUtil.d("onResume start:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 		if (!AppConfig.COMPANY) return;
 		isPause = false;

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

@@ -98,6 +98,12 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         mAdapter.setMaxSiz(9);
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_waitting));
         initView();
+        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+        for (String permission : permissions) {
+            if (PermissionUtil.lacksPermissions(ct, permission)) {
+                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+            }
+        }
     }
 
     private void initView() {
@@ -163,17 +169,17 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
             }
         });
     }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
-        for (String permission : permissions) {
-            if (PermissionUtil.lacksPermissions(ct, permission)) {
-                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
-            }
-        }
-    }
+//
+//    @Override
+//    protected void onResume() {
+//        super.onResume();
+//        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+//        for (String permission : permissions) {
+//            if (PermissionUtil.lacksPermissions(ct, permission)) {
+//                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+//            }
+//        }
+//    }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {

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

@@ -30,7 +30,7 @@ import com.core.widget.view.model.SelectAimModel;
 import com.core.utils.ToastUtil;
 import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.helper.PopupWindowHelper;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.net.http.http.OnHttpResultListener;
 
 import java.io.File;

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

@@ -26,7 +26,7 @@ import com.core.base.OABaseActivity;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.core.utils.helper.PopupWindowHelper;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.MyListView;
 import com.core.widget.view.model.SelectAimModel;

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

@@ -27,7 +27,7 @@ import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.core.widget.listener.EditChangeListener;
 import com.core.utils.ToastUtil;
-import com.core.utils.helper.PopupWindowHelper;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;

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

@@ -40,10 +40,10 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.modular.appmessages.activity.ProcessB2BActivity;
 import com.modular.appmessages.activity.ProcessMsgActivity;
 import com.modular.appmessages.activity.Subscription2Activity;
-import com.modular.appmessages.activity.UUSportActivity;
 import com.modular.appmessages.adapter.MessageAdapter;
 import com.modular.appmessages.presenter.MessagePresenter;
 import com.modular.appmessages.presenter.imp.IMessageView;
+import com.uas.appme.pedometer.view.UURanking;
 import com.uas.appme.settings.Constant.Constant;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskActivity;
@@ -98,6 +98,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 	private MessagePresenter.UnReaderListener unReaderListener;
 	private RelativeLayout uustep_rl;
 	private TextView uustepRedtv;
+	private View uustep_v;
 
 
 	@Override
@@ -216,6 +217,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 		dingyue_num = (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
 		tv_dingyue_desc = (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
 		uustepRedtv = (TextView) view.findViewById(R.id.uustep_red_tv);  //UU运动红点
+		uustep_v = view.findViewById(R.id.uustep_v);
 
 		if (PreferenceUtils.getBoolean(MyApplication.getInstance(),Constant.UU_STEP_RED))
 			uustepRedtv.setVisibility(View.GONE);
@@ -245,11 +247,14 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 			view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
 		}
 
-		if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1
-				&& !CommonUtil.isReleaseVersion())
+		if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1) {
 			uustep_rl.setVisibility(View.VISIBLE);
-		else
+			uustep_v.setVisibility(View.VISIBLE);
+		}
+		else {
 			uustep_rl.setVisibility(View.GONE);
+			uustep_v.setVisibility(View.GONE);
+		}
 		return view;
 	}
 
@@ -342,7 +347,8 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 //                startActivityForResult(intent, REQUESTCODE);
 //                break;
 			case R.id.uustep_rl:
-				startActivity(new Intent(mContext, UUSportActivity.class));
+//				startActivity(new Intent(mContext, UUSportActivity.class));
+				startActivity(new Intent(mContext, UURanking.class));
 				uustepRedtv.setVisibility(View.GONE);
 				PreferenceUtils.putBoolean(Constant.UU_STEP_RED, true);
 				break;

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

@@ -392,12 +392,13 @@
 
     </RelativeLayout>
 
+
     <View
+        android:id="@+id/uustep_v"
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
         android:background="@color/item_line"
-        android:visibility="visible"/>
-
+        android:layout_alignParentTop="true"/>
     <RelativeLayout
         android:id="@+id/uustep_rl"
         android:layout_width="match_parent"

app_core/common/src/main/java/com/core/utils/helper/PopupWindowHelper.java

@@ -1,154 +0,0 @@
-package com.core.utils.helper;
-
-import android.app.Activity;
-import android.text.Editable;
-import android.text.Selection;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-
-import com.common.data.StringUtil;
-import com.common.system.DisplayUtil;
-import com.core.app.MyApplication;
-import com.core.app.R;
-import com.core.widget.view.model.SelectAimModel;
-
-/**
- * Created by Bitliker on 2017/5/3.
- */
-
-public class PopupWindowHelper {
-
-
-    public static void showAlart(final Activity ct, String title, String message, final OnSelectListener listener) {
-        final PopupWindow window = new PopupWindow(ct);
-        View view = LayoutInflater.from(ct).inflate(R.layout.item_select_alert_pop, null);
-        window.setContentView(view);
-        window.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.pop_round_bg));
-        DisplayUtil.backgroundAlpha(ct, 0.4f);
-        window.setTouchable(true);
-        setPopupWindowHW(ct, window);
-        window.setOutsideTouchable(false);
-        window.setFocusable(true);
-        TextView title_tv = (TextView) view.findViewById(R.id.title_tv);
-        TextView message_tv = (TextView) view.findViewById(R.id.message_tv);
-        title_tv.setText(StringUtil.isEmpty(title) ? ct.getString(R.string.common_dialog_title) : title);
-        message_tv.setText(StringUtil.isEmpty(message) ? "" : message);
-        window.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                DisplayUtil.backgroundAlpha(ct, 1f);
-            }
-        });
-        view.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null)
-                    listener.select(false);
-                window.dismiss();
-            }
-        });
-        view.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null)
-                    listener.select(true);
-                window.dismiss();
-            }
-        });
-        window.showAtLocation(view, Gravity.CENTER, 0, 0);
-    }
-
-    /*选择地址后回调修改窗口*/
-    public static void create(Activity ct, String title, SelectAimModel model, OnClickListener onClickListener) {
-        PopupWindow window = new PopupWindow(ct);
-        View view = LayoutInflater.from(ct).inflate(R.layout.item_select_aim_pop, null);
-        window.setContentView(view);
-        setPopupWindowHW(ct, window);
-        window.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.pop_round_bg));
-        DisplayUtil.backgroundAlpha(ct, 0.4f);
-        viewEvent(ct, window, view, title, model, onClickListener);
-        window.setTouchable(true);
-        window.setOutsideTouchable(false);
-        window.setFocusable(true);
-        window.showAtLocation(view, Gravity.CENTER, 0, 0);
-    }
-
-    private static void viewEvent(final Activity ct, final PopupWindow window, View view, String title, final SelectAimModel model, final OnClickListener onClickListener) {
-        TextView title_tv = (TextView) view.findViewById(R.id.title_tv);
-        final EditText company_et = (EditText) view.findViewById(R.id.company_et);
-        TextView address_tv = (TextView) view.findViewById(R.id.address_tv);
-        title = StringUtil.isEmpty(title) ? ct.getString(R.string.perfect_company_name) : title;
-        String company = (model == null || StringUtil.isEmpty(model.getName())) ? "" : model.getName();
-        String address = (model == null || StringUtil.isEmpty(model.getAddress())) ? "" : model.getAddress();
-        title_tv.setText(title);
-        company_et.setText(company);
-        Editable etext = company_et.getText();
-        Selection.setSelection(etext, etext.length());
-        address_tv.setText(MyApplication.getInstance().getString(R.string.detailed_address) + "  " + address);
-        window.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                DisplayUtil.backgroundAlpha(ct, 1f);
-            }
-        });
-        view.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                setBack(null, model, onClickListener);
-                window.dismiss();
-            }
-        });
-        view.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String company = company_et.getText().toString();
-                setBack(company, model, onClickListener);
-                window.dismiss();
-            }
-        });
-
-    }
-
-    private static void setBack(String company, SelectAimModel model, OnClickListener onClickListener) {
-        if (model == null) {
-            model = new SelectAimModel();
-            model.setAddress("");
-        }
-        if (!StringUtil.isEmpty(company))
-            model.setName(company);
-        if (onClickListener != null)
-            onClickListener.result(model);
-    }
-
-    private static int getWidth(Activity ct) {
-        DisplayMetrics dm = new DisplayMetrics();
-        ct.getWindowManager().getDefaultDisplay().getMetrics(dm);
-        return (int) (dm.widthPixels * (0.8));
-    }
-
-    public static void setPopupWindowHW(PopupWindow window) {
-        window.getContentView().measure(0, 0);
-        window.setHeight(window.getContentView().getMeasuredHeight() + 30);
-        window.setWidth(window.getContentView().getMeasuredWidth()+ DisplayUtil.dip2px(MyApplication.getInstance(),10f));
-    }
-
-    public static void setPopupWindowHW(Activity ct, PopupWindow window) {
-        window.getContentView().measure(0, 0);
-        window.setHeight(window.getContentView().getMeasuredHeight() + 30);
-        window.setWidth(getWidth(ct));
-    }
-
-
-    public interface OnClickListener {
-        void result(SelectAimModel model);
-    }
-
-    public interface OnSelectListener {
-        void select(boolean selectOk);
-    }
-}

app_core/common/src/main/res/layout/item_select_aim_pop.xml

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingTop="10dp"
-    android:background="@drawable/pop_round_bg">
-
-    <TextView
-        android:id="@+id/title_tv"
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:gravity="center"
-        android:text="@string/perfect_company_name"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <EditText
-            android:id="@+id/company_et"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@string/company_name"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/address_tv"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginTop="5dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_hine" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_marginTop="10dp"
-        android:background="@color/item_line" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:orientation="horizontal"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main">
-
-        <TextView
-            android:id="@+id/goto_tv"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/skip_operation"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <View
-            android:layout_width="2px"
-            android:layout_height="match_parent"
-            android:background="@color/item_line" />
-
-        <TextView
-            android:id="@+id/sure_tv"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/common_sure"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-    </LinearLayout>
-</LinearLayout>

app_core/common/src/main/res/layout/item_select_alert_pop.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingTop="10dp">
-
-    <TextView
-        android:id="@+id/title_tv"
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:gravity="center"
-        android:text="@string/common_dialog_title"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
-
-    <TextView
-        android:id="@+id/message_tv"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginTop="5dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_main" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_marginTop="10dp"
-        android:background="@color/item_line" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:orientation="horizontal"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main">
-
-        <TextView
-            android:id="@+id/goto_tv"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/common_cancel"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <View
-            android:layout_width="2px"
-            android:layout_height="match_parent"
-            android:background="@color/item_line" />
-
-        <TextView
-            android:id="@+id/sure_tv"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/common_sure"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-    </LinearLayout>
-</LinearLayout>

app_core/common/src/main/res/layout/new_message_header.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ebe9e9"
+    android:background="@color/Transpant"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -89,9 +89,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/transparent" />
+        android:background="@color/item_line" />
 
     <RelativeLayout
         android:id="@+id/waitting_work_rl"
@@ -175,13 +173,16 @@
 
     </RelativeLayout>
 
+    <!-- <View
+         android:layout_width="match_parent"
+         android:layout_height="@dimen/line"
+         android:layout_marginLeft="10dp"
+         android:layout_marginRight="10dp"
+         android:background="@color/transparent" />-->
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/transparent" />
-
+        android:background="@color/item_line" />
     <RelativeLayout
         android:id="@+id/subscribe_rl"
         android:layout_width="match_parent"
@@ -285,9 +286,8 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/transparent" />
+        android:background="@color/item_line" />
+
 
     <RelativeLayout
         android:id="@+id/booking_rl"
@@ -322,10 +322,9 @@
                 android:layout_gravity="top|right"
                 android:background="@drawable/tab_unread_bg"
                 android:gravity="center"
-                android:visibility="gone"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
-                />
+                android:visibility="gone" />
         </FrameLayout>
 
         <RelativeLayout
@@ -393,12 +392,12 @@
 
     </RelativeLayout>
 
-
     <View
+        android:id="@+id/uustep_v"
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
         android:background="@color/item_line"
-        android:visibility="visible"/>
+        android:layout_alignParentTop="true"/>
 
     <RelativeLayout
         android:id="@+id/uustep_rl"
@@ -467,6 +466,7 @@
                 android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
+
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp" />
 

app_core/common/src/main/res/menu/menu_list.xml

@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/push"
-        android:title="@string/daily_record"
+        android:title="@string/more"
         android:icon="@drawable/xlist"
         app:showAsAction="ifRoom" />
 

app_modular/appme/src/main/java/com/uas/appme/pedometer/adapter/UURankingAdapter.java

@@ -68,6 +68,11 @@ public class UURankingAdapter extends BaseAdapter{
         }
         viewHolder.ranking_tv.setText(model.getToalrank().get(position).getRank()+"");
         viewHolder.name_tv.setText(model.getToalrank().get(position).getAs_username());
+
+        if (position<10)
+            viewHolder.steps_tv.setTextColor(mContext.getResources().getColor(R.color.approvaling));
+        else
+            viewHolder.steps_tv.setTextColor(mContext.getResources().getColor(R.color.green));
         viewHolder.steps_tv.setText(model.getToalrank().get(position).getAs_uusteps());
         viewHolder.prise_tv.setText(model.getToalrank().get(position).getAs_prise());
 //        viewHolder.photo_img.setImageResource(CommonUtil.getNumByString(model.getToalrank().get(position).getAs_userid()));

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/PersonalPageActivity.java

@@ -16,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
@@ -118,6 +119,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         initData();
     }
 
+    private int appStepsPost = 0;
     private void initData() {
         if (!CommonUtil.isNetWorkConnected(this)) {
             ToastMessage(getString(R.string.common_notlinknet));
@@ -126,19 +128,24 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         if (StringUtil.isEmpty(userid)) return;
         progressDialog.show();
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        httpClient.getHeaders().remove("Content-Type");
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appSteps")
                 .add("userid", userid)
                 .add("token", MyApplication.getInstance().mAccessToken)
-                .method(Method.GET)
+                .method(Method.POST)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appSteps", o.toString());
                 if (o.toString().contains("com.mysql.jdbc.exceptions.jdbc4") || (o.toString().contains("resultCode") && o.toString().contains("resultMsg"))){
-                    progressDialog.dismiss();
-                    ToastMessage("数据获取异常，请稍后再试");
+                    appStepsPost++;
+
+                    if (appStepsPost < 3)
+                        initData();
+                    else
+                        ToastMessage("网络慢，请稍后再试");
                     return;
                 }else {
                     try {
@@ -151,25 +158,6 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
                 }
             }
         }));
-
-        //获取点赞信息
-        httpClient.Api().send(new HttpClient.Builder()
-                .url("appPriseList")
-                .add("userid",userid)
-                .add("token",MyApplication.getInstance().mAccessToken)
-                .method(Method.GET)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
-            @Override
-            public void onResponse(Object o) {
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
-                LogUtil.prinlnLongMsg("appPriseList", o.toString()+"");
-                try {
-
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-        }));
     }
 
 
@@ -219,6 +207,26 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         String now_time = TimeUtil.getWeekStr(TimeUtil.getCurrentDate());
         mMovementTotalKmTimeTv.setText(now_time);
         mMovementTotalStepsTimeTv.setText(now_time);
+
+        //获取点赞信息
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("appPriseList")
+                .add("userid",userid)
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appPriseList", o.toString()+"");
+                try {
+
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }));
     }
 
     private void doAttendHandle(int attention_type) {
@@ -244,7 +252,8 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_step, menu);
+        if (type != 3)
+            getMenuInflater().inflate(R.menu.menu_step, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -267,7 +276,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         View viewContext = LayoutInflater.from(ct).inflate(R.layout.step_person_page_setting, null);
         if (type == 1){  //自己
             viewContext.findViewById(R.id.share_friend_tv).setVisibility(View.VISIBLE);
-            viewContext.findViewById(R.id.share_monments_tv).setVisibility(View.VISIBLE);
+//            viewContext.findViewById(R.id.share_monments_tv).setVisibility(View.VISIBLE);
         }else if (type == 2){ //关注的人
             viewContext.findViewById(R.id.cancel_attention_tv).setVisibility(View.VISIBLE);
         }else if (type == 3){  //普通好友
@@ -320,6 +329,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
             intent.putExtra("type", 1);
             intent.putExtra("title", "分享好友");
             startActivityForResult(intent, 0x01);
+            Toast.makeText(ct,"只能分享给UU好友",Toast.LENGTH_LONG).show();
 //            ToastMessage("share_friend_tv");
             closePopupWindow();
         }else if (v.getId() == R.id.share_monments_tv){
@@ -339,6 +349,10 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         super.onActivityResult(requestCode, resultCode, data);
         if (data == null) return;
         if (requestCode == 0x01){
+            if (data == null){
+                ToastMessage("只能分享给UU好友");
+                return;
+            }
             ContactsModel model = data.getParcelableExtra("data");
             String ownerId = MyApplication.getInstance().mLoginUser.getUserId();
             String ownerName = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -1,16 +1,20 @@
 package com.uas.appme.pedometer.view;
 
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.support.v4.content.LocalBroadcastManager;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
@@ -23,10 +27,13 @@ import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.MyListView;
+import com.core.xmpp.CoreService;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appcontact.model.contacts.ContactsModel;
+import com.uas.appcontact.ui.activity.ContactsActivity;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.adapter.UUAttentionAdapter;
 import com.uas.appme.pedometer.adapter.UURankingAdapter;
@@ -57,7 +64,6 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
     private LinearLayout mAttentionLl;
     private MyListView mAttentionPtlv;
     private MyListView mAllPtlv;
-    private TextView mInviteFriendsTv;
     private String curSelDate;
     private String myem_name;
     private List<StepEntity> stepEntityList;
@@ -78,6 +84,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
     private TextView first_ranking_tv;
     private String first_ranking_imid = null;  //第一名imid
     private String first_ranking_name = null; //第一名名字
+    private String shareStepStr = "我正在使用UU运动计步功能，你也一起来吧";
+    private CoreService mService;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,12 +93,17 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         setContentView(R.layout.uu_ranking_activity);
         StepUtils.doSaveLocalStepsToJudgeHttps();
         LocalBroadcastManager.getInstance(this).registerReceiver(updateReceiver, new IntentFilter(AppConstant.UPDATE_STEPRANKING_PRISE));
+        bindService(CoreService.getIntent(), mConnection, BIND_AUTO_CREATE);
         initView();
         initData();
         initEvents();
     }
 
-
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unbindService(mConnection);
+    }
     private void initView() {
         mHeaderImg = (ImageView) findViewById(R.id.header_background_im);
         mPhotoImg = (CircleImageView) findViewById(R.id.photo_img);
@@ -102,7 +115,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         mAttentionLl = (LinearLayout) findViewById(R.id.attention_ll);
         mAttentionPtlv = (MyListView) findViewById(R.id.attention_ptlv);
         mAllPtlv = (MyListView) findViewById(R.id.all_ptlv);
-        mInviteFriendsTv = (TextView) findViewById(R.id.invite_friends_tv);
+        findViewById(R.id.invite_friends_tv).setOnClickListener(this);
         curSelDate = TimeUtil.getCurrentDate();
         stepEntityList = new ArrayList<>();
         mRankAdapter = new UURankingAdapter(this);
@@ -146,7 +159,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                 .url("appStepsrank")
                 .add("userid",MyApplication.getInstance().mLoginUser.getUserId())
                 .add("token",MyApplication.getInstance().mAccessToken)
-                .method(Method.GET)
+
+                .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
@@ -167,7 +181,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                     mAttenAdapter.setModel(mStepsRankingBean);
                     mAttentionPtlv.setAdapter(mAttenAdapter);
                     mAttenAdapter.notifyDataSetChanged();
-//                    if (mStepsRankingBean.getAttrank().size()>1)
+                    if (mStepsRankingBean.getAttrank().size()>0)
                         mAttentionLl.setVisibility(View.VISIBLE);
                     showMyInfo();
                     LogUtil.prinlnLongMsg("mStepsRankingBean", JSON.toJSONString(mStepsRankingBean)+"");
@@ -287,6 +301,12 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
     public void onClick(View v) {
         if (v.getId() == R.id.my_info_rl){
             inTentToPersonal(1,0);
+        }else if (v.getId() == R.id.invite_friends_tv){
+            Intent intent = new Intent(this, ContactsActivity.class);
+            intent.putExtra("type", 1);
+            intent.putExtra("title", "分享好友");
+            startActivityForResult(intent, 0x03);
+            Toast.makeText(ct,"只能分享给UU好友",Toast.LENGTH_LONG).show();
         }
     }
 
@@ -296,6 +316,17 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
 
         if (requestCode == 0x01 && resultCode == 0x02){
             initData();
+        }else if (requestCode == 0x03 ){
+            if (data == null){
+                ToastMessage("只能分享给UU好友");
+                return;
+            }
+            ContactsModel model = data.getParcelableExtra("data");
+            String ownerId = MyApplication.getInstance().mLoginUser.getUserId();
+            String ownerName = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
+            String objectId = model.getImid();
+            StepUtils.sendMessage(mService,ownerId,ownerName,objectId,shareStepStr);
+            LogUtil.d("0x01",JSON.toJSONString(model));
         }
     }
 
@@ -314,4 +345,16 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         progressDialog.dismiss();
     }
 
+    private ServiceConnection mConnection = new ServiceConnection() {
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = ((CoreService.CoreServiceBinder) service).getService();
+
+        }
+    };
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetCompanyRestActivity.java

@@ -1,7 +1,10 @@
 package com.uas.appme.settings.activity;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -23,7 +26,7 @@ import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.MyListView;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
-import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.utils.TimeUtil;
@@ -78,6 +81,10 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
         model.setSc_date("");
         mList.add(model);
         myAdapter.notifyDataSetChanged();
+
+        //接收商家类型
+          sc_industry = getIntent().getStringExtra("sc_industry");
+         sc_industrycode = getIntent().getStringExtra("sc_industrycode");
     }
 
     @Override
@@ -99,21 +106,30 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
 
     private void doSave(List<CompanyRestBean> mList) {
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appBatchCrest")
                 .add("map",JSON.toJSONString(mList))
                 .add("token",MyApplication.getInstance().mAccessToken)
+                .connectTimeout(10000)
                 .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
             @Override
             public void onResponse(Object o) {
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appBatchMrest", o.toString()+"");
                 if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
                     Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                    progressDialog.dismiss();
                     finish();
                 }
             }
+
+            @Override
+            public void onFailure(Object t) {
+                progressDialog.dismiss();
+                ToastMessage(getString(R.string.too_long_to_http));
+            }
         }));
 
     }
@@ -202,6 +218,25 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
         });
         picker.show();
     }
+
+    private String sc_industry;
+    private String sc_industrycode;
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.bsetting_more, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.booking_set_list){
+            startActivity(new Intent(ct,BSetComRestListActivity.class)
+                    .putExtra("sc_industry",sc_industry)
+                    .putExtra("sc_industrycode",sc_industrycode)
+                    .putExtra("type","company"));
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }
 
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetEmployeeRestActivity.java

@@ -7,6 +7,8 @@ import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -34,6 +36,7 @@ import com.core.widget.MyListView;
 import com.core.widget.view.Activity.SelectActivity;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
@@ -91,7 +94,24 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             }
         }));
     }
+    private String sc_industry;
+    private String sc_industrycode;
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.bsetting_more, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.booking_set_list){
+            startActivity(new Intent(ct,BSetComRestListActivity.class)
+                    .putExtra("sc_industry",sc_industry)
+                    .putExtra("sc_industrycode",sc_industrycode)
+                    .putExtra("type","eomployee"));
+        }
+        return super.onOptionsItemSelected(item);
+    }
     private void handleServerMan(PersonSetingBean mServicePersonList) {
         if (mServicePersonList == null || ListUtils.isEmpty(mServicePersonList.getResult())) return;
         for (int i=0; i<mServicePersonList.getResult().size();i++)
@@ -122,6 +142,11 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         model.setSf_date("");
         mList.add(model);
         myAdapter.notifyDataSetChanged();
+
+        //接收商家类型
+        sc_industry = getIntent().getStringExtra("sc_industry");
+        sc_industrycode = getIntent().getStringExtra("sc_industrycode");
+
     }
 
     @Override
@@ -144,21 +169,30 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
 
     private void doSave(List<ComRestBean> mList) {
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appBatchMrest")
                 .add("map",JSON.toJSONString(mList))
                 .add("token",MyApplication.getInstance().mAccessToken)
+                .connectTimeout(10000)
                 .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
             @Override
             public void onResponse(Object o) {
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appBatchMrest", o.toString()+"");
                 if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
                     Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                    progressDialog.dismiss();
                     finish();
                 }
             }
+
+            @Override
+            public void onFailure(Object t) {
+                progressDialog.dismiss();
+                ToastMessage(getString(R.string.too_long_to_http));
+            }
         }));
 
     }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSetComRestListActivity.java

@@ -3,8 +3,6 @@ package com.uas.appme.settings.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -19,6 +17,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.me.network.app.http.HttpClient;
@@ -138,6 +137,10 @@ public class BSetComRestListActivity extends BaseActivity {
 				break;
 
 		}
+		if (!CommonUtil.isNetWorkConnected(ct)){
+			ToastMessage(getString(R.string.common_notlinknet));
+			return;
+		}
 		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
 		httpClient.Api().send(new HttpClient.Builder()
 				.url(url)
@@ -181,36 +184,36 @@ public class BSetComRestListActivity extends BaseActivity {
 		}));
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.add_new, menu);
-		return super.onCreateOptionsMenu(menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == R.id.add) {
-			switch (type) {
-				case "eomployee":
-					startActivity(new Intent(this, BComSetEmployeeRestActivity.class)
-							.putExtra("sc_industry", sc_industry)
-							.putExtra("sc_industrycode", sc_industrycode));
-					break;
-				case "company":
-					startActivity(new Intent(this, BComSetCompanyRestActivity.class)
-							.putExtra("sc_industry", sc_industry)
-							.putExtra("sc_industrycode", sc_industrycode));
-					break;
-				case "place":
-					startActivity(new Intent(this, BSettingLocationActivity.class)
-							.putExtra("sc_industry", sc_industry)
-							.putExtra("sc_industrycode", sc_industrycode));
-					break;
-
-			}
-		}
-		return super.onOptionsItemSelected(item);
-	}
+//	@Override
+//	public boolean onCreateOptionsMenu(Menu menu) {
+//		getMenuInflater().inflate(R.menu.add_new, menu);
+//		return super.onCreateOptionsMenu(menu);
+//	}
+//
+//	@Override
+//	public boolean onOptionsItemSelected(MenuItem item) {
+//		if (item.getItemId() == R.id.add) {
+//			switch (type) {
+//				case "eomployee":
+//					startActivity(new Intent(this, BComSetEmployeeRestActivity.class)
+//							.putExtra("sc_industry", sc_industry)
+//							.putExtra("sc_industrycode", sc_industrycode));
+//					break;
+//				case "company":
+//					startActivity(new Intent(this, BComSetCompanyRestActivity.class)
+//							.putExtra("sc_industry", sc_industry)
+//							.putExtra("sc_industrycode", sc_industrycode));
+//					break;
+//				case "place":
+//					startActivity(new Intent(this, BSettingLocationActivity.class)
+//							.putExtra("sc_industry", sc_industry)
+//							.putExtra("sc_industrycode", sc_industrycode));
+//					break;
+//
+//			}
+//		}
+//		return super.onOptionsItemSelected(item);
+//	}
 
 	private class PlaceSettingAdapter extends BaseAdapter {
 		private Context mContext;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -69,24 +69,21 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         }else if (v.getId() == R.id.keshi_setting_rl){
             
         }else if (v.getId() == R.id.people_setting_rl){
-            startActivity(new Intent(this,PersonSettingListActivity.class)
+            startActivity(new Intent(this,PersonSettingActivity.class)
             .putExtra("sc_industry",sc_industry)
             .putExtra("sc_industrycode",sc_industrycode));
         }else if (v.getId() == R.id.employeerest_rl){
-            startActivity(new Intent(ct,BSetComRestListActivity.class)
+            startActivity(new Intent(ct,BComSetEmployeeRestActivity.class)
                     .putExtra("sc_industry",sc_industry)
-                    .putExtra("sc_industrycode",sc_industrycode)
-                    .putExtra("type","eomployee"));
+                    .putExtra("sc_industrycode",sc_industrycode));
         }else if (v.getId() == R.id.companyrest_rl){
-            startActivity(new Intent(ct,BSetComRestListActivity.class)
+            startActivity(new Intent(ct,BComSetCompanyRestActivity.class)
                     .putExtra("sc_industry",sc_industry)
-                    .putExtra("sc_industrycode",sc_industrycode)
-                    .putExtra("type","company"));
+                    .putExtra("sc_industrycode",sc_industrycode));
         }else if (v.getId() == R.id.batchplace_rl){
-            startActivity(new Intent(ct,BSetComRestListActivity.class)
+            startActivity(new Intent(ct,BSettingLocationActivity.class)
                     .putExtra("sc_industry",sc_industry)
-                    .putExtra("sc_industrycode",sc_industrycode)
-                    .putExtra("type","place"));
+                    .putExtra("sc_industrycode",sc_industrycode));
         }
     }
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -2,10 +2,13 @@ package com.uas.appme.settings.activity;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -30,7 +33,6 @@ import com.core.widget.MyListView;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.Result2Listener;
-import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.settings.Constant.Constant;
@@ -56,6 +58,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     private Button save_bt;
     private RelativeLayout add_new_rl;
     private String st_id;
+    private String updateData;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -84,7 +87,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         //接收商家类型
         sc_industry = getIntent().getStringExtra("sc_industry");
         sc_industrycode = getIntent().getStringExtra("sc_industrycode");
-        String updateData = getIntent().getStringExtra("updateData");
+        updateData = getIntent().getStringExtra("updateData");
         if (!StringUtil.isEmpty(updateData) &&  JSONUtil.validate(updateData) ){  // 更新状态则不显示 + 新增按钮，且保存改为更新
             update = true;
             save_bt.setText(getString(R.string.common_update_button));
@@ -109,7 +112,32 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             myAdapter.notifyDataSetChanged();
         }
     }
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        menu.clear();
+        if (!StringUtil.isEmpty(updateData)) {
+
+        } else {
+            getMenuInflater().inflate(R.menu.bsetting_more, menu);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.bsetting_more, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.booking_set_list){
+            startActivity(new Intent(ct,BSetComRestListActivity.class)
+                    .putExtra("sc_industry",sc_industry)
+                    .putExtra("sc_industrycode",sc_industrycode)
+                    .putExtra("type","place"));
+        }
+        return super.onOptionsItemSelected(item);
+    }
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
@@ -192,8 +220,9 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                         .url("user/appBatchPlace")
                         .add("map",JSON.toJSONString(mList))
                         .add("token",MyApplication.getInstance().mAccessToken)
+                        .connectTimeout(10000)
                         .method(Method.POST)
-                        .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                        .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
                     @Override
                     public void onResponse(Object o) {
                         if (!JSONUtil.validate(o.toString()) || o == null) return;
@@ -204,6 +233,11 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                         }
                         progressDialog.dismiss();save_bt.setEnabled(true);
                     }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        progressDialog.dismiss();save_bt.setEnabled(true);
+                    }
                 }));
             }
         }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/ImageSettingActivity.java

@@ -84,7 +84,12 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
         if (v.getId() == R.id.image_tv){
             showSelectPictureDialog();
         }else if (v.getId() == R.id.btn_save){
-            doSaveImage();
+            if (!CommonUtil.isNetWorkConnected(ct)){
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }else {
+                doSaveImage();
+            }
         }
 
     }
@@ -207,7 +212,14 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
-                            takePhoto();
+                            try {
+                                takePhoto();
+                            } catch (Exception e) {
+                                String message=e.getMessage();
+                                if (!StringUtil.isEmpty(message)&&message.contains("Permission")){
+                                    ToastUtil.showToast(ct,R.string.not_system_permission);
+                                }
+                            }
                         } else {
                             selectPhoto();
                         }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -4,6 +4,8 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.RelativeLayout;
@@ -55,6 +57,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     private RelativeLayout mDepartmentRl;
     private TextView user_department_tv;
     private List<String> departmentModel_list;
+    private String result;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -88,11 +91,16 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         mBtnSave.setOnClickListener(this);
 
+        //接收商家类型
+        sc_industry = getIntent().getStringExtra("sc_industry");
+        sc_industrycode = getIntent().getStringExtra("sc_industrycode");
+
+
     }
     private void initData() {
 
         //更新时的数据获取
-        String result = getIntent().getStringExtra("mdoel");
+        result = getIntent().getStringExtra("mdoel");
         int position = getIntent().getIntExtra("position",-1);
         if (!StringUtil.isEmpty(result) && position != -1)
             showUpdatedata(result,position);
@@ -143,6 +151,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             mUserSexTv.setText("1".equals(model.getResult().get(position).getSm_sex()) ? getString(R.string.user_body) : getString(R.string.user_girl));
             sm_id = model.getResult().get(position).getSm_id();
             mBtnSave.setText(getString(R.string.common_update_button));
+            getSupportActionBar().setTitle(getString(R.string.common_update_button));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -283,4 +292,33 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     }
                 }).setCancelable(true).create().show();
     }
+    private String sc_industry;
+    private String sc_industrycode;
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        menu.clear();
+        if (!StringUtil.isEmpty(result)) {
+
+        } else {
+            getMenuInflater().inflate(R.menu.bsetting_more, menu);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.bsetting_more, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.booking_set_list){
+            startActivity(new Intent(this,PersonSettingListActivity.class)
+                    .putExtra("sc_industry",sc_industry)
+                    .putExtra("sc_industrycode",sc_industrycode));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingListActivity.java

@@ -2,8 +2,6 @@ package com.uas.appme.settings.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 
@@ -13,6 +11,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.me.network.app.http.HttpClient;
@@ -67,7 +66,10 @@ public class PersonSettingListActivity extends BaseActivity {
         //接收商家类型
         sc_industry = getIntent().getStringExtra("sc_industry");
         sc_industrycode = getIntent().getStringExtra("sc_industrycode");
-
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            return;
+        }
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
@@ -108,22 +110,6 @@ public class PersonSettingListActivity extends BaseActivity {
         });
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.add_new, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.add){
-            startActivity(new Intent(this,PersonSettingActivity.class)
-                    .putExtra("sc_industry",sc_industry)
-                    .putExtra("sc_industrycode",sc_industrycode));
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -283,8 +283,10 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                     if (o.toString().contains("result")) {
                         if ("1".equals(JSON.parseObject(o.toString()).getString("result")) && !CommonUtil.isReleaseVersion())
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        else
+                        else if (!CommonUtil.isReleaseVersion())
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
+                        else if (CommonUtil.isReleaseVersion())
+                            businessmen_setting_rl.setVisibility(View.GONE);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

app_modular/appme/src/main/res/layout/activity_brest.xml

@@ -15,7 +15,10 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/contentRV"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:layout_marginLeft="25dp"
+            android:layout_marginRight="25dp"
+            android:layout_marginTop="25dp"/>
 
         <Button
             android:id="@+id/saveBtn"

app_modular/appme/src/main/res/layout/uu_ranking_activity.xml

@@ -146,7 +146,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/item_line"
-                android:dividerHeight="2px"
+                android:dividerHeight="1px"
                 android:scrollbars="none" />
             <View
                 android:layout_width="match_parent"
@@ -159,9 +159,10 @@
               <com.core.widget.MyListView
                   android:id="@+id/all_ptlv"
                   android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
+                  android:layout_height="match_parent"
                   android:background="@color/item_line"
-                  android:dividerHeight="2px"
+                  android:dividerHeight="1px"
+                  android:scrollbars="none"
                   />
               <View
                   android:layout_width="match_parent"

app_modular/appme/src/main/res/menu/bsetting_more.xml

@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+
+    <item
+        android:id="@+id/booking_set_list"
+        android:title="@string/more"
+        android:icon="@drawable/xlist"
+        app:showAsAction="ifRoom" />
+
+</menu>

app_modular/appmessages/src/main/res/layout/item_dayrank.xml

@@ -84,7 +84,7 @@
             <View
                 android:id="@+id/line"
                 android:layout_width="match_parent"
-                android:layout_height="2px"
+                android:layout_height="1px"
                 android:layout_below="@id/rank_tv_str"
                 android:background="@color/item_line"
                 android:layout_marginTop="20dp"

app_modular/apputils/src/main/java/com/modular/apputils/utils/PopupWindowHelper.java

@@ -0,0 +1,182 @@
+package com.modular.apputils.utils;
+
+import android.app.Activity;
+import android.text.Editable;
+import android.text.Selection;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
+import com.core.app.MyApplication;
+import com.core.widget.view.model.SelectAimModel;
+import com.modular.apputils.R;
+
+/**
+ * Created by Bitliker on 2017/5/3.
+ */
+
+public class PopupWindowHelper {
+
+	public static void showAlart(final Activity ct, String title, String message, final OnSelectListener listener) {
+		final PopupWindow window = new PopupWindow(ct);
+		View view = LayoutInflater.from(ct).inflate(R.layout.item_select_alert_pop, null);
+		window.setContentView(view);
+		window.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.pop_round_bg));
+		DisplayUtil.backgroundAlpha(ct, 0.4f);
+		window.setTouchable(true);
+		setPopupWindowHW(ct, window);
+		window.setOutsideTouchable(false);
+		window.setFocusable(true);
+		TextView title_tv = (TextView) view.findViewById(R.id.title_tv);
+		TextView message_tv = (TextView) view.findViewById(R.id.message_tv);
+		title_tv.setText(StringUtil.isEmpty(title) ? ct.getString(R.string.common_dialog_title) : title);
+		message_tv.setText(StringUtil.isEmpty(message) ? "" : message);
+		window.setOnDismissListener(new PopupWindow.OnDismissListener() {
+			@Override
+			public void onDismiss() {
+				DisplayUtil.backgroundAlpha(ct, 1f);
+			}
+		});
+		view.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (listener != null)
+					listener.select(false);
+				window.dismiss();
+			}
+		});
+		view.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (listener != null)
+					listener.select(true);
+				window.dismiss();
+			}
+		});
+		window.showAtLocation(view, Gravity.CENTER, 0, 0);
+	}
+
+	/*选择地址后回调修改窗口*/
+	public static void create(Activity ct, String title, SelectAimModel model, OnClickListener onClickListener) {
+		create(ct, title, model, onClickListener, null);
+	}
+
+	public static PopupWindow create(Activity ct, String title, SelectAimModel model, OnClickListener onClickListener, OnFindLikerListener onFindLikerListener) {
+		PopupWindow window = new PopupWindow(ct);
+		View view = LayoutInflater.from(ct).inflate(R.layout.item_select_aim_pop, null);
+		window.setContentView(view);
+		setPopupWindowHW(ct, window);
+		window.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.pop_round_bg));
+		DisplayUtil.backgroundAlpha(ct, 0.4f);
+		viewEvent(ct, window, view, title, model, onClickListener, onFindLikerListener);
+		window.setTouchable(true);
+		window.setOutsideTouchable(false);
+		window.setFocusable(true);
+		window.showAtLocation(view, Gravity.CENTER, 0, 0);
+		return window;
+	}
+
+	private static void viewEvent(final Activity ct,
+	                              final PopupWindow window,
+	                              View view,
+	                              String title,
+	                              final SelectAimModel model,
+	                              final OnClickListener onClickListener,
+	                              final OnFindLikerListener onFindLikerListener
+	) {
+		TextView title_tv = (TextView) view.findViewById(R.id.title_tv);
+		final EditText company_et = (EditText) view.findViewById(R.id.company_et);
+		TextView address_tv = (TextView) view.findViewById(R.id.address_tv);
+		title = StringUtil.isEmpty(title) ? ct.getString(R.string.perfect_company_name) : title;
+		String company = (model == null || StringUtil.isEmpty(model.getName())) ? "" : model.getName();
+		String address = (model == null || StringUtil.isEmpty(model.getAddress())) ? "" : model.getAddress();
+		title_tv.setText(title);
+		company_et.setText(company);
+		Editable etext = company_et.getText();
+		Selection.setSelection(etext, etext.length());
+		address_tv.setText(MyApplication.getInstance().getString(R.string.detailed_address) + "  " + address);
+		window.setOnDismissListener(new PopupWindow.OnDismissListener() {
+			@Override
+			public void onDismiss() {
+				DisplayUtil.backgroundAlpha(ct, 1f);
+			}
+		});
+		if (onFindLikerListener != null && 0 > 1) {
+			view.findViewById(R.id.select_erp).setVisibility(View.VISIBLE);
+			view.findViewById(R.id.select_erp).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if (onFindLikerListener != null) {
+						onFindLikerListener.click(StringUtil.getTextRexHttp(company_et));
+					}
+				}
+			});
+		} else {
+			view.findViewById(R.id.select_erp).setVisibility(View.GONE);
+		}
+		view.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				setBack(null, model, onClickListener);
+				window.dismiss();
+			}
+		});
+		view.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				String company = company_et.getText().toString();
+				setBack(company, model, onClickListener);
+				window.dismiss();
+			}
+		});
+
+	}
+
+	private static void setBack(String company, SelectAimModel model, OnClickListener onClickListener) {
+		if (model == null) {
+			model = new SelectAimModel();
+			model.setAddress("");
+		}
+		if (!StringUtil.isEmpty(company))
+			model.setName(company);
+		if (onClickListener != null)
+			onClickListener.result(model);
+	}
+
+	private static int getWidth(Activity ct) {
+		DisplayMetrics dm = new DisplayMetrics();
+		ct.getWindowManager().getDefaultDisplay().getMetrics(dm);
+		return (int) (dm.widthPixels * (0.8));
+	}
+
+	public static void setPopupWindowHW(PopupWindow window) {
+		window.getContentView().measure(0, 0);
+		window.setHeight(window.getContentView().getMeasuredHeight() + 30);
+		window.setWidth(window.getContentView().getMeasuredWidth() + DisplayUtil.dip2px(MyApplication.getInstance(), 10f));
+	}
+
+	public static void setPopupWindowHW(Activity ct, PopupWindow window) {
+		window.getContentView().measure(0, 0);
+		window.setHeight(window.getContentView().getMeasuredHeight() + 30);
+		window.setWidth(getWidth(ct));
+	}
+
+
+	public interface OnClickListener {
+		void result(SelectAimModel model);
+	}
+
+	public interface OnSelectListener {
+		void select(boolean selectOk);
+	}
+
+	public interface OnFindLikerListener {
+		void click(String licker);
+	}
+}

WeiChat/src/main/res/layout/item_select_aim_pop.xml → app_modular/apputils/src/main/res/layout/item_select_aim_pop.xml

@@ -1,26 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingTop="10dp"
-    android:background="@drawable/pop_round_bg">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/pop_round_bg"
+                android:gravity="center_horizontal"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="10dp">
+
+    <ImageView
+        android:id="@+id/select_erp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/padding"
+        android:padding="@dimen/padding"
+        android:layout_alignParentRight="true"
+        android:src="@drawable/icon_mission_select"/>
 
     <TextView
         android:id="@+id/title_tv"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="20dp"
-        android:gravity="center"
+        android:layout_centerHorizontal="true"
         android:text="@string/perfect_company_name"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="@dimen/text_main"/>
 
     <LinearLayout
+        android:id="@+id/name_ll"
         android:layout_width="match_parent"
         android:layout_height="40dp"
+        android:layout_below="@id/title_tv"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:orientation="horizontal">
@@ -28,9 +38,9 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=""
+            android:text="@string/company_name"
             android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            android:textSize="@dimen/text_main"/>
 
         <EditText
             android:id="@+id/company_et"
@@ -38,31 +48,35 @@
             android:layout_height="wrap_content"
             android:background="@null"
             android:ellipsize="end"
+            android:layout_marginLeft="@dimen/padding"
             android:maxLines="1"
-            android:text="@string/company_name"
             android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            android:textSize="@dimen/text_main"/>
     </LinearLayout>
 
     <TextView
         android:id="@+id/address_tv"
         android:layout_width="match_parent"
         android:layout_height="40dp"
+        android:layout_below="@id/name_ll"
         android:layout_marginTop="5dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_hine" />
+        android:textSize="@dimen/text_hine"/>
 
     <View
+        android:id="@+id/address_line"
         android:layout_width="match_parent"
         android:layout_height="2px"
+        android:layout_below="@id/address_tv"
         android:layout_marginTop="10dp"
-        android:background="@color/item_line" />
+        android:background="@color/item_line"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
+        android:layout_below="@id/address_line"
         android:orientation="horizontal"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main">
@@ -75,12 +89,12 @@
             android:gravity="center"
             android:text="@string/skip_operation"
             android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            android:textSize="@dimen/text_main"/>
 
         <View
             android:layout_width="2px"
             android:layout_height="match_parent"
-            android:background="@color/item_line" />
+            android:background="@color/item_line"/>
 
         <TextView
             android:id="@+id/sure_tv"
@@ -90,6 +104,6 @@
             android:gravity="center"
             android:text="@string/common_sure"
             android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            android:textSize="@dimen/text_main"/>
     </LinearLayout>
-</LinearLayout>
+</RelativeLayout>

app_modular/appworks/build.gradle

@@ -20,6 +20,5 @@ android {
 }
 dependencies {
     //project
-    compile project(':common')
-    compile project(':network')
+    compile project(':apputils')
 }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/AddBusinessActivity.java

@@ -26,7 +26,6 @@ import com.core.net.http.http.Request;
 import com.core.utils.CommonInterface;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
-import com.core.utils.helper.PopupWindowHelper;
 import com.core.widget.MyListView;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
@@ -34,6 +33,7 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appworks.CRM.erp.adapter.AddBusinessAdapter;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.uas.appworks.R;

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailInfoActivity.java

@@ -50,7 +50,7 @@ import com.core.utils.CommonUtil;
 import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.core.utils.helper.PopupWindowHelper;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.widget.MyListView;
 import com.core.widget.crouton.Crouton;
 import com.core.widget.crouton.Style;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ExpenseReimbursementActivity.java

@@ -402,6 +402,12 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_expense_reimbursement);
         ViewUtils.inject(this);
+        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+        for (String permission : permissions) {
+            if (PermissionUtil.lacksPermissions(ct, permission)) {
+                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+            }
+        }
         initView();
         initTypeAndMoneyData();  // 获取该表单相关字段，
 
@@ -1837,7 +1843,14 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
-                            takePhoto();
+                            try {
+                                takePhoto();
+                            } catch (Exception e) {
+                                String message=e.getMessage();
+                                if (!StringUtil.isEmpty(message)&&message.contains("Permission")){
+                                    ToastUtil.showToast(ct,R.string.not_system_permission);
+                                }
+                            }
                         } else {
                             selectPhoto();
                         }
@@ -2127,17 +2140,17 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         }
         return -1;
     }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
-        for (String permission : permissions) {
-            if (PermissionUtil.lacksPermissions(ct, permission)) {
-                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
-            }
-        }
-    }
+//
+//    @Override
+//    protected void onResume() {
+//        super.onResume();
+//        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+//        for (String permission : permissions) {
+//            if (PermissionUtil.lacksPermissions(ct, permission)) {
+//                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+//            }
+//        }
+//    }
 
     // 审批人选择操作
     private void judgeApprovers(int keyValue) {

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MissionActivity.java

@@ -6,12 +6,14 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.PopupWindow;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.baidu.mapapi.model.LatLng;
@@ -29,13 +31,15 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.MissionModel;
+import com.core.model.SelectBean;
 import com.core.utils.BaiduMapUtil;
 import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
-import com.core.utils.helper.PopupWindowHelper;
 import com.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
 import com.lidroid.xutils.ViewUtils;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appworks.OA.erp.adapter.MissionAdapter;
 import com.uas.appworks.OA.erp.model.IMission;
 import com.uas.appworks.OA.erp.presenter.IMissionPresenter;
@@ -43,6 +47,7 @@ import com.uas.appworks.OA.erp.presenter.MissionPresenter;
 import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.uas.appworks.R;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -50,6 +55,7 @@ import java.util.List;
  * 外勤打卡
  */
 public class MissionActivity extends OABaseActivity implements View.OnClickListener, IMission, MissionAdapter.OnitemClickListener {
+	private final int NUMBER_SELECT = 112;
 	private RecyclerView recycler;
 	public int position;//调转指针
 	private IMissionPresenter presenter;
@@ -98,6 +104,10 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 				item.setVisible(false);
 			}
 		}
+		MenuItem sign = menu.getItem(1);
+		if (sign.getItemId() == R.id.sign) {
+			sign.setVisible(false);
+		}
 		return super.onCreateOptionsMenu(menu);
 	}
 
@@ -116,7 +126,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 			intent.putExtra(AppConfig.IS_ADMIN, adminStatus);
 			startActivityForResult(intent, 0x22);
 		} else if (item.getItemId() == R.id.sign) {
-			if (adapter!=null){
+			if (adapter != null) {
 				presenter.sign(adapter.getModels());
 			}
 		}
@@ -188,6 +198,15 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 		}
 	}
 
+	@Override
+	public void showFinds(List<SelectBean> models) {
+		Intent intent = new Intent(this, SelectActivity.class)
+				.putExtra("type", 2)
+				.putExtra("title", getString(R.string.select_location))
+				.putParcelableArrayListExtra("data", (ArrayList<? extends Parcelable>) models);
+		startActivityForResult(intent, NUMBER_SELECT);
+	}
+
 	@Override
 	public void changModelStatus(int status, int postion) {
 		if (ListUtils.isEmpty(adapter.getModels()) || adapter.getModels().size() <= postion) return;
@@ -287,7 +306,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (resultCode != 0x20 || data == null) return;
+		if (data == null) return;
 		try {
 			onResult(requestCode, resultCode, data);
 		} catch (Exception e) {
@@ -295,45 +314,28 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 		}
 	}
 
+	private SelectAimModel chcheAimModel = null;
+	private PopupWindow popupWindow = null;
+
 	private void onResult(int requestCode, int resultCode, Intent data) throws Exception {
 		if (requestCode == 0x20) {//选择公司
-			SelectAimModel entity = data.getParcelableExtra("data");
-			PopupWindowHelper.create(this, getString(R.string.perfect_company_name), entity, new PopupWindowHelper.OnClickListener() {
+			chcheAimModel = data.getParcelableExtra("data");
+			if (popupWindow != null) {
+				popupWindow.dismiss();
+				popupWindow = null;
+			}
+			popupWindow = PopupWindowHelper.create(this, getString(R.string.perfect_company_name), chcheAimModel, new PopupWindowHelper.OnClickListener() {
 				@Override
 				public void result(SelectAimModel model) {
 					sureSelectAim(model);
 				}
+			}, new PopupWindowHelper.OnFindLikerListener() {
+				@Override
+				public void click(String licker) {
+					presenter.finder(licker);
+				}
 			});
-		}
-// else if (requestCode == 0x21) {//选择地址
-//            PoiInfo info = data.getParcelableExtra("resultName");
-//            if (info == null) {
-//                return;
-//            } else {
-//                String distance = getInstence().getDistance(info.location);
-//                if (StringUtil.isEmpty(distance)) return;
-//                if (ListUtils.isEmpty(adapter.getModels()) || adapter.getModels().size() <= position)
-//                    return;
-//                if (StringUtil.isEmpty(adapter.getModels().get(position).getCompanyName())) {
-//                    adapter.getModels().get(position).setCompanyName(info.name);
-//                }
-//                adapter.getModels().get(position).setCompanyName(info.name);
-//                adapter.getModels().get(position).setCompanyAddr(info.address);
-//                adapter.getModels().get(position).setLatLng(info.location);
-//                adapter.getModels().get(position).setDistance(getInstence().distance(adapter.getModels().get(position).getLatLng()
-//                        , new LatLng(MyApplication.getInstance().getBdLocationHelper().getLatitude(),
-//                                MyApplication.getInstance().getBdLocationHelper().getLongitude())));
-//                adapter.notifyItemChanged(position);
-//                if (!StringUtil.isEmpty(adapter.getModels().get(position).getCompanyName()))
-//                    try {
-//                        setEndTime(info.location, Double.valueOf(getInstence().getDistance(info.location)));
-//                    } catch (ClassCastException e) {
-//
-//                    } catch (Exception e) {
-//                    }
-//            }
-//        }
-		else if (0x22 == requestCode) {//外勤设置
+		} else if (0x22 == requestCode) {//外勤设置
 			boolean isAuto = data.getBooleanExtra("isAuto", true);
 			if (!isAuto && !(ApiUtils.getApiModel() instanceof ApiPlatform)) {
 				if (flag == 1) {
@@ -352,6 +354,27 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 			String remark = StringUtil.isEmpty(message) ? getResources().getString(R.string.maintain_customers) : message;
 			adapter.getModels().get(position).setRemark(remark);
 			adapter.notifyItemChanged(position);
+		} else if (NUMBER_SELECT == requestCode) {
+			SelectBean bean = data.getParcelableExtra("data");
+			if (chcheAimModel != null && bean != null) {
+				chcheAimModel.setName(bean.getName());
+				if (popupWindow != null) {
+					popupWindow.dismiss();
+					popupWindow = null;
+				}
+				popupWindow = PopupWindowHelper.create(this, getString(R.string.perfect_company_name), chcheAimModel, new PopupWindowHelper.OnClickListener() {
+					@Override
+					public void result(SelectAimModel model) {
+						sureSelectAim(model);
+					}
+				}, new PopupWindowHelper.OnFindLikerListener() {
+					@Override
+					public void click(String licker) {
+						presenter.finder(licker);
+					}
+				});
+			}
+
 		}
 	}
 
@@ -374,6 +397,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 			try {
 				float dis = Float.valueOf(BaiduMapUtil.getInstence().getDistance(entity.getLatLng()));
 				setEndTime(entity.getLatLng(), dis);
+				chcheAimModel = null;
 			} catch (ClassCastException e) {
 				if (e != null)
 					LogUtil.i("ClassCastException " + e.getMessage());

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -43,7 +43,7 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.core.utils.helper.PopupWindowHelper;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.ListViewInScroller;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/IMission.java

@@ -2,6 +2,7 @@ package com.uas.appworks.OA.erp.model;
 
 import com.core.base.HttpImp;
 import com.core.model.MissionModel;
+import com.core.model.SelectBean;
 
 import java.util.List;
 
@@ -11,8 +12,10 @@ import java.util.List;
 
 public interface IMission extends HttpImp {
 
-    void showModels(List<MissionModel> models);
+	void showModels(List<MissionModel> models);
 
-    void changModelStatus(int status, int postion);
+	void showFinds(List<SelectBean> models);
+
+	void changModelStatus(int status, int postion);
 
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/IMissionPresenter.java

@@ -11,18 +11,20 @@ import java.util.List;
  */
 
 public interface IMissionPresenter {
-    /**
-     * 1.从网络下拉数据
-     * 2.将数据保存到数据库
-     * 3.从数据库取出数据
-     */
+	/**
+	 * 1.从网络下拉数据
+	 * 2.将数据保存到数据库
+	 * 3.从数据库取出数据
+	 */
 
-    void start(Intent intent);//1.从网上下拉数据   保存数据
+	void start(Intent intent);//1.从网上下拉数据   保存数据
 
 
-    void submit(List<MissionModel> models);
+	void submit(List<MissionModel> models);
 
-    void sign(List<MissionModel> models);
+	void sign(List<MissionModel> models);
+
+	void finder(String licker);
 
 
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -21,6 +21,7 @@ import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
 import com.core.model.MissionModel;
+import com.core.model.SelectBean;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
@@ -50,6 +51,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 	private final int SAVE_PLAN = 0x12;
 	private final int SAVE_ADDRESS = 0x13;
 	private final int SIGNIN_MISSION = 0x17;
+	private final int FIND_LIKER = 0x18;
 	private IMission iMission;
 	private boolean isB2b;
 	private MissionModel modelIntent;
@@ -127,6 +129,25 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 		}
 	}
 
+	@Override
+	public void finder(String licker) {
+		if (StringUtil.isEmpty(licker)) return;
+		iMission.showLoading();
+		Map<String, Object> param = new HashMap<>();
+		param.put("likestr", licker);
+		param.put("page", 1);
+		param.put("pageSize", 100);
+		Bundle bundle = new Bundle();
+		Request request = new Request.Bulider()
+				.setUrl("mobile/crm/searchCustomer.action")
+				.setWhat(FIND_LIKER)
+				.setParam(param)
+				.setBundle(bundle)
+				.setMode(Request.Mode.GET)
+				.bulid();
+		OAHttpHelper.getInstance().requestHttp(request, this);
+	}
+
 
 	/**
 	 * 保存拜访计划
@@ -512,6 +533,23 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 							iMission.showToast("手动签到成功", R.color.load_error);
 							loadMissionPlan();
 						}
+						break;
+					case FIND_LIKER:
+						if (isJSON) {
+							JSONArray datas = JSONUtil.getJSONArray(object, "datas");
+							if (!ListUtils.isEmpty(datas)) {
+								List<SelectBean> models = new ArrayList<>();
+								for (int i = 0; i < datas.size(); i++) {
+									if (!StringUtil.isEmpty(datas.getString(i))) {
+										models.add(new SelectBean(datas.getString(i)));
+									}
+								}
+								if (!ListUtils.isEmpty(models)) {
+									iMission.showFinds(models);
+								}
+							}
+						}
+
 						break;
 				}
 			}