添加注释

WeiChat/src/main/AndroidManifest.xml

@@ -118,6 +118,7 @@
         android:persistent="true"
         android:usesCleartextTraffic="true"
         android:theme="@style/MainBaseTheme"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="icon,label,theme">
 
         <uses-library android:name="org.apache.http.legacy" android:required="false" />

WeiChat/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
+

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

@@ -13,7 +13,6 @@ import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
-import com.core.base.SupportToolBarActivity;
 import com.core.utils.ToastUtil;
 import com.uas.appworks.CRM.erp.adapter.DeviceManageAdapter;
 import com.uas.appworks.CRM.erp.model.DeviceManage;
@@ -49,32 +48,40 @@ public class DeviceManageActivity extends BaseActivity {
                 .setCazz(DeviceQueryActivity.class)
                 .addString(Constants.FLAG.DEVICE_CALLER, "Device")
                 .addString(Constants.FLAG.DEVICE_WHICH_PAGE, Constants.FLAG.DEVICE_FROM_QUERY));
-        //通用配置表单
-
+        //使用申请
         models.add(new DeviceManage(3, R.drawable.ic_use_apply, StringUtil.getMessage(R.string.text_application_use))
                 .setCazz(DeviceDataFormAddActivity.class).addString("caller", "DeviceChange!Use"));
+        //报废申请
         models.add(new DeviceManage(4, R.drawable.ic_scrap_apply, StringUtil.getMessage(R.string.text_scrap_application))
                 .setCazz(DeviceDataFormAddActivity.class).addString("caller", "DeviceChange!Scrap"));
+        //养护管理
         models.add(new DeviceManage(5, R.drawable.ic_maintain_manage, StringUtil.getMessage(R.string.text_maintenance))
                 .setCazz(DeviceBillInputActivity.class)
                 .addString(Constants.Intents.CALLER, "DeviceChange!Maintain"));
+        //故障送检
         models.add(new DeviceManage(6, R.drawable.ic_fault_check, StringUtil.getMessage(R.string.text_fault_inspection))
                 .setCazz(DeviceDataFormAddActivity.class).addString("caller", "DeviceChange!Inspect"));
+        //设备维修
         models.add(new DeviceManage(9, R.drawable.ic_device_repair, StringUtil.getMessage(R.string.text_device_repair))
                 .setCazz(DeviceQueryActivity.class)
                 .addString(Constants.FLAG.DEVICE_CALLER, "DeviceChange!Repair")
                 .addString(Constants.FLAG.DEVICE_WHICH_PAGE, Constants.FLAG.DEVICE_FROM_COMMON));
+        //周期盘点
         models.add(new DeviceManage(7, R.drawable.ic_cycle_count, StringUtil.getMessage(R.string.text_cycle_count))
                 .setCazz(DeviceCycleCountActivity.class));
+        // 需求匹配
         models.add(new DeviceManage(8, R.drawable.ic_require_match, StringUtil.getMessage(R.string.text_device_query_match))
                 .setCazz(DeviceMatchActivity.class));
+        // 设备状态查询
         models.add(new DeviceManage(10, R.drawable.ic_inventory_query, StringUtil.getMessage(R.string.text_inventory_query))
                 .setCazz(DeviceInventoryQueryActivity.class)
                 .addString(Constants.Intents.CALLER, "DeviceAppQuery"));
+        //批量转移
         models.add(new DeviceManage(11, R.drawable.ic_batch_transfer, StringUtil.getMessage(R.string.text_batch_transfer))
                 .setCazz(DeviceBatchTransferActivity.class)
                 .addString(Constants.FLAG.DEVICE_CALLER, "DeviceBatch!Use")
                 .addString(Constants.FLAG.DEVICE_WHICH_PAGE, Constants.FLAG.DEVICE_FROM_COMMON));
+        //统计分析
         models.add(new DeviceManage(12, R.drawable.ic_statistical_analysis, StringUtil.getMessage(R.string.text_statistical_analysis))
                 .setCazz(RealTimeFormActivity.class));
         DeviceManageAdapter adapter = new DeviceManageAdapter(this, models);