提交类型 处理bug

提交内容  详情界面添加附件支持

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

@@ -66,6 +66,7 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.apputils.listener.OnPlayListener;
 import com.modular.apputils.utils.playsdk.AliPlay;
 import com.scwang.smartrefresh.layout.util.DensityUtil;
+import com.uas.appme.other.activity.WorkCardActivity;
 import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
 import com.uas.appme.settings.activity.CheckWagesActivity;
@@ -313,6 +314,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
             }
         });
         findViewById(R.id.my_data_rl).setOnClickListener(this);
+        View workCardRl = findViewById(R.id.workCardRl);
+        if (BaseConfig.isDebug()) {
+            workCardRl.setVisibility(View.VISIBLE);
+            workCardRl.setOnClickListener(this);
+        }
         findViewById(R.id.my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
@@ -496,6 +502,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
     public void onClick(View v) {
         int id = v.getId();
         switch (id) {
+            case R.id.workCardRl:
+                startActivity(new Intent(ct, WorkCardActivity.class));
+                break;
             case R.id.rl_company_change://公司切换
                 if (!NetUtils.isNetWorkConnected(ct)) {
                     showToact(R.string.networks_out);

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

@@ -626,7 +626,44 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/workCardRl"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/selector_item_white_pass"
+            android:paddingLeft="@dimen/padding"
+            android:visibility="gone"
+            android:paddingTop="@dimen/padding">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_alignParentBottom="true"
+                android:background="@color/item_line" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/icon_uu_setting"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="电子工牌"
+                android:textColor="#333333"
+                android:textSize="15sp" />
 
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="8dp"
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
+
+
+        </RelativeLayout>
     </LinearLayout>
 
 </ScrollView>

app_modular/appme/src/main/AndroidManifest.xml

@@ -121,6 +121,7 @@
         <!-- <activity android:name=".settings.activity.PayTestActivity"></activity> -->
 
         <activity android:name=".settings.activity.SystemAdminActivity" />
+        <activity android:name=".other.activity.WorkCardActivity" />
         <activity android:name=".settings.activity.FontSizeActivity"
 
             android:launchMode="singleTask">

app_modular/appme/src/main/java/com/uas/appme/other/activity/WorkCardActivity.java

@@ -0,0 +1,75 @@
+package com.uas.appme.other.activity;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.widget.ImageView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baidu.aip.excep.utils.Base64Util;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
+import com.modular.apputils.listener.OnSmartHttpListener;
+import com.modular.apputils.network.Parameter;
+import com.modular.apputils.network.Tags;
+import com.modular.apputils.utils.UUHttpHelper;
+import com.uas.appme.R;
+
+public class WorkCardActivity extends BaseActivity {
+    private ImageView logoIv;
+    private ImageView headIv;
+
+    private UUHttpHelper mUUHttpHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_work_card);
+        initView();
+    }
+
+    private void initView() {
+        mUUHttpHelper = new UUHttpHelper(CommonUtil.getAppBaseUrl(ct));
+        logoIv = (ImageView) findViewById(R.id.logoIv);
+        headIv = (ImageView) findViewById(R.id.headIv);
+        loadData();
+    }
+
+    private void loadData() {
+        mUUHttpHelper.requestCompanyHttp(new Parameter.Builder()
+                .url("mobile/oa/getLabourCardInfor.action")
+                .addParams("emcode",CommonUtil.getEmcode())
+                , new OnSmartHttpListener() {
+                    @Override
+                    public void onSuccess(int what, String message, Tags tag) throws Exception {
+                        JSONObject object= JSON.parseObject(message);
+                        JSONArray mLabourCardInfors= JSONUtil.getJSONArray(object,"LabourCardInfor");
+                        if (!ListUtils.isEmpty(mLabourCardInfors)) {
+                            handlerData(mLabourCardInfors.getJSONObject(0));
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(int what, String message, Tags tag) throws Exception {
+
+                    }
+                });
+    }
+
+    private void handlerData( JSONObject mLabourCardInfor ){
+        String em_photourl=JSONUtil.getText(mLabourCardInfor,"EM_PHOTOURL");
+        String em_name=JSONUtil.getText(mLabourCardInfor,"EM_NAME");
+        String em_code=JSONUtil.getText(mLabourCardInfor,"EM_CODE");
+        String em_sex=JSONUtil.getText(mLabourCardInfor,"EM_SEX");
+        String em_mobile=JSONUtil.getText(mLabourCardInfor,"EM_MOBILE");
+        String em_position=JSONUtil.getText(mLabourCardInfor,"EM_POSITION");
+        String en_logo=JSONUtil.getText(mLabourCardInfor,"EN_LOGO");
+        Bitmap logoMap = Base64Util.base64ToBitmap(en_logo);
+        if (logoMap!=null){
+            logoIv.setImageBitmap(logoMap);
+        }
+    }
+}

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

@@ -0,0 +1,25 @@
+<?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:orientation="vertical">
+
+
+    <ImageView
+        android:id="@+id/logoIv"
+        android:layout_width="match_parent"
+        android:layout_height="50dp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="深圳优软科技有限公司"
+        android:textSize="20sp" />
+
+    <ImageView
+        android:id="@+id/headIv"
+        android:layout_width="80dp"
+        android:layout_gravity="center"
+        android:layout_height="80dp" />
+</LinearLayout>