提交类型 新功能修改

提交内容  修改部分bug

WeiChat/src/main/res/drawable/oa_checkbox.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/oa_clicked" />
-    <item android:state_selected="true" android:drawable="@drawable/oa_clicked"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/oa_clicked"></item>
-    <item android:state_checked="false" android:drawable="@drawable/oa_notclick" />
+    <item android:state_checked="true" android:drawable="@drawable/ic_oa_cb_click_ed" />
+    <item android:state_selected="true" android:drawable="@drawable/ic_oa_cb_click_ed"></item>
+    <item android:state_pressed="true" android:drawable="@drawable/ic_oa_cb_click_ed"></item>
+    <item android:state_checked="false" android:drawable="@drawable/ic_oa_cb_click_un" />
 </selector>

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

@@ -11,11 +11,11 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="180dp">
+            android:layout_height="170dp">
 
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="140dp"
+                android:layout_height="130dp"
                 android:background="@drawable/bg_me_top" />
 
 

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

@@ -21,15 +21,15 @@
         <!--android:background="@color/item_color1"-->
         <FrameLayout
             android:id="@+id/msgs_area"
-            android:layout_width="57dp"
+            android:layout_width="53dp"
             android:layout_height="65dp"
             android:layout_centerVertical="true">
 
 
             <ImageView
                 android:id="@+id/msgs_img"
-                android:layout_width="@dimen/item_img_height"
-                android:layout_height="@dimen/item_img_width"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:layout_gravity="center_vertical"
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
@@ -56,28 +56,29 @@
             android:layout_marginLeft="3dp"
             android:layout_toRightOf="@id/msgs_area"
             android:gravity="center_vertical">
-
             <TextView
-                android:id="@+id/msgs_title_tv"
+                android:id="@+id/msgs_time_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:textColor="@color/text_main"
+                android:textColor="@color/text_hine"
                 android:textSize="16sp"
-                android:text="通知公告"
-                />
-
+                android:text="刚刚"/>
             <TextView
-                android:id="@+id/msgs_time_tv"
-                android:layout_width="wrap_content"
+                android:id="@+id/msgs_title_tv"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
                 android:ellipsize="end"
+                android:layout_toLeftOf="@id/msgs_time_tv"
                 android:singleLine="true"
-                android:textColor="@color/text_hine"
+                android:textColor="@color/text_main"
                 android:textSize="16sp"
-                android:text="刚刚"/>
+                android:text="通知公告"
+                />
+
+
 
             <TextView
                 android:id="@+id/msgs_content_tv"

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

@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:background="@color/white"
         android:maxHeight="180dp"
+        android:paddingRight="@dimen/padding"
         android:minHeight="50dp">
 
         <TextView
@@ -56,7 +57,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginRight="10dp"
             android:src="@drawable/oa_next"
             android:visibility="gone" />
     </LinearLayout>

app_core/common/src/main/res/drawable/bg_enclosure.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <padding
+        android:bottom="@dimen/paddingMin"
+        android:left="@dimen/paddingMin"
+        android:right="@dimen/paddingMin"
+        android:top="@dimen/paddingMin" />
+    <solid android:color="#E4F0F9"/>
+</shape>

app_core/common/src/main/res/drawable/bg_transparent_bule.xml

@@ -9,15 +9,12 @@
                 android:bottomRightRadius="4dp"
                 android:bottomLeftRadius="4dp">
             </corners>
-            <stroke
-                android:width="1dp"
-                android:color="#999999">
-            </stroke>
+
             <solid
                 android:color="@color/titleBlue">
             </solid>
         </shape>
     </item>
-    <item android:drawable="@null"/>
+    <item android:drawable="@color/transparent"/>
 
 </selector>

app_core/common/src/main/res/drawable/ic_oa_cb_click_ed.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#33A2EE"
+        android:pathData="M1.79,513.11c0,282.35 228.9,511.25 511.25,511.25s511.25,-228.9 511.25,-511.25c0,-282.35 -228.9,-511.25 -511.25,-511.25 -282.35,0 -511.25,228.9 -511.25,511.25z" />
+</vector>

app_core/common/src/main/res/drawable/ic_oa_cb_click_un.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#D0D0D0"
+        android:pathData="M510.96,70.33c-243.33,0 -440.6,197.24 -440.6,440.6 0,243.32 197.26,440.6 440.6,440.6 243.32,0 440.6,-197.27 440.6,-440.6 -0,-243.35 -197.28,-440.6 -440.6,-440.6v0zM510.96,883.83c-205.94,0 -372.9,-166.94 -372.9,-372.9 0,-205.96 166.96,-372.9 372.9,-372.9 205.96,0 372.9,166.94 372.9,372.9 0,205.95 -166.94,372.9 -372.9,372.9v0zM510.96,883.83z" />
+</vector>

