提交合并developer

WeiChat/src/main/AndroidManifest.xml

@@ -914,7 +914,7 @@
 
         <activity
             android:name=".ui.platform.pageforms.ComplaintDetailActivity"
-            android:label="申诉单" />
+            android:label="@string/complaint_doc" />
         <activity
             android:name=".ui.erp.activity.oa.FlihtsDateSelectActivity"
             android:label="@string/work_day" />
@@ -924,8 +924,6 @@
             android:name=".ui.erp.activity.oa.AddContactsActivity"
             android:label="@string/add_contacts" />
         <activity android:name=".ui.erp.activity.oa.AddVisitingReportActivity"></activity>
-        <activity android:name=".ui.platform.pageforms.ComplaintDetailActivity"
-            android:label="@string/complaint_doc"/>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -633,9 +633,8 @@ public class FormDetailActivity extends BaseActivity {
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());
                     }
                 }
-                Log.i("flhdoc_detail_key",JSON.toJSONString(doc_detail_key));
             }
-
+            Log.i("flhdoc_detail_key",JSON.toJSONString(doc_detail_key));
             mymainAdapter.setDoc_key(doc_key);
             mymainAdapter.setDoc_value(doc_value);
             mymainAdapter.notifyDataSetChanged();
@@ -645,8 +644,8 @@ public class FormDetailActivity extends BaseActivity {
                 mySecondOutAdapter.setDoc_detail_value(doc_detail_value);
                 mySecondOutAdapter.notifyDataSetChanged();
             }
-            Log.i("doc_key,doc_value,mkeyValue,detail_id", doc_key + "," + doc_value + "," + mkeyValue + "," + detail_id);
-            Log.i("doc_detail_key,doc_detail_value", doc_detail_key + ":" + doc_detail_value);
+            LogUtil.prinlnLongMsg("doc_key,doc_value,mkeyValue,detail_id", doc_key + "," + doc_value + "," + mkeyValue + "," + detail_id);
+            LogUtil.prinlnLongMsg("doc_detail_key,doc_detail_value", doc_detail_key + ":" + doc_detail_value);
         }
     }