提交分类 功能开发；

提交内容	1、设备查询页面item点击跳转到详情页
当前版本	正式版本V6.1.1（测试版本6.1.1）
是否冲突	是
Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/WXEntryActivity.java

@@ -0,0 +1,52 @@
+package com.thinkive.sidiinfo.sng.wxapi;
+import com.tencent.mm.sdk.modelbase.BaseReq;
+import com.tencent.mm.sdk.modelbase.BaseResp;
+import com.tencent.mm.sdk.modelmsg.SendAuth;
+import com.tencent.mm.sdk.openapi.IWXAPI;
+import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
+import com.tencent.mm.sdk.openapi.WXAPIFactory;
+import com.thinkive.limitup.android.RecommShareActivity;
+import com.thinkive.limitup.android.application.MyApplication;
+import com.thinkive.limitup.android.common.Constants;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class WXEntryActivity extends Activity implements IWXAPIEventHandler{
+    private IWXAPI api;
+
+	@Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        api = WXAPIFactory.createWXAPI(this, Constants.wxAppId, true);
+        api.handleIntent(getIntent(), this);
+    }
+
+	@Override
+	protected void onNewIntent(Intent intent) {
+		super.onNewIntent(intent);
+		setIntent(intent);
+	}
+
+	@Override
+	public void onReq(BaseReq req) {
+	}
+
+	@Override
+	public void onResp(BaseResp resp) {
+		try {
+			switch (resp.errCode) {
+				case BaseResp.ErrCode.ERR_OK:{
+					if(resp!=null && resp instanceof SendAuth.Resp){
+						RecommShareActivity.code = ((SendAuth.Resp) resp).code;
+					}
+				}
+				break;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finish();
+	}
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/WXPayEntryActivity.java

@@ -0,0 +1,57 @@
+package com.thinkive.sidiinfo.sng.wxapi;
+import com.thinkive.limitup.android.common.Constants;
+import com.thinkive.sidiinfo.sng.R;
+import com.tencent.mm.sdk.constants.ConstantsAPI;
+import com.tencent.mm.sdk.modelbase.BaseReq;
+import com.tencent.mm.sdk.modelbase.BaseResp;
+import com.tencent.mm.sdk.openapi.IWXAPI;
+import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
+import com.tencent.mm.sdk.openapi.WXAPIFactory;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler{
+	
+    private IWXAPI api;
+	
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.pay_result);
+    	api = WXAPIFactory.createWXAPI(this, Constants.wxAppId);
+        api.handleIntent(getIntent(), this);
+    }
+
+	@Override
+	protected void onNewIntent(Intent intent) {
+		super.onNewIntent(intent);
+		setIntent(intent);
+        api.handleIntent(intent, this);
+	}
+
+	@Override
+	public void onReq(BaseReq req) {
+	}
+
+	@Override
+	public void onResp(BaseResp resp) {
+		
+		// 0 支付成功
+		// -2取消
+		if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
+//			AlertDiaWedroidLog.Builder builder = new AlertDiaWedroidLog.Builder(this);
+//			builder.setTitle(R.string.app_tip);
+//			builder.setMessage(getString(R.string.pay_result_callback_msg, String.valueOf(resp.errCode)));
+//			builder.show();
+			Intent mIntent = new Intent("wxpay");  
+			if(resp.errCode == 0){
+				mIntent.putExtra("result", true); 
+			}else{
+				mIntent.putExtra("result", false); 
+			}
+			sendBroadcast(mIntent);  
+		}
+		finish();
+	}
+}

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

@@ -61,10 +61,11 @@
 
     <TextView
         android:id="@+id/handler_tv"
-        android:layout_width="250dp"
+        android:layout_width="wrap_content"
+        android:maxWidth="280dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/address_tv"
-        android:layout_marginRight="30dp"
+        android:layout_marginRight="10dp"
         android:text="*****"
         android:layout_marginTop="10dp"
         android:ellipsize="end"
@@ -72,7 +73,8 @@
 
     <TextView
         android:id="@+id/topic_tv"
-        android:layout_width="150dp"
+        android:layout_width="wrap_content"
+        android:maxWidth="150dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/address_tv"
         android:layout_toRightOf="@+id/handler_tv"

WeiChat/src/main/res/values-en/strings.xml

@@ -37,7 +37,7 @@
         <string name = "common_noinput"> not filled in </string>
         <string name = "common_camera"> take pictures </string>
         <string name = "common_photo"> select </string> from the album
-        <string name = "common_notlinknet"> The network is not connected </string>
+        <string name = "common_notlinknet"> The current network is not available, please try again later</string>
         <string name = "common_notice"> Warm Tips </string>
         <string name = "common_save_failed"> save failed </string>
         <string name = "common_save_success"> save successfully </string>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -38,7 +38,7 @@
     <string name="common_noinput">未填写</string>
     <string name="common_camera">拍照</string>
     <string name="common_photo">从相册选择</string>
-    <string name="common_notlinknet">网络未连接</string>
+    <string name="common_notlinknet">当前网络不可用，请稍后再试!</string>
     <string name="common_notice">温馨提示</string>
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -34,7 +34,7 @@
     <string name="common_agree">同意</string>
     <string name="common_disagree">不同意</string>
     <string name="common_changedealman">變更處理人</string>
-    <string name="common_notlinknet">網絡未連接</string>
+    <string name="common_notlinknet">當前網絡不可用，請稍後重試!</string>
     <string name="common_notice">溫馨提示</string>
     <string name="common_save_failed">保存失敗</string>
     <string name="common_save_success">保存成功</string>

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

@@ -581,7 +581,7 @@
     <string name="common_noinput">未填写</string>
     <string name="common_camera">拍照</string>
     <string name="common_photo">从相册选择</string>
-    <string name="common_notlinknet">网络未连接</string>
+    <string name="common_notlinknet">当前网络不可用，请稍后重试!</string>
     <string name="common_notice">温馨提示</string>
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 25 15:08:51 CST 2017
-debugName=246
-versionName=612
-debugCode=246
-versionCode=151
+#Mon Dec 25 14:00:40 CST 2017
+debugName=236
+versionName=613
+debugCode=236
+versionCode=152

app_core/common/src/main/assets/work_menu.json

@@ -239,6 +239,15 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_company_salary",
+        "menuIcon": "company_salary",
+        "menuActivity": "com.modular.appme.CheckWagesActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1047,10 +1047,10 @@ public class ViewUtil {
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
         url = url + "mobile/login.action";
