提交类型 修复设备管理bug

依需求，设备管理添加查看详情功能

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 25 14:00:40 CST 2017
-debugName=236
+#Tue Dec 26 10:15:22 CST 2017
+debugName=247
 versionName=613
-debugCode=236
+debugCode=247
 versionCode=152

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

@@ -23,6 +23,14 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      } , {
+        "isLocalMenu": true,
+        "menuName": "str_work_charitable_donations",
+        "menuIcon": "ic_work_charitable_donations",
+        "menuActivity": "com.modular.work.CharitableActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

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

@@ -1873,7 +1873,7 @@
 
     <string name="schedule_title_must_input">日程标题为必填项</string>
     <string name="schedule_detail_must_input">日程详情为必填项</string>
-    <string name="not_camera_permission">应用没有获取到权限,请允许打开摄像头权限或到设置中打开摄像头权限</string>
+    <string name="not_camera_permission">摄像头权限被禁用，请到设置中开启权限！</string>
     <string name="give_up">放弃</string>
     <string name="app_time_selecting">选择时间</string>
     <string name="qzone_edit_weekly">编写周报</string>

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

@@ -9,7 +9,7 @@ import com.common.config.BaseConfig;
 public class SwitchUtil {
 
     public static boolean showYiyuanjuan() {
-        return BaseConfig.isDebug() && false;
+        return BaseConfig.isDebug() && true;
     }
 
     public static boolean showShebeiguanli() {

app_modular/appworks/src/main/AndroidManifest.xml

@@ -334,7 +334,8 @@
             android:label="@string/text_scan_device" />
         <activity
             android:name=".CRM.erp.activity.DeviceCycleCountActivity"
-            android:label="@string/title_device_manage" />        <activity
+            android:label="@string/title_device_manage"
+            android:windowSoftInputMode="adjustPan"/>        <activity
             android:name=".CRM.erp.activity.DeviceCycleCountInfoActivity"
             android:label="@string/text_cycle_count" />  <activity
             android:name=".CRM.erp.activity.DeviceDataFormAddActivity"
@@ -342,7 +343,8 @@
             android:name=".CRM.erp.activity.DeviceCycleCountDetailsActivity"
             android:label="@string/title_device_manage" /> <activity
             android:name=".CRM.erp.activity.DeviceCycleCountAddActivity"
-            android:label="@string/text_cycle_count_add" />
+            android:label="@string/text_cycle_count_add"
+        />
         <activity android:name=".OA.platform.activity.BusinessTravelActivity"></activity>
 
         <activity android:name=".activity.DeviceQueryActivity"

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

@@ -215,9 +215,9 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
                         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()));
+                            notifyItemChanged(i);
                         }
                     }
-                    notifyDataSetChanged();
                     for (CycleCountAdd e:models){
                         LogUtil.i(JSON.toJSONString(e));
                     }
@@ -269,8 +269,8 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
             } else {
                 holder.valuesEd.setFocusableInTouchMode(true);
                 holder.valuesEd.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+                holder.valuesEd.addTextChangedListener(new TextChangListener(holder, position));
             }
-            holder.valuesEd.addTextChangedListener(new TextChangListener(holder, position));
         }
 
         @Override

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

@@ -1018,7 +1018,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                             }
 
                             if (data.getType().equals("MF") || data.getType().equals("SF")) {
-                                //TODO 这边使用审批的接口
+
 //                                HashMap param = new HashMap<>();
 //                                String[] fields = new String[]{"sa_custname"};
 //                                if (caller.equals("StandbyApplication")) {
@@ -1069,10 +1069,10 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
 //                                intent.putExtra("id", categoryIndex);
 //                                intent.putExtra("object", data);
 //                                startActivityForResult(intent, categoryIndex);
-
+                                //TODO 这边使用审批的接口
                                 startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                 .putExtra("fieldKey", data.getField())
-                                                .putExtra("caller", "DeviceBatch!Stock")
+                                                .putExtra("caller", caller)
                                                 .putExtra("isForm", true)
                                         , 90);
 

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

@@ -106,7 +106,7 @@ public class DeviceManageActivity extends BaseActivity {
                     if (bundle.getInt(CodeUtils.RESULT_TYPE) == CodeUtils.RESULT_SUCCESS) {
                         String result = bundle.getString(CodeUtils.RESULT_STRING);
                         Log.d("scanurl", result);
-                        ToastUtil.showToast(ct, result);
+//                        ToastUtil.showToast(ct, result);
                         startActivityForResult(new Intent(ct, ScanDetailActivity.class).putExtra("decode", result), 0x22);
                     }
                 }

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

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -242,6 +243,7 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
     }
 
     private void handleData(String message) throws Exception {
+        LogUtil.prinlnLongMsg("gongpengming","message="+message);
         JSONObject json = JSON.parseObject(message);
         boolean success = JSONUtil.getBoolean(json, "success");
         JSONObject object = JSONUtil.getJSONObject(json, "data");
@@ -336,6 +338,13 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
                 case "LOSSED":
                     return "已盘亏";
             }