app_core/common/src/main/res/drawable/oa_checkbox.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/oa_clicked" />
-    <item android:state_selected="true" android:drawable="@drawable/oa_clicked"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/oa_clicked"></item>
-    <item android:state_checked="false" android:drawable="@drawable/oa_notclick" />
+    <item android:state_checked="true" android:drawable="@drawable/ic_oa_cb_click_ed" />
+    <item android:state_selected="true" android:drawable="@drawable/ic_oa_cb_click_ed"></item>
+    <item android:state_pressed="true" android:drawable="@drawable/ic_oa_cb_click_ed"></item>
+    <item android:state_checked="false" android:drawable="@drawable/ic_oa_cb_click_un" />
 </selector>

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

@@ -50,15 +50,20 @@
                 android:textSize="12sp" />
         </RadioGroup>
 
-        <TextView
-            android:id="@+id/tagTv"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:layout_toLeftOf="@id/valuesRG"
-            android:lines="1"
-            android:text="tagTv"
-            android:textColor="#1084D1"
-            android:textSize="13sp" />
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tagTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:text="tagTv"
+                android:textColor="@color/text_bule"
+                android:textSize="13sp" />
+        </FrameLayout>
+
 
     </RelativeLayout>
 

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

@@ -44,6 +44,7 @@
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#333333</color>
     <color name="text_hine">#575757</color>
+    <color name="text_bule">#1084D1</color>
 
     <color name="bar_pass">#0096e6</color>
     <color name="bar_color">#e6e6e6</color>

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

@@ -95,7 +95,6 @@
     </array>
 
 
-    -
     <array name="fileEndingText">
 
         <item>.txt</item>

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -47,7 +47,6 @@ import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
-import com.lidroid.xutils.ViewUtils;
 import com.modular.appmessages.R;
 import com.modular.appmessages.adapter.ApprovalAdapter;
 import com.modular.appmessages.adapter.CrashLinearLayoutManager;
@@ -186,10 +185,8 @@ public class ApprovalActivity extends SupportToolBarActivity implements IApprova
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_approval);
-        ViewUtils.inject(this);
         initView();
     }
 

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/ApprovalAdapter.java

@@ -227,7 +227,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         holder.keyTv.setText(approval.getCaption());
         holder.statusIV.setImageResource(reId);
         AvatarHelper.getInstance().display(String.valueOf(approval.getId()), holder.handIv, true, false);