-        if (BaseConfig.isDebug()){
-            master=CommonUtil.getMaster();
-            url="http://192.168.253.203:8090/ERP/mobile/login.action";
-        }
+//        if (BaseConfig.isDebug()){
+//            master=CommonUtil.getMaster();
+//            url="http://192.168.253.203:8090/ERP/mobile/login.action";
+//        }
  //       url="http://192.168.253.58:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.29:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.6/uas_dev/mobile/login.action";

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -99,10 +99,11 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        if (BaseConfig.isDebug()){
-            baseUrl="http://192.168.253.203:8090/ERP/";
-        }
-//        baseUrl="http://192.168.253.203:8090/ERP/";
+//        if (BaseConfig.isDebug()){
+//            baseUrl="http://192.168.253.203:8090/ERP/";
+//        }
+//        baseUrl="http://192.168.253.203:8090/ERP/
+
         return baseUrl;
     }
 
@@ -474,9 +475,9 @@ public class CommonUtil {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         String master = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")
                 : CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
-      if (BaseConfig.isDebug()){
-          master="UAS_DEV";
-      }
+//      if (BaseConfig.isDebug()){
+//          master="UAS_DEV";
+//      }
         return master;
 
     }

app_core/common/src/main/res/values-en/strings.xml

@@ -1474,6 +1474,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
+    <string name="str_company_salary">Payroll inquiry</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1587,6 +1587,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
+    <string name="str_company_salary">工资条查询</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1575,6 +1575,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
+    <string name="str_company_salary">工資條查詢</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values/strings.xml

@@ -1925,6 +1925,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
+    <string name="str_company_salary">工资条查询</string>
     <!--工作台菜单-->
 
 </resources>

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -361,8 +361,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     
                 }
 
-                getSupportActionBar().setTitle(model.getName());
-
+               // getSupportActionBar().setTitle(model.getName());
+                getSupportActionBar().setTitle("预约");
 
             } else {
                 //TODO 由于该界面必须要转进来的对象，如果model缺失，应返回
@@ -1331,6 +1331,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_hospital_rooms.setText(data.getString("sb_stname"));
                     tag_hospital_doctor.setText(data.getString("sb_username"));
+
+                    tv_hospital_time.setCompoundDrawables(null,null,null,null);
+                    tv_hospital_rooms.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10002"://运动健身
@@ -1349,6 +1352,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_sport_rooms.setText(data.getString("sb_spname"));
                     tv_sport_peoples.setText(data.getString("sb_person"));
+
+                    tv_sport_rooms.setCompoundDrawables(null,null,null,null);
+                    tv_sport_peoples.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10003"://餐饮
@@ -1387,6 +1393,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                             tvSeatsRight.setVisibility(View.VISIBLE);  //商家释放
                         }
                     }
+
+                    tvSeatsRight .setCompoundDrawables(null,null,null,null);
+                    tv_food_peoples .setCompoundDrawables(null,null,null,null);
+                    tv_food_times .setCompoundDrawables(null,null,null,null);
+                    tv_food_rooms.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10004"://美容美发
@@ -1402,6 +1413,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                 + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_hair_rooms.setText(data.getString("sb_stname"));
+                    tv_hair_times.setCompoundDrawables(null,null,null,null);
+                    tv_hair_rooms. setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10005"://会所
@@ -1420,6 +1433,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_club_technician.setText(data.getString("sb_stname"));
                     tv_club_peoples.setText(data.getString("sb_person"));
+
+                    tv_club_technician. setCompoundDrawables(null,null,null,null);
+                    tv_club_peoples.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10006"://ktv
@@ -1438,6 +1454,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_ktv_rooms.setText(data.getString("sb_spname"));
                     tv_ktv_peoples.setText(data.getString("sb_person"));
+                    tv_ktv_rooms.setCompoundDrawables(null,null,null,null);
+                    tv_ktv_peoples. setCompoundDrawables(null,null,null,null);
+                    tv_ktv_times.setCompoundDrawables(null,null,null,null);
                 }
                 break;
 