+        }else if ("datefield".equals(type) ){
+            try{
+                long time=Long.valueOf(values);
+                return DateFormatUtil.long2Str(time,DateFormatUtil.YMD);
+            }catch (Exception e){
+
+            }
         }
         return values;
     }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -66,21 +67,12 @@ public class BusinessTravelActivity extends BaseActivity {
 
 
     public void loadData(int page) {
-        if (1 == 1) {
-            try {
-                handlerData(TestStr.FEEPLEASE);
-                mRefreshLayout.stopRefresh();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } else {
             if (!mRefreshLayout.isRefreshing()) {
                 progressDialog.show();
             }
             httpClient.Api().send(new HttpClient.Builder()
-                    .url("mobile/getFeePlease.action")
+                    .url("mobile/getBussinessTrip.action")
                     .add("emcode", CommonUtil.getEmcode())
-                    .add("page", page)
                     .header("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
                     .method(Method.GET)
                     .build(), new ResultSubscriber<>(new ResultListener<Object>() {
@@ -100,8 +92,6 @@ public class BusinessTravelActivity extends BaseActivity {
                     progressDialog.dismiss();
                 }
             }));
-        }
-
     }
 
     private void handlerData(String message) throws Exception {
@@ -119,10 +109,16 @@ public class BusinessTravelActivity extends BaseActivity {
                 models.add(new BusinessTravel(reimbursements.getJSONObject(i)));
             }
         }
+
         setAdapter(models);
     }
 
     private void setAdapter(List<BusinessTravel> models) {
+        if (BaseConfig.isDebug()){
+            if (ListUtils.isEmpty(models)){
+
+            }
+        }
         if (mAdapter == null) {
             mAdapter = new BusinessTravelAdapter(ct, models, new BusinessTravelAdapter.OnItemClickListener() {
                 @Override

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/ActivityAdapter.java

@@ -1,6 +1,7 @@
 package com.uas.appworks.OA.platform.adapter;
 
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -8,6 +9,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
@@ -15,6 +17,10 @@ import com.common.data.StringUtil;
 import com.common.data.TextUtil;
 import com.core.app.MyApplication;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
+import com.nostra13.universalimageloader.core.imageaware.ImageAware;
+import com.nostra13.universalimageloader.core.imageaware.ImageViewAware;
 import com.uas.appworks.OA.platform.config.ImageConfig;
 import com.uas.appworks.OA.platform.model.CharitActModel;
 import com.uas.appworks.R;
@@ -81,7 +87,36 @@ public class ActivityAdapter extends BaseAdapter {
         } else {
             hoder = (ViewHoder) view.getTag();
         }
-        ImageLoader.getInstance().displayImage(model.getActImg(), hoder.contantImg, ImageConfig.getCharitableImageOptions());
+        final ViewHoder finalHoder=hoder;
+        final String  url=model.getActImg();
+        finalHoder.contantImg.setTag(url);
+        ImageLoader.getInstance().displayImage(model.getActImg(), finalHoder.contantImg, ImageConfig.getCharitableImageOptions(), new ImageLoadingListener() {
+            @Override
+            public void onLoadingStarted(String s, View view) {
+                LogUtil.i("onLoadingStarted view instanceof ImageView");
+                finalHoder.contantImg.setImageResource(R.drawable.charitable_def_image);
+            }
+
+            @Override
+            public void onLoadingFailed(String s, View view, FailReason failReason) {
+                LogUtil.i("onLoadingFailed view instanceof ImageView");
+                finalHoder.contantImg.setImageResource(R.drawable.charitable_def_image);
+            }
+
+            @Override
+            public void onLoadingComplete(String s, View view, Bitmap bitmap) {
+                LogUtil.i("onLoadingComplete view instanceof ImageView");
+                if (finalHoder.contantImg.getTag()!=null&& url.equals(finalHoder.contantImg.getTag())){
+                    finalHoder.contantImg.setImageBitmap(bitmap);
+                }
+            }
+
+            @Override
+            public void onLoadingCancelled(String s, View view) {
+                LogUtil.i("onLoadingCancelled view instanceof ImageView");
+                finalHoder.contantImg.setImageResource(R.drawable.charitable_def_image);
+            }
+        });
         StringBuilder str = new StringBuilder("");
         if (!ListUtils.isEmpty(model.getAwards())) {
             for (CharitActModel.AwardsBean b : model.getAwards()) {
@@ -124,4 +159,28 @@ public class ActivityAdapter extends BaseAdapter {
         TextView titleTv;
         TextView subTv;
     }
+
+//    private ImageLoadingListener imageLoadingListener = new ImageLoadingListener() {
+//        @Override
+//        public void onLoadingStarted(String s, View view) {
+//            if (view instanceof ImageView) {
+//                LogUtil.i("onLoadingStarted view instanceof ImageView");
+//            }
+//        }
+//
+//        @Override
+//        public void onLoadingFailed(String s, View view, FailReason failReason) {
+//            LogUtil.i("onLoadingFailed view instanceof ImageView");
+//        }
+//
+//        @Override
+//        public void onLoadingComplete(String s, View view, Bitmap bitmap) {
+//            LogUtil.i("onLoadingComplete view instanceof ImageView");
+//        }
+//
+//        @Override
+//        public void onLoadingCancelled(String s, View view) {
+//            LogUtil.i("onLoadingCancelled view instanceof ImageView");
+//        }
+//    };
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/ActivityFragment.java

@@ -219,7 +219,6 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
             allModels = new ArrayList<>();
         }
         setAdapter(status, allModels);
-        PreferenceUtils.putString("activitys", message);
     }
 
     private void handlerData(final String message, final String status) throws Exception {

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

@@ -24,8 +24,8 @@
 
     <RadioGroup
         android:id="@+id/selectRg"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_centerInParent="true"