-        if (reId == R.drawable.daishenpi && isApprovaling&&status.startsWith("等待")&&status.endsWith("审批")) {
+        if (reId == R.drawable.daishenpi && isApprovaling && status.startsWith("等待") && status.endsWith("审批")) {
             holder.changeUser.setVisibility(View.VISIBLE);
             holder.changeUser.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -301,7 +301,9 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         if (approvals.get(position).getType() == Approval.ENCLOSURE) {//附件列表
             holder.line.setVisibility(View.GONE);
             holder.padding.setVisibility(View.GONE);
-            holder.nameTv.setText(Html.fromHtml("&nbsp&nbsp&nbsp&nbsp&nbsp " + "<u>" + name + "</u>"));
+            holder.nameTv.setBackgroundResource(R.drawable.bg_enclosure);
+            holder.nameTv.setTextColor(ct.getResources().getColor(R.color.text_main));
+            holder.nameTv.setText(Html.fromHtml("&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp" + " " + name + " &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp"));
             holder.nameTv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -309,6 +311,8 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 }
             });
         } else {
+            holder.nameTv.setTextColor(ct.getResources().getColor(R.color.text_bule));
+            holder.nameTv.setBackgroundResource(0);
             if (ListUtils.getSize(approvals) > position + 1 && position > 0) {//标题
                 if (approvals.get(position + 1).getType() == approvals.get(position - 1).getType()) {
                     holder.line.setVisibility(View.VISIBLE);
@@ -317,9 +321,9 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     holder.line.setVisibility(View.GONE);
                     holder.padding.setVisibility(View.VISIBLE);
                     if (name.trim().equals("附件")) {
-                        holder.nameTv.setTextColor(ct.getResources().getColor(R.color.text_normal));
+                        holder.nameTv.setTextColor(ct.getResources().getColor(R.color.text_bule));
                     } else {
-                        holder.nameTv.setTextColor(ct.getResources().getColor(R.color.titleBlue));
+                        holder.nameTv.setTextColor(ct.getResources().getColor(R.color.text_bule));
                         if (!TextUtils.isEmpty(approvals.get(position).getValues())) {
                             holder.valuesRG.setOnCheckedChangeListener(null);
                             if (approvals.get(position).getValues().equals(Approval.VALUES_YES)) {
@@ -350,7 +354,6 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         final CustomProgressDialog progressDialog = CustomProgressDialog.createDialog(ct);
         progressDialog.setTitile("正在预览");
         progressDialog.setMessage("正在生成附件预览，请勿关闭程序");
-        LogUtil.i("gotoReadEnclosure");
         if (!StringUtil.isEmpty(approval.getCaption())) {
             if (isImage(approval.getCaption())) {
                 Intent intent = new Intent("com.modular.tool.SingleImagePreviewActivity");
@@ -378,6 +381,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             @Override
             public void onSuccess(final File file) {
                 LogUtil.i("onSuccess=" + (file == null ? "" : file.getPath()));
+                LogUtil.i("file isfile=" + (file.isFile()));
                 if (ct != null) {
                     if (progressDialog != null) {
                         progressDialog.dismiss();

app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/ApprovalListFragment.java

@@ -266,7 +266,7 @@ public class ApprovalListFragment extends ViewPagerLazyFragment implements OnSma
                     } else if (jpStatus.equals("未通过")) {
                         statusColor = R.color.done_approval;
                     } else if (jpStatus.equals("已审批")) {
-                        statusColor = R.color.titleBlue;
+                        statusColor = R.color.done_approval;
                     }
                 }
                 break;

app_modular/apputils/src/main/java/com/modular/apputils/network/FileDownloader.java

@@ -4,10 +4,8 @@ import android.os.Environment;
 import android.text.TextUtils;
 import android.widget.Toast;
 
-import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.core.app.MyApplication;
-import com.core.net.ProgressDownloader;
 import com.core.net.ProgressResponseBody;
 import com.me.network.app.http.ssl.TrustAllCerts;
 import com.me.network.app.http.ssl.TrustAllHostnameVerifier;
@@ -99,6 +97,7 @@ public class FileDownloader {
                 .hostnameVerifier(new TrustAllHostnameVerifier())
                 .build();
     }
+
     public SSLSocketFactory createSSLSocketFactory() {
         SSLSocketFactory ssfFactory = null;
         try {
@@ -109,6 +108,7 @@ public class FileDownloader {
         }
         return ssfFactory;
     }
+
     // startsPoint指定开始下载的点
     public void download(final long startsPoint) {
         call = newCall(startsPoint);
@@ -141,6 +141,7 @@ public class FileDownloader {
             if (fileNames != null && fileNames.length > 1) {
                 String fileName = fileNames[1];
                 if (!TextUtils.isEmpty(fileName)) {
+                    fileName= fileName.substring(1,fileName.length()-1);
                     if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
                         final String path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/uu/download";
                         File file = new File(path);

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

@@ -170,7 +170,8 @@ public class OpenFilesUtils {
             LogUtil.i("currentPath=" + currentPath.getPath());
             LogUtil.i("getName=" + currentPath.getName());
             if (currentPath != null && currentPath.isFile()) {
-                String fileName = currentPath.toString();
+                String fileName = currentPath.getName();
+                LogUtil.i("fileName=" + fileName);
                 Intent intent;
                 if (checkEndsWithInStringArray(fileName, ct.getResources().
                         getStringArray(R.array.fileEndingImage))) {
@@ -195,7 +196,9 @@ public class OpenFilesUtils {
                     ct.startActivity(intent);
                 } else if (checkEndsWithInStringArray(fileName, ct.getResources().
                         getStringArray(R.array.fileEndingText))) {
+                    LogUtil.i("fileEndingTextfileEndingTextfileEndingText" );
                     intent = getTextFileIntent(currentPath);
+                    LogUtil.i("intent is null"+(intent==null) );
                     ct.startActivity(intent);
                 } else if (checkEndsWithInStringArray(fileName, ct.getResources().
                         getStringArray(R.array.fileEndingPdf))) {

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

@@ -37,6 +37,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.RegexUtil;
 import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;

app_third/recyclerlibrary/src/main/java/com/module/recyclerlibrary/ui/refresh/EmptyRecyclerView.java

@@ -76,6 +76,7 @@ public class EmptyRecyclerView extends FrameLayout {
             public void run() {
                 addView(emptyView);
                 addView(mRecyclerView);
+                checkIfEmpty();
             }
         });
     }
@@ -139,8 +140,9 @@ public class EmptyRecyclerView extends FrameLayout {
                 mRecyclerView.setVisibility(VISIBLE);
                 emptyView.setVisibility(GONE);
             }
-
-
+        } else {
+            mRecyclerView.setVisibility(VISIBLE);
+            emptyView.setVisibility(GONE);
         }
     }