@@ -1653,6 +1672,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                              JSONArray deskbook=JSON.parseObject(o.toString()).getJSONArray("deskbook");
                              JSONArray desklist=JSON.parseObject(o.toString()).getJSONArray("desklist");
                              if (!ListUtils.isEmpty(deskbook)){
+                                 CommonUtil.textSpanForStyle(tvMSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
+                                 CommonUtil.textSpanForStyle(tvZSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
+                                 CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
                                  for (int i = 0; i <deskbook.size() ; i++) {
                                      JSONObject object=deskbook.getJSONObject(i);
                                      String number= object.getString("number");//预约量

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceListActivity.java

@@ -43,37 +43,37 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-  * @desc:
-  * @author：Arison on 2017/9/28
-  */
+ * @desc:
+ * @author：Arison on 2017/9/28
+ */
 public class BServiceListActivity extends OABaseActivity {
     private VoiceSearchView voiceSearchView;
     private PullToRefreshListView mListView;
     private ItemBserviceListAdapter mListAdapter;
-    private List<SBListModel> modelList=new ArrayList<>();
-    private  SBMenuModel menuModel;
-    
+    private List<SBListModel> modelList = new ArrayList<>();
+    private SBMenuModel menuModel;
     private EmptyLayout emptyLayout;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_bservices);
-        
+
         initView();
         initEvent();
         initData();
     }
 
     private void initView() {
-        if (getIntent()!=null){
-            menuModel=getIntent().getParcelableExtra("SBMenuModel");
+        if (getIntent() != null) {
+            menuModel = getIntent().getParcelableExtra("SBMenuModel");
             getSupportActionBar().setTitle(menuModel.getTitle());
-            LogUtil.d("myTest","menuModel:"+JSON.toJSONString(menuModel));
+            LogUtil.d("myTest", "menuModel:" + JSON.toJSONString(menuModel));
         }
         voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         mListView = (PullToRefreshListView) findViewById(R.id.mListView);
-        emptyLayout=new EmptyLayout(mContext,mListView.getRefreshableView());
-        mListAdapter=new ItemBserviceListAdapter(mContext,modelList);
+        emptyLayout = new EmptyLayout(mContext, mListView.getRefreshableView());
+        mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
         mListView.setAdapter(mListAdapter);
 
         initSearchView();
@@ -82,6 +82,7 @@ public class BServiceListActivity extends OABaseActivity {
     private ImageView mBackImageView, mVoiceImageView;
     private ClearEditText mSearchEditText;
     private EmptyLayout mEmptyLayout;
+
     private void initSearchView() {
         View view = LayoutInflater.from(ct).inflate(R.layout.action_book_service_search, null);
         mBackImageView = (ImageView) view.findViewById(R.id.book_service_search_back);
@@ -126,21 +127,21 @@ public class BServiceListActivity extends OABaseActivity {
 
             @Override
             public void afterTextChanged(Editable s) {
-                if (!TextUtils.isEmpty(s.toString())){
-                    if (!ListUtils.isEmpty(modelList)){
-                        List<SBListModel> tempList=new ArrayList<>();
-                        for (int i = 0; i <modelList.size() ; i++) {
-                            if (modelList.get(i).getName().contains(s.toString())){
+                if (!TextUtils.isEmpty(s.toString())) {
+                    if (!ListUtils.isEmpty(modelList)) {
+                        List<SBListModel> tempList = new ArrayList<>();
+                        for (int i = 0; i < modelList.size(); i++) {
+                            if (modelList.get(i).getName().contains(s.toString())) {
                                 tempList.add(modelList.get(i));
                             }
                         }
-                        if (ListUtils.isEmpty(tempList))  mEmptyLayout.showEmpty();
-                        LogUtil.d(TAG,"tempList:"+JSON.toJSONString(tempList.toString()));
+                        if (ListUtils.isEmpty(tempList)) mEmptyLayout.showEmpty();
+                        LogUtil.d(TAG, "tempList:" + JSON.toJSONString(tempList.toString()));
                         mListAdapter.setObjects(tempList);
                         mListAdapter.notifyDataSetChanged();
 
                     }
-                }else{
+                } else {
                     mListAdapter.setObjects(modelList);
                     mListAdapter.notifyDataSetChanged();
                 }
@@ -155,48 +156,48 @@ public class BServiceListActivity extends OABaseActivity {
                 LogUtil.i("position=" + position);
                 LogUtil.i("id=" + id);
                 SBListModel model = mListAdapter.getItem((int) id);
-                Intent intent =null;
-                if (model.getType().equals("会所")||model.getType().equals("美容美发")){
+                Intent intent = null;
+                if (model.getType().equals("会所") || model.getType().equals("美容美发")) {
                     intent = new Intent(ct, BServiceDetailActivity.class);
-                }else{
+                } else {
                     intent = new Intent(ct, BServiceAddActivity.class);
                 }
-                LogUtil.d(TAG,"model:"+JSON.toJSONString(model));
+                LogUtil.d(TAG, "model:" + JSON.toJSONString(model));
                 intent.putExtra("model", model);
                 startActivity(intent);
                 //@update by Bitliker 由于不同类型的预约详情界面差别很大，需要判断当前点击的进行分类
             }
         });
     }
-    
+
     private void initData() {
-        if (menuModel!=null){
-            loadListData(menuModel.getCode(),1);
+        if (menuModel != null) {
+            loadListData(menuModel.getCode(), 1);
         }
     }
 
-    
-    public void loadListData(String type,int page){
+
+    public void loadListData(String type, int page) {
         MyApplication.getInstance().getBdLocationHelper().requestLocation();
-        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreList")
-                .add("type",type)
-                .add("pageIndex",page)
+                .add("type", type)
+                .add("pageIndex", page)
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
                 modelList.clear();
-                LogUtil.d("o.toString"+o.toString());
-                if (JSONUtil.validate(o.toString())){
-                    JSONObject object= JSON.parseObject(o.toString());
-                    JSONArray jsonArray=object.getJSONArray("reslut");
-                    if (!ListUtils.isEmpty(jsonArray)){
-                        for (int i=0;i<jsonArray.size();i++){
-                            JSONObject mObject=jsonArray.getJSONObject(i);
-                            SBListModel sbListModel=new SBListModel();
+                LogUtil.d("o.toString" + o.toString());
+                if (JSONUtil.validate(o.toString())) {
+                    JSONObject object = JSON.parseObject(o.toString());
+                    JSONArray jsonArray = object.getJSONArray("reslut");
+                    if (!ListUtils.isEmpty(jsonArray)) {
+                        for (int i = 0; i < jsonArray.size(); i++) {
+                            JSONObject mObject = jsonArray.getJSONObject(i);
+                            SBListModel sbListModel = new SBListModel();
                             sbListModel.setName(mObject.getString("sc_companyname"));
                             sbListModel.setAddress(mObject.getString("sc_address"));
                             sbListModel.setBookType(mObject.getString("sc_booktype"));
@@ -204,14 +205,14 @@ public class BServiceListActivity extends OABaseActivity {
                             sbListModel.setType(mObject.getString("sc_industry"));
                             sbListModel.setPhone(mObject.getString("sc_telephone"));
                             sbListModel.setIndustrycode(mObject.getString("sc_industrycode"));
-                            String sc_latitude=mObject.getString("sc_latitude");
-                            String sc_longitude=mObject.getString("sc_longitude");
+                            String sc_latitude = mObject.getString("sc_latitude");
+                            String sc_longitude = mObject.getString("sc_longitude");
                             sbListModel.setLatitude(sc_latitude);
                             sbListModel.setLongitude(sc_longitude);
                             sbListModel.setIntroduce(mObject.getString("sc_introduce"));
                             LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                             float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
-                            sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance,"#.0")));
+                            sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance, "#.0")));
                             sbListModel.setCash(mObject.getString("sc_telephone"));
                             sbListModel.setCompanyid(mObject.getString("sc_uu"));
                             sbListModel.setImid(mObject.getString("sc_imid"));
@@ -221,14 +222,14 @@ public class BServiceListActivity extends OABaseActivity {
                             modelList.add(sbListModel);
                         }
                         LogUtil.d("myTest", JSON.toJSONString(modelList));
-                        mListAdapter=new ItemBserviceListAdapter(mContext,modelList);
+                        mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
                         mListView.setAdapter(mListAdapter);
-                        if (mListAdapter.getCount()==0){
+                        if (mListAdapter.getCount() == 0) {
                             emptyLayout.showEmpty();
                         }
                         //mListAdapter.notifyDataSetChanged();
-                    }else{
-                        if (mListAdapter.getCount()==0){
+                    } else {
+                        if (mListAdapter.getCount() == 0) {
                             emptyLayout.showEmpty();
                         }
                     }

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -36,6 +36,7 @@ import com.core.widget.DrawableCenterTextView;
 import com.core.widget.view.MyGridView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.imageloader.ImageLoaderUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -48,6 +49,8 @@ import com.modular.booking.model.ItemsSelectType1;
 import com.modular.booking.model.SBListModel;
 import com.modular.booking.model.SBMenuModel;
 import com.modular.booking.widget.ObservableScrollView;
+import com.youth.banner.Banner;
+import com.youth.banner.loader.ImageLoader;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -69,6 +72,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     private Drawable drawBg;
     private int pageSize = 1;
     private TextView tv_distance;
+    private Banner mBanner;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -112,7 +116,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         bar.setCustomView(view);
 
         mListView = (PullToRefreshListView) findViewById(R.id.mListView);
-    
+
         initHeader();
         mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
         mListView.setAdapter(mListAdapter);
@@ -121,8 +125,17 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     private void initHeader() {
         View headview = LayoutInflater.from(ct).inflate(R.layout.header_bservices_grid, null);
         mListView.getRefreshableView().addHeaderView(headview);
-        tv_distance =(TextView)findViewById(R.id.tv_distance);
-        MyGridView mGridView = (MyGridView) findViewById(R.id.mGridView);
+        tv_distance = findViewById(R.id.tv_distance);
+        MyGridView mGridView = findViewById(R.id.mGridView);
+        mBanner = findViewById(R.id.city_industry_service_main_banner);
+        mBanner.setImageLoader(new BannerImageLoader());
+        List<String> imgList=new ArrayList<>();
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/3-1.jpg");
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/2-1.jpg");
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/1-1.jpg");
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/4-1.jpg");
+        mBanner.update(imgList);
+        mBanner.start();
         List<SBMenuModel> menuModels = new ArrayList<>();
         SBMenuModel menuModel = new SBMenuModel();
         menuModel.setUrl("");
@@ -195,6 +208,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     protected void onResume() {
         super.onResume();
 //        drawBg.setAlpha(80);
+        mBanner.stopAutoPlay();
     }
 
     @Override
@@ -228,25 +242,25 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
                 pageSize = 1;
-                if (tv_distance.getText().toString().equals("全部")||tv_distance.getText().toString().equals("距离")){
+                if (tv_distance.getText().toString().equals("全部") || tv_distance.getText().toString().equals("距离")) {
                     loadListData(pageSize);
-                }else{
-                    loadSeachData(tv_distance.getTag().toString(),pageSize);
+                } else {
+                    loadSeachData(tv_distance.getTag().toString(), pageSize);
                 }
-                
+
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
                 pageSize++;
-                if (tv_distance.getText().toString().equals("全部")||tv_distance.getText().toString().equals("距离")){
+                if (tv_distance.getText().toString().equals("全部") || tv_distance.getText().toString().equals("距离")) {
                     loadListData(pageSize);
-                }else{
-                    loadSeachData(tv_distance.getTag().toString(),pageSize);
+                } else {
+                    loadSeachData(tv_distance.getTag().toString(), pageSize);
                 }
             }
         });
-        
+
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -331,7 +345,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //        drawBg.setAlpha(255);
 //    }
 
-    public void loadSeachData(String distance,final int pageSize){
+    public void loadSeachData(String distance, final int pageSize) {
         showLoading();
         BdLocationHelper helper = MyApplication.getInstance().getBdLocationHelper();
         //distance, type, longitude, latitude, pageIndex, token
@@ -339,7 +353,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appSearchStore")
                 .add("type", "0")
-                .add("distance",distance)
+                .add("distance", distance)
                 .add("longitude", helper.getLongitude())
                 .add("latitude", helper.getLatitude())
                 .add("pageIndex", String.valueOf(pageSize))
@@ -404,8 +418,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             }
         }));
     }
-    
-    
+
+
     public void loadListData(final int pageSize) {
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
@@ -438,7 +452,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                                 sbListModel.setIndustrycode(mObject.getString("sc_industrycode"));
                                 sbListModel.setCompanyid(mObject.getString("sc_uu"));
                                 sbListModel.setPhone(mObject.getString("sc_telephone"));
-                            
+
                                 String sc_latitude = mObject.getString("sc_latitude");
                                 String sc_longitude = mObject.getString("sc_longitude");
                                 sbListModel.setLatitude(sc_latitude);
@@ -482,16 +496,17 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             Intent intent = new Intent();
             intent.setClass(this, BServiceSearchActivity.class);
             startActivity(intent);
-        } else if (id==R.id.tv_distance){
+        } else if (id == R.id.tv_distance) {
             //搜索距离-showPopupWindow
             showPopupWindow(v);
         }
     }
 
-    
+
     //距离popupWindow
     private PopupWindow popupWindow = null;
     private int selectId;
+
     public void showPopupWindow(View parent) {
         View view = null;
         WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
@@ -501,8 +516,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             ListView plist = (ListView) view.findViewById(R.id.mList);
 //            SelectSimpleAdapter adapter = new SelectSimpleAdapter(ct, getPopData(),
 //                    R.layout.item_pop_list);
-            List<ItemsSelectType1> datas=  getItemsSelect();
-            final ItemPopListAdapter adapter=new ItemPopListAdapter(ct,datas);
+            List<ItemsSelectType1> datas = getItemsSelect();
+            final ItemPopListAdapter adapter = new ItemPopListAdapter(ct, datas);
             plist.setAdapter(adapter);
             Drawable drawable = getResources().getDrawable(R.drawable.selector_check_items);
             plist.setSelector(drawable);
@@ -510,8 +525,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     popupWindow.dismiss();
-                    pageSize=1;
-                    selectId=position;
+                    pageSize = 1;
+                    selectId = position;
                     adapter.setSelectId(selectId);
                     adapter.notifyDataSetChanged();
 //                    ItemPopListAdapter.ViewHolder viewHolder= (ItemPopListAdapter.ViewHolder) view.getTag();
@@ -519,37 +534,37 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //                    adapter.notifyDataSetChanged();
                     switch (position) {
                         case 0:
-                           loadSeachData("500",pageSize);
-                           tv_distance.setText("0.5km");
-                           tv_distance.setTag("500");
+                            loadSeachData("500", pageSize);
+                            tv_distance.setText("0.5km");
+                            tv_distance.setTag("500");
                             break;
                         case 1:
-                            loadSeachData("1000",pageSize);
+                            loadSeachData("1000", pageSize);
                             tv_distance.setText("1km");
                             tv_distance.setTag("1000");
                             break;
                         case 2:
-                            loadSeachData("2000",pageSize);
+                            loadSeachData("2000", pageSize);
                             tv_distance.setText("2km");
                             tv_distance.setTag("2000");
                             break;
                         case 3:
-                            loadSeachData("5000",pageSize);
+                            loadSeachData("5000", pageSize);
                             tv_distance.setText("5km");
                             tv_distance.setTag("5000");
                             break;
                         case 4:
-                            loadSeachData("10000",pageSize);
+                            loadSeachData("10000", pageSize);
                             tv_distance.setText("10km");
                             tv_distance.setTag("10000");
                             break;
                         case 5:
-                            loadSeachData("20000",pageSize);
+                            loadSeachData("20000", pageSize);
                             tv_distance.setText("20km");
                             tv_distance.setTag("20000");
                             break;
                         case 6:
-                            loadSeachData("30000",pageSize);
+                            loadSeachData("30000", pageSize);
                             tv_distance.setText("30km");
                             tv_distance.setTag("30000");
                             break;
@@ -561,7 +576,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                         default:
                             break;
                     }
-                
+
                 }
             });
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
@@ -581,54 +596,54 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
     }
 
-    
-    private List<ItemsSelectType1> getItemsSelect(){
-        List<ItemsSelectType1> list=new ArrayList<>();
-        ItemsSelectType1 model=new ItemsSelectType1();
+
+    private List<ItemsSelectType1> getItemsSelect() {
+        List<ItemsSelectType1> list = new ArrayList<>();
+        ItemsSelectType1 model = new ItemsSelectType1();
         model.setName("0.5km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("1km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("2km");
         list.add(model);
 
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("5km");
         list.add(model);
 
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("10km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("20km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("30km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("全部");
         list.add(model);
-        
-        return  list;
-        
+
+        return list;
+
     }
-     
+
     private List<Map<String, Object>> getPopData() {
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> map = new HashMap<>();
-        map.put("item_name","0.5km");
+        map.put("item_name", "0.5km");
         list.add(map);
         map = new HashMap<>();
-        map.put("item_name","1km");
+        map.put("item_name", "1km");
         list.add(map);
         map = new HashMap<>();
         map.put("item_name", "2km");
@@ -655,4 +670,12 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     public void onObservableScrollViewListener(int l, int t, int oldl, int oldt) {
 
     }
+
+    private class BannerImageLoader extends ImageLoader {
+        @Override
+        public void displayImage(Context context, Object path, ImageView imageView) {
+            imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            ImageLoaderUtil.getInstance().loadImage(path.toString(), imageView);
+        }
+    }
 }

app_modular/appbooking/src/main/res/layout/activity_bservices.xml

@@ -9,6 +9,7 @@
         android:id="@+id/mListView"
         android:layout_below="@+id/voiceSearchView"
         android:dividerHeight="0.1dp"
+        android:background="@color/transparent"
         android:divider="@color/item_line"
         style="@style/ListViewBasic" />
 </RelativeLayout>

app_modular/appbooking/src/main/res/layout/header_bservices_grid.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="#EBE9EA"
     android:orientation="vertical">
     <!--android:layout_marginTop="80dp"-->
@@ -17,6 +18,19 @@
         android:verticalSpacing="0.5dp">
     </com.core.widget.view.MyGridView>
 
+
+    <com.youth.banner.Banner
+        android:id="@+id/city_industry_service_main_banner"
+        android:layout_width="match_parent"
+        android:layout_marginTop="10dp"
+        android:layout_height="100dp"
+        app:banner_default_image="@drawable/skin_icon_blue_circle"
+        app:delay_time="3000"
+        app:is_auto_play="true"
+        app:layout_collapseMode="none"
+        app:layout_collapseParallaxMultiplier="0.5"
+        app:scroll_time="600" />
+    
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app_modular/appbooking/src/main/res/layout/item_bservice_header.xml

@@ -16,14 +16,15 @@
         android:layout_margin="3dp"
         android:text="*****"
         android:textColor="@color/black"
-        android:textSize="17sp"
+        android:textSize="15sp"
         android:textStyle="bold" />
 
     <TextView
         android:id="@id/tv_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="3dp"
+        android:textSize="11sp"
+        android:layout_margin="2dp"
         android:text="*****" />
 
     <de.hdodenhof.circleimageview.CircleImageView

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

@@ -73,10 +73,10 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
             super.handleMessage(msg);
             if (msg.what==1212) {
                 SecondT--;
-                seconds_tv.setText(SecondT+"");
+                seconds_tv.setText(SecondT+"\t秒后重新发送");
                 if (SecondT==0) {
                     codeTimeOut = true;
-                    seconds_tv.setVisibility(View.INVISIBLE);
+                    seconds_tv.setVisibility(View.GONE);
                     mWagesCodeBtn.setVisibility(View.VISIBLE);
                     isRun = false;
                     SecondT = 59;
@@ -241,7 +241,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
                         Toast.makeText(ct,"短信发送成功,请在一分钟内完成输入查询",Toast.LENGTH_LONG).show();
                         codeTimeOut = false;
-                        mWagesCodeBtn.setVisibility(View.INVISIBLE);
+                        mWagesCodeBtn.setVisibility(View.GONE);
                         seconds_tv.setVisibility(View.VISIBLE);
                         mWagesCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
                         isRun = true;

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

@@ -23,7 +23,6 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
@@ -32,7 +31,6 @@ import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
-import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
@@ -137,7 +135,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 else if (sl_result == 0 && haveData)
                     mBtnSignature.setVisibility(View.VISIBLE);
 
-
                 sl_id = dataObject.getString("sl_id");
                 if (!ListUtils.isEmpty(configsArray) && dataObject.size() > 0){
                     for (int i = 0; i < configsArray.size(); i++) {
@@ -233,7 +230,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         if (v.getId() == R.id.btn_signature){
             if (haveData && needSignature == 1)
                 showSiganWindow();
-            else if (haveData && needSignature == 0)
+            else if (haveData )
                 doNewSubmit(null,null);
             else
                 ToastMessage("暂无工资条数据");
@@ -354,7 +351,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         }));
     }
 
-    private void doNewSubmit(Bitmap pathBm, String plainpath) {
+    private void doNewSubmit(Bitmap pathBm, final String plainpath) {
         String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
         RequestParams params = new RequestParams();
         params.addBodyParameter("emcode", emcode);
@@ -362,14 +359,16 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         params.addBodyParameter("result","true");
         params.addQueryStringParameter("master", master);
         params.addBodyParameter("msg","");
-        params.addBodyParameter("img",new File(plainpath));
+        if (!StringUtil.isEmpty(plainpath))
+            params.addBodyParameter("img",new File(plainpath));
         final HttpUtils http = new HttpUtils();
         Log.i("urlparams",url+params+"");
 
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
             @Override
             public void onStart() {
-                ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
+                if (!StringUtil.isEmpty(plainpath))
+                    ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
             }
             @Override
             public void onSuccess(ResponseInfo<String> responseInfo) {
@@ -412,7 +411,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 .add("emcode", emcode)
                 .add("sl_id",sl_id)
                 .add("result",true)
-                .add("img", ppp)
+//                .add("img", ppp)
                 .add("master", master)
                 .add("msg","")
                 .method(Method.POST)
@@ -421,6 +420,14 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             public void onResponse(Object o) {
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("salaryBack", o.toString()+"");
+                if (JSONUtil.validate(o.toString()) && JSON.parseObject(o.toString()).getBoolean("success")) {
+                    Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
+                    received_im.setVisibility(View.VISIBLE);
+                    mBtnSignature.setText("已收签");
+                    mBtnSignature.setEnabled(false);
+                    closePopupWindow();
+                }
+                progressDialog.dismiss();
             }
         }));
 

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

@@ -135,6 +135,8 @@
             android:maxLength="6"
             android:visibility="gone"
             android:layout_marginTop="5dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
             />
 
     </RelativeLayout>

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

@@ -29,6 +29,10 @@
             android:layout_marginLeft="10dp"
             />
     </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/item_line" />
     <TextView
         android:id="@+id/announcement"
         android:textSize="12sp"
@@ -38,7 +42,6 @@
         android:layout_height="wrap_content"
         android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"/>
     <View
-        android:layout_marginTop="5dp"
         android:layout_width="match_parent"
         android:layout_height="10dp"
         android:background="@color/item_line" />
@@ -63,6 +66,7 @@
                     android:layout_height="match_parent"
                     android:padding="10dp"
                     android:background="@color/white"
+                    android:visibility="visible"
                     >
                 </com.core.widget.MyListView>
                 <ImageView
@@ -81,12 +85,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
                 android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone"
                 >
                 <ImageView
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:src="@drawable/wage_nodata"
                     />
+                <TextView
+                    android:padding="5dp"
+                    android:text="暂无工资信息"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/error_ll"

app_modular/apputils/build.gradle

@@ -25,4 +25,5 @@ dependencies {
     compile project(':common')
     compile project(':network')
     compile project(':imageload')
+    compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
 }

app_modular/apputils/src/main/java/com/modular/apputils/activity/SelectNetAcitivty.java

@@ -187,8 +187,8 @@ public class SelectNetAcitivty extends OABaseActivity {
         String fieldKeyLike = null;
         for (int i = 0; i < dbfinds.size(); i++) {
             config = dbfinds.getJSONObject(i);
-            String dbGridField = JSONUtil.getText(config, "dbGridField","ds_dbfindfield");
-            String field = JSONUtil.getText(config, "field","ds_gridfield");
+            String dbGridField = JSONUtil.getText(config, "dbGridField", "ds_dbfindfield");
+            String field = JSONUtil.getText(config, "field", "ds_gridfield");
             if (!StringUtil.isEmpty(dbGridField) && !StringUtil.isEmpty(field)) {
                 if (field.equals(fieldKey)) {
                     fieldKeyLike = dbGridField;
@@ -204,6 +204,13 @@ public class SelectNetAcitivty extends OABaseActivity {
             o = data.getJSONObject(i);
             b = new Bean();
             b.name = JSONUtil.getText(o, fieldKeyLike);
+
+            //TODO 修改显示
+            try {
+                b.showName = getShowName(o);
+            } catch (Exception e) {
+
+            }
             jsonMap = new HashMap<>();
             for (Map.Entry<String, String> e : configMap.entrySet()) {
                 jsonMap.put(e.getValue(), JSONUtil.getText(o, e.getKey()));
@@ -241,6 +248,14 @@ public class SelectNetAcitivty extends OABaseActivity {
         }
     }
 
+    private String getShowName(JSONObject object) throws Exception {
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<String, Object> e : object.entrySet()) {
+            builder.append(e.getValue() + ",");
+        }
+        StringUtil.removieLast(builder);
+        return builder.toString();
+    }
 
     class ListAdapter extends BaseAdapter {
         private List<Bean> models;
@@ -298,7 +313,7 @@ public class SelectNetAcitivty extends OABaseActivity {
                 holer = (ViewHoler) view.getTag();
             }
             Bean bean = models.get(i);
-            holer.name_tv.setText(bean.name);
+            holer.name_tv.setText(bean.getShowName());
             return view;
         }
 
@@ -311,5 +326,10 @@ public class SelectNetAcitivty extends OABaseActivity {
     private class Bean {
         String name;
         String json;
+        String showName;
+
+        public String getShowName() {
+            return StringUtil.isEmpty(showName)?name:showName;
+        }
     }
 }

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

@@ -13,7 +13,7 @@ public class SwitchUtil {
     }
 
     public static boolean showShebeiguanli() {
-        return  BaseConfig.isDebug() && true;
+        return   true;
     }
 
 

app_modular/apputils/src/main/java/com/modular/apputils/utils/playsdk/WxPlay.java

@@ -0,0 +1,66 @@
+package com.modular.apputils.utils.playsdk;
+
+
+import android.content.Context;
+
+import com.modular.apputils.R;
+import com.tencent.mm.opensdk.constants.ConstantsAPI;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.modelmsg.WXTextObject;
+import com.tencent.mm.opensdk.modelpay.PayReq;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+
+/**
+ * Created by Bitlike on 2017/12/25.
+ */
+
+public class WxPlay {
+    private static final String APP_ID = "";
+    private IWXAPI wxApi;
+    private static WxPlay api;
+
+    public static WxPlay api() {
+        if (api == null) {
+            synchronized (WxPlay.class) {
+                if (api == null) {
+                    api = new WxPlay();
+                }
+            }
+        }
+        return api;
+    }
+
+    private WxPlay() {
+
+    }
+
+
+    public void init(Context context) {
+        wxApi = WXAPIFactory.createWXAPI(context, null);
+        wxApi.registerApp(APP_ID);
+    }
+
+
+
+    public void ss(){
+        PayReq request = new PayReq();
+        request.appId = "wxd930ea5d5a258f4f";
+        request.partnerId = "1900000109";
+        request.prepayId= "1101000000140415649af9fc314aa427";
+        request.packageValue = "Sign=WXPay";
+        request.nonceStr= "1101000000140429eb40476f8896f4c9";
+        request.timeStamp= "1398746574";
+        request.sign= "7FFECB600D7157C5AA49810D2D8F28BC2811827B";
+        wxApi.sendReq(request);
+
+    }
+    public void onResp(BaseResp resp){
+        if(resp.getType()== ConstantsAPI.COMMAND_PAY_BY_WX){
+//            Log.d(TAG,"onPayFinish,errCode="+resp.errCode);
+//            AlertDialog.Builderbuilder=newAlertDialog.Builder(this);
+//            builder.setTitle(R.string.app_tip);
+        }
+    }
+
+}

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

@@ -172,7 +172,7 @@ public class DeviceCycleCountActivity extends BaseActivity implements View.OnCli
         Editable editable = mVoiceSearchView.getText();
         if (editable != null && !StringUtil.isEmpty(editable.toString())) {
             String text = editable.toString();
-            condition = "db_code like '" + text + "' or db_inman like '" + text + "'  or db_devtype like '" + text + "' or db_centercode like '" + text + "'";
+            condition = "db_code like '%" + text + "%' or db_inman like '%" + text + "%'  or db_devtype like '%" + text + "%' or db_centercode like '%" + text + "%'";
         }
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/common/list.action")

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

@@ -205,26 +205,22 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
         public List<CycleCountAdd> getModels() {
             return models;
         }
-
-        public void updateValues(int selectPosition, String values) {
-            if (ListUtils.getSize(models) > selectPosition) {
-                models.get(selectPosition).setValues(values);
-                notifyItemChanged(selectPosition);
-            }
-        }
-
         public void updateValues(String message) {
             if (!StringUtil.isEmpty(message) && JSONUtil.validateJSONObject(message)) {
+                LogUtil.i("message="+message);
                 JSONObject object = JSON.parseObject(message);
                 if (models != null) {
-                    for (CycleCountAdd e : models) {
-                        for (Map.Entry<String, Object> map : object.entrySet()) {
-                            if (map.getKey().equals(e.getField()) && map.getValue() != null) {
-                                e.setValues(map.getValue().toString());
-                            }
+                    for (int i=0;i<models.size();i++) {
+                        LogUtil.i("e="+JSON.toJSONString(models.get(i)));
+                        if (object.containsKey(models.get(i).getField())){
+                            LogUtil.i("Field="+models.get(i).getField());
+                            models.get(i).setValues(JSONUtil.getText(object,models.get(i).getField()));
                         }
                     }
                     notifyDataSetChanged();
+                    for (CycleCountAdd e:models){
+                        LogUtil.i(JSON.toJSONString(e));
+                    }
                 }
             }
         }
@@ -312,10 +308,11 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
                 try {
                     if (view.getId() == R.id.valuesEd) {
                         CycleCountAdd model = (CycleCountAdd) view.getTag();
-                        selectPosition = (int) view.getTag(R.id.tag_key);
                         Intent intent = new Intent(ct, SelectActivity.class);
                         intent.putExtra("title", model.getCaption());
                         if (model.getType().equals("C")) {
+                            selectField=model.getField();
+                            LogUtil.i("selectField="+selectField);
                             ArrayList<SelectBean> formBeaans = new ArrayList<>();
                             for (Approval.Data e : model.getDatas()) {
                                 formBeaans.add(new SelectBean(e.display));
@@ -329,18 +326,6 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
                                             .putExtra("caller", "DeviceBatch!Stock")
                                             .putExtra("isForm", true)
                                     , 90);
-//                            HashMap param = new HashMap<>();
-//                            param.put("which", model.getWhich());
-//                            param.put("caller", "DeviceBatch!Stock");
-//                            param.put("field", model.getField());
-//                            param.put("pageSize", 1000);
-//                            Bundle bundle = new Bundle();
-//                            bundle.putSerializable("param", param);
-//                            intent.putExtra("type", 1);
-//                            intent.putExtras(bundle);
-//                            intent.putExtra("key", "datas");
-//                            intent.putExtra("showKey", model.getField());
-//                            intent.putExtra("action", "mobile/common/getDbfind.action");
                         }
 
                     }
@@ -351,18 +336,21 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
         };
     }
 
-    private int selectPosition;
+    private String  selectField;
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        LogUtil.i("selectPosition=" + selectPosition);
-        if (data != null) {
-            if (0x21 == requestCode && popAdapter != null) {
+        if (data != null && popAdapter != null) {
+            if (0x21 == requestCode&&!StringUtil.isEmpty(selectField)) {
                 SelectBean b = data.getParcelableExtra("data");
                 LogUtil.d(JSON.toJSONString(b));
-                if (b == null ) return;
-                popAdapter.updateValues(selectPosition, b.getName());
+                if (b == null) return;
+                Map<String,Object> map=new HashMap<>();
+                LogUtil.i("selectField="+selectField);
+                map.put(selectField,b.getName());
+                selectField=null;
+                popAdapter.updateValues(JSONUtil.map2JSON(map));
             } else if (90 == requestCode) {
                 String json = data.getStringExtra("data");
                 LogUtil.i("json=" + json);

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

@@ -42,7 +42,10 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
+import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
+import com.modular.apputils.activity.SelectNetAcitivty;
 import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
@@ -184,7 +187,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                                     }
                                     endDate_v = data.getValue();
                                 }
-                                if (data.getName().equals("设备编号")){
+                                if (data.getName().equals("设备编号")) {
                                     data.setValue(noCode);
                                 }
                                 data.setGroupId(formGroupId);
@@ -470,10 +473,10 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
                     try {
-                        JSONObject object=JSON.parseObject(result);
-                        va_id = JSONUtil.getInt(object,"dc_id","db_id");
-                        LogUtil.i("va_id="+va_id);
-                        LogUtil.i("result="+result);
+                        JSONObject object = JSON.parseObject(result);
+                        va_id = JSONUtil.getInt(object, "dc_id", "db_id");
+                        LogUtil.i("va_id=" + va_id);
+                        LogUtil.i("result=" + result);
                         judgeApprovers(va_id);
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -568,7 +571,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
             public void run() {
                 if (mContext == null) return;
                 LogUtil.d("当前线程是：" + CommonUtil.isMainThread());
-                LogUtil.i("va_id="+va_id);
+                LogUtil.i("va_id=" + va_id);
                 if (formid == 0) {
                     startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
@@ -637,7 +640,6 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
     int formid;
 
 
-
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.findItem(R.id.oa_signin_set).setVisible(false);
@@ -837,6 +839,10 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
             return mListData;
         }
 
+        public ArrayList<Data> getDatas() {
+            return datas;
+        }
+
         public void setmListData(ArrayList<GroupData> mdata) {
             if (mdata == null) return;
             this.mListData = mdata;
@@ -1012,57 +1018,63 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                             }
 
                             if (data.getType().equals("MF") || data.getType().equals("SF")) {
-                                HashMap param = new HashMap<>();
-                                String[] fields = new String[]{"sa_custname"};
-                                if (caller.equals("StandbyApplication")) {
-                                    fields = new String[]{"sa_custname"};
-                                }
-                                if (caller.equals("MaterielApply")) {
-                                    fields = new String[]{"ama_customer"};
-                                }
-                                param.put("caller", caller);
-                                if (caller.equals("MainTain")) {
-                                    if ("mt_custcode".equals(data.getField())) {
-                                        fields = new String[]{"mt_custname"};
-                                    }
-                                    if ("mt_text1".equals(data.getField())) {
-                                        fields = new String[]{"mt_text2"};
-                                    }
-                                    if ("mt_ckcode".equals(data.getField())) {
-                                        fields = new String[]{"mt_row", "so_custname", "sod_jx", "sod_remark", "sod_unback"};
-                                    }
-                                    if ("mtd_procode".equals(data.getField())) {
-                                        fields = new String[]{"mtd_proname", "mtd_remark", "mtd_unit"};
-                                        param.put("caller", "sProduct");
-                                    }
-
-                                }
-                                param.put("page", "1");
-                                param.put("which", "form");
-                                param.put("condition", "1=1");
-                                param.put("pageSize", "30");
-                                param.put("field", data.getField());
-                                Bundle bundle = new Bundle();
-                                bundle.putSerializable("param", param);
-                                Intent intent = new Intent(ct, SelectActivity.class);
-                                intent.putExtra("type", 1);
-                                if (data.getType().equals("SF")) {
-                                    intent.putExtra("isSingle", true);
-                                } else {
-                                    intent.putExtra("isSingle", false);
-                                }
-
-                                intent.putExtra("reid", R.style.OAThemeMeet);
-                                intent.putExtras(bundle);
-                                intent.putExtra("key", "combdatas");
-                                intent.putExtra("showKey", data.getField());
-                                intent.putExtra("fields", fields);
-                                intent.putExtra("action", "common/dbfind.action");
-                                intent.putExtra("title", data.getName());
-                                intent.putExtra("id", categoryIndex);
-                                intent.putExtra("object", data);
-                                startActivityForResult(intent, categoryIndex);
-
+                                //TODO 这边使用审批的接口
+//                                HashMap param = new HashMap<>();
+//                                String[] fields = new String[]{"sa_custname"};
+//                                if (caller.equals("StandbyApplication")) {
+//                                    fields = new String[]{"sa_custname"};
+//                                }
+//                                if (caller.equals("MaterielApply")) {
+//                                    fields = new String[]{"ama_customer"};
+//                                }
+//                                param.put("caller", caller);
+//                                if (caller.equals("MainTain")) {
+//                                    if ("mt_custcode".equals(data.getField())) {
+//                                        fields = new String[]{"mt_custname"};
+//                                    }
+//                                    if ("mt_text1".equals(data.getField())) {
+//                                        fields = new String[]{"mt_text2"};
+//                                    }
+//                                    if ("mt_ckcode".equals(data.getField())) {
+//                                        fields = new String[]{"mt_row", "so_custname", "sod_jx", "sod_remark", "sod_unback"};
+//                                    }
+//                                    if ("mtd_procode".equals(data.getField())) {
+//                                        fields = new String[]{"mtd_proname", "mtd_remark", "mtd_unit"};
+//                                        param.put("caller", "sProduct");
+//                                    }
+//
+//                                }
+//                                param.put("page", "1");
+//                                param.put("which", "form");
+//                                param.put("condition", "1=1");
+//                                param.put("pageSize", "30");
+//                                param.put("field", data.getField());
+//                                Bundle bundle = new Bundle();
+//                                bundle.putSerializable("param", param);
+//                                Intent intent = new Intent(ct, SelectActivity.class);
+//                                intent.putExtra("type", 1);
+//                                if (data.getType().equals("SF")) {
+//                                    intent.putExtra("isSingle", true);
+//                                } else {
+//                                    intent.putExtra("isSingle", false);
+//                                }
+//
+//                                intent.putExtra("reid", R.style.OAThemeMeet);
+//                                intent.putExtras(bundle);
+//                                intent.putExtra("key", "combdatas");
+//                                intent.putExtra("showKey", data.getField());
+//                                intent.putExtra("fields", fields);
+//                                intent.putExtra("action", "common/dbfind.action");
+//                                intent.putExtra("title", data.getName());
+//                                intent.putExtra("id", categoryIndex);
+//                                intent.putExtra("object", data);
+//                                startActivityForResult(intent, categoryIndex);
+
+                                startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
+                                                .putExtra("fieldKey", data.getField())
+                                                .putExtra("caller", "DeviceBatch!Stock")
+                                                .putExtra("isForm", true)
+                                        , 90);
 
 
                                 isLeave = true;
@@ -1359,6 +1371,28 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                 break;
         }
 
+        if (90 == requestCode && data != null) {
+            String json = data.getStringExtra("data");
+            LogUtil.i("json=" + json);
+            try {
+                paseSelectDbFind(JSON.parseObject(json));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+    private void paseSelectDbFind(JSONObject object) throws Exception {
+        List<Data> tempLists = mAdapter.getDatas();
+        if (!ListUtils.isEmpty(tempLists) && object != null && !object.isEmpty()) {
+            for (Data e : tempLists) {
+                if (object.containsKey(e.getField())) {
+                    e.setValue(JSONUtil.getText(object, e.getField()));
+                }
+            }
+            mAdapter.notifyDataSetChanged();
+        }
     }
 
     private void parseResultByField(Intent data) {
@@ -1996,6 +2030,10 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
      * @author：Arison on 2016/11/21
      */
     public void saveData(String formStore, String gridStore) {
+        if (!NetUtils.isNetWorkConnected(ct)){
+            ToastUtil.showToast(ct,R.string.networks_out);
+            return;
+        }
         if ("{}".equals(formStore) && "{}".equals(gridStore)) {
             ToastMessage("界面字段为空，不能提交！");
             return;

app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryServiceMainActivity.java

@@ -134,7 +134,6 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
     @Override
     protected void onStop() {
         super.onStop();
-        mBanner.stopAutoPlay();
     }
 
     @Override

app_modular/appworks/src/main/res/layout/action_device_cycle_count.xml

@@ -7,6 +7,7 @@
 
     <ImageView
         android:id="@+id/backImg"
+        android:padding="4dp"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:src="@drawable/back" />

app_modular/appworks/src/main/res/layout/device_scan_head.xml

@@ -7,6 +7,7 @@
 
     <ImageView
         android:id="@+id/backImg"
+        android:padding="4dp"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:src="@drawable/back" />
@@ -23,6 +24,8 @@
 
     <RadioGroup
         android:id="@+id/selectRg"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_centerInParent="true"

app_modular/appworks/src/main/res/layout/pop_submit_cycle.xml

@@ -35,7 +35,8 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/popCodeTag"
         android:layout_toRightOf="@id/popCodeTag"
-        android:text="设备编号"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:layout_marginLeft="@dimen/padding"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
@@ -45,7 +46,7 @@
         android:layout_width="80dp"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@id/titleTv"
-        android:layout_below="@id/popCodeTag"
+        android:layout_below="@id/popCodeTv"
         android:layout_marginTop="@dimen/padding"
         android:text="设备名称"
         android:textColor="@color/hintColor"
@@ -56,6 +57,8 @@
         android:layout_width="wrap_content"
         android:layout_marginLeft="@dimen/padding"
         android:layout_height="wrap_content"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:layout_alignTop="@id/popNameTag"
         android:layout_toRightOf="@id/popNameTag"
         android:text="设备名称"
@@ -67,7 +70,7 @@
         android:layout_width="80dp"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@id/titleTv"
-        android:layout_below="@id/popNameTag"
+        android:layout_below="@id/popNameTv"
         android:layout_marginTop="@dimen/padding"
         android:text="设备规格"
         android:textColor="@color/hintColor"
@@ -81,6 +84,8 @@
         android:layout_alignTop="@id/popGuiTag"
         android:layout_toRightOf="@id/popGuiTag"
         android:text="设备规格:"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
@@ -89,7 +94,7 @@
         android:layout_width="80dp"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@id/titleTv"
-        android:layout_below="@id/popGuiTag"
+        android:layout_below="@id/popGuiTv"
         android:layout_marginTop="@dimen/padding"
         android:text="未盘点数量"
         android:textColor="@color/hintColor"
@@ -103,12 +108,14 @@
         android:layout_alignTop="@id/popUnActNumTag"
         android:layout_toRightOf="@id/popUnActNumTag"
         android:text="设备规格"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
 
     <LinearLayout
-        android:layout_below="@id/popUnActNumTag"
+        android:layout_below="@id/popUnActNumTv"
         android:layout_width="match_parent"
         android:paddingLeft="50dp"
         android:paddingRight="50dp"