first commit 基本功能整合

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -23,6 +23,7 @@ import com.core.app.Constants;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.widget.view.MyGridView;
+import com.uas.appworks.CRM.erp.activity.DeviceManageActivity;
 import com.uas.appworks.model.bean.WorkMenuBean;
 import com.xzjmyk.pm.activity.R;
 
@@ -125,6 +126,8 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                         if (mOnAddFuncClickListener != null) {
                             mOnAddFuncClickListener.onAddFuncClick(view, position);
                         }
+                    }else if("com.modular.work.DeviceManageActivity".equals(menuActivity)){
+                        context.startActivity(new Intent(context, DeviceManageActivity.class));
                     } else {
                         Intent intent = getWorkIntent(typeListBeen.get(position));
                         if (intent != null) {

app_core/common/src/main/java/com/core/app/ActionBackActivity.java

@@ -22,19 +22,11 @@ public class ActionBackActivity extends StackActivity {
         TAG = this.getClass().getSimpleName();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        ActionBar actionBar = getSupportActionBar();
-//        if (actionBar != null) {
-//            actionBar.setDisplayShowHomeEnabled(true);
-//            actionBar.setDisplayHomeAsUpEnabled(true);
-//        }
         mConfig = MyApplication.getInstance().getConfig();
         mContext = this;
         if (AppConfig.DEBUG) {
@@ -42,6 +34,10 @@ public class ActionBackActivity extends StackActivity {
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
 
     @Override
     public boolean isDestroyed() {
@@ -51,15 +47,6 @@ public class ActionBackActivity extends StackActivity {
         return isDestroyed;
     }
 
-    @Override
-    protected void onDestroy() {
-        isDestroyed = true;
-        mContext = null;
-        if (AppConfig.DEBUG) {
-            Log.e(AppConfig.TAG, TAG + " onDestroy");
-        }
-        super.onDestroy();
-    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
@@ -128,4 +115,15 @@ public class ActionBackActivity extends StackActivity {
         finish();
     }
 
+    @Override
+    protected void onDestroy() {
+        isDestroyed = true;
+        mContext = null;
+        if (AppConfig.DEBUG) {
+            Log.e(AppConfig.TAG, TAG + " onDestroy");
+        }
+        super.onDestroy();
+    }
+
+
 }

app_core/common/src/main/java/com/core/base/BaseActivity.java

@@ -50,7 +50,7 @@ import java.util.Locale;
  *
  * @author Dean Tao
  */
-public abstract class BaseActivity extends ActionBackActivity {
+public  class BaseActivity extends ActionBackActivity {
     public static final String PROMPT_ACTION = "PromptAction";
     public static final String CONTENT = "content";
     private FastVolley mFastVolley;

app_modular/appme/src/main/AndroidManifest.xml

@@ -32,11 +32,11 @@
             android:name=".settings.activity.FeedbackActivity"
             android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="com.modular.main.FeedbackActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.main.FeedbackActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".settings.activity.SelectLanguageActivity"
@@ -54,11 +54,11 @@
             android:name=".pedometer.view.UURanking"
             android:label="@string/ranking"
             android:theme="@style/MainBaseTheme">
-            <intent-filter>
-                <action android:name="com.modular.appme.UURanking" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.appme.UURanking" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".pedometer.view.PersonalPageActivity" />
         <activity
@@ -104,11 +104,11 @@
         <activity
             android:name=".settings.activity.CheckWagesActivity"
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
-            <intent-filter>
-                <action android:name="com.modular.appme.CheckWagesActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.appme.CheckWagesActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".settings.activity.WagesDetailsActivity" />
         <activity android:name=".settings.activity.TableSetActivity" />
@@ -127,10 +127,10 @@
 
             android:launchMode="singleTask">
 
-            <intent-filter>
-                <action android:name="com.uas.appme.settings.activity.FontSizeActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--            <intent-filter>-->
+<!--                <action android:name="com.uas.appme.settings.activity.FontSizeActivity" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
             
         </activity>
     </application>

app_modular/appworks/src/main/AndroidManifest.xml

@@ -11,11 +11,11 @@
         android:supportsRtl="true">
         <activity android:name=".OA.erp.activity.DailydetailsActivity" />
         <activity android:name=".OA.erp.activity.WorkDailyAddActivity">
-            <intent-filter>
-                <action android:name="com.modular.plat.WorkDailyAddActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.plat.WorkDailyAddActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".OA.erp.activity.WorkDailyShowActivity" />
         <activity android:name=".OA.platform.activity.PlatDailyShowActivity" />
@@ -24,43 +24,43 @@
             android:name=".OA.erp.activity.ExpenseReimbursementActivity"
             android:label="@string/Expense_reimbursement"
             android:windowSoftInputMode="adjustPan">
-            <intent-filter>
-                <action android:name="com.modular.oa.ExpenseReimbursementActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.oa.ExpenseReimbursementActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".OA.erp.activity.CommonDocDetailsActivity">
-            <intent-filter>
-                <action android:name="com.modular.form.erp.activity.CommonDocDetailsActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.form.erp.activity.CommonDocDetailsActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".OA.erp.activity.ZeTianDocDetailsActivity">
-            <intent-filter>
-                <action android:name="com.modular.form.erp.activity.ZeTianDocDetailsActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.form.erp.activity.ZeTianDocDetailsActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.erp.activity.form.DataFormDetailActivity"
             android:hardwareAccelerated="false">
-            <intent-filter>
-                <action android:name="com.modular.form.DataFormDetailActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.form.DataFormDetailActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.erp.activity.form.TravelDataFormDetailActivity"
             android:hardwareAccelerated="false">
-            <intent-filter>
-                <action android:name="com.modular.form.TravelDataFormDetailActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.form.TravelDataFormDetailActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".OA.erp.activity.form.DataFormFieldActivity" />
         <activity
@@ -68,20 +68,20 @@
             android:hardwareAccelerated="false"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan">
-            <intent-filter>
-                <action android:name="com.modular.work.OA.erp.activity.form.FormListSelectActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.OA.erp.activity.form.FormListSelectActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.erp.activity.WorkActivity"
             android:label="@string/activity_signing">
-            <intent-filter>
-                <action android:name="com.modular.work.WorkActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.WorkActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.erp.activity.form.WorkLogsActivity"
@@ -102,11 +102,11 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
-            <intent-filter>
-                <action android:name="com.modular.oa.AddMeetingActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.oa.AddMeetingActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.erp.activity.MeetingActivity"
@@ -120,11 +120,11 @@
         <activity android:name=".CRM.erp.activity.DbfindListActivity" />
         <activity android:name=".CRM.erp.activity.DbfindList2Activity" />
         <activity android:name=".CRM.erp.activity.BusinessActivity">
-            <intent-filter>
-                <action android:name="com.modular.crm.BusinessActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.crm.BusinessActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".CRM.erp.activity.BusinessDetailActivty" />
         <activity android:name=".CRM.erp.activity.BusinessDetailInfoActivity" />
@@ -151,11 +151,11 @@
         <activity android:name=".CRM.erp.activity.SearchSelectActivity" />
         <activity android:name=".CRM.erp.activity.CustomerDetailActivity" />
         <activity android:name=".CRM.erp.activity.CustomerListActivity">
-            <intent-filter>
-                <action android:name="com.modular.crm.CustomerListActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.crm.CustomerListActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".CRM.erp.activity.CustomerListSelectActivity" />
         <activity
@@ -182,11 +182,11 @@
         <activity
             android:name=".OA.erp.activity.StatisticsActivity"
             android:label="@string/work_statistics">
-            <intent-filter>
-                <action android:name="com.modular.oa.StatisticsActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.oa.StatisticsActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.erp.activity.ChangeMobileActivity"
@@ -198,31 +198,31 @@
         <activity
             android:name=".OA.erp.activity.MissionActivity"
             android:label="@string/activity_mission_plan">
-            <intent-filter>
-                <action android:name="com.modular.work.MissionActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.MissionActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".CRM.erp.activity.SalesRankingActivity"
             android:label="@string/crmmain_wall_of_fame">
-            <intent-filter>
-                <action android:name="com.modular.crm.SalesRankingActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.crm.SalesRankingActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <!-- 工作汇报 -->
         <activity
             android:name=".OA.erp.activity.WorkReportMenuActivity"
             android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="com.modular.work.WorkReportMenuActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.WorkReportMenuActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.erp.activity.WorkReportAddActivity"
@@ -235,38 +235,38 @@
             android:screenOrientation="portrait"
             android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
-            <intent-filter>
-                <action android:name="com.modular.work.CharitableActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.CharitableActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".OA.platform.activity.CharitSearchActivity" />
         <activity android:name=".OA.platform.activity.JoinCharitActivity" />
 
         <!-- 数据统计，报表查询 -->
         <activity android:name=".datainquiry.activity.ReportStatisticsActivity">
-            <intent-filter>
-                <action android:name="com.modular.company.ReportStatisticsActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.company.ReportStatisticsActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <activity android:name=".datainquiry.activity.ReportStatisticsBiActivity">
-            <intent-filter>
-                <action android:name="com.modular.company.ReportStatisticsBiActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.company.ReportStatisticsBiActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         
         <activity android:name=".datainquiry.activity.DataInquiryActivity">
-            <intent-filter>
-                <action android:name="com.modular.company.DataInquiryActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.company.DataInquiryActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".datainquiry.activity.DataInquiryListActivity"
@@ -284,67 +284,67 @@
 
         <!-- 工作台模块设置页面 -->
         <activity android:name=".activity.WorkModuleSortActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.WorkModuleSortActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.WorkModuleSortActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <!-- 工作台应用设置页面 -->
         <activity android:name=".activity.WorkFuncSetActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.WorkFuncSetActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.WorkFuncSetActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <!-- 产城服务主页面 -->
         <activity android:name=".activity.CityIndustryServiceMainActivity">
-            <intent-filter>
-                <action android:name="com.modular.cityIndustry.CityIndustryServiceMainActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.cityIndustry.CityIndustryServiceMainActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.CityIndustryFuncSetActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.CityIndustryFuncSetActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.CityIndustryFuncSetActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.CommonDataFormActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.CommonDataFormActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.CommonDataFormActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.WorkDataFormActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.WorkDataFormActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.WorkDataFormActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".activity.CommonFormListActivity"
             android:hardwareAccelerated="false"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan">
-            <intent-filter>
-                <action android:name="com.modular.work.CommonFormListActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.CommonFormListActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.CommonCityIndustryDetailsActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.CommonCityIndustryDetailsActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.CommonCityIndustryDetailsActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <!-- 设备管理 -->
@@ -352,21 +352,21 @@
             android:name=".CRM.erp.activity.DeviceManageActivity"
             android:label="@string/title_device_manage"
             android:theme="@style/MainBaseTheme">
-            <intent-filter>
-                <action android:name="com.modular.work.DeviceManageActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.DeviceManageActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".CRM.erp.activity.DeviceMatchActivity"
             android:label="@string/text_device_query_match"
             android:theme="@style/MainBaseTheme">
-            <intent-filter>
-                <action android:name="com.modular.work.DeviceMatchActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.DeviceMatchActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".CRM.erp.activity.ScanDetailActivity"
@@ -396,39 +396,39 @@
             android:name=".OA.platform.activity.BusinessTravelActivity"
             android:label="@string/business_services"
             android:theme="@style/MainBaseTheme">
-            <intent-filter>
-                <action android:name="com.modular.work.BusinessTravelActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.BusinessTravelActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".activity.DeviceQueryActivity"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan">
-            <intent-filter>
-                <action android:name="com.modular.work.DeviceQueryActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.DeviceQueryActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <!-- B2B商务 -->
         <activity
             android:name=".activity.B2BBusinessMainActivity"
             android:hardwareAccelerated="true">
-            <intent-filter>
-                <action android:name="com.modular.work.B2BBusinessMainActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.B2BBusinessMainActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.B2BBusinessLoginActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.B2BBusinessLoginActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.B2BBusinessLoginActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".activity.PublicInquiryListActivity"
@@ -449,20 +449,20 @@
         <activity
             android:name=".activity.CustomerInquiryDetailActivity"
             android:windowSoftInputMode="adjustResize|stateHidden">
-            <intent-filter>
-                <action android:name="com.modular.work.platform.activity.CustomerInquiryDetailActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.platform.activity.CustomerInquiryDetailActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".OA.platform.activity.PurchaseDetailsActivity"
             android:theme="@style/MainBaseTheme">
-            <intent-filter>
-                <action android:name="com.modular.work.platform.activity.PurchaseDetailsActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.platform.activity.PurchaseDetailsActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".activity.CompanyBusinessListActivity"
@@ -472,31 +472,31 @@
         <activity
             android:name=".activity.PublicInquiryQuoteActivity"
             android:windowSoftInputMode="adjustPan|stateHidden">
-            <intent-filter>
-                <action android:name="com.modular.work.platform.activity.PublicInquiryQuoteActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.platform.activity.PublicInquiryQuoteActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <!-- B2B商务end -->
 
 
         <!-- 邀请注册 -->
         <activity android:name=".activity.InviteRegisterActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.InviteRegisterActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.InviteRegisterActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".activity.InviteRegisterMainActivity"
             android:hardwareAccelerated="true">
-            <intent-filter>
-                <action android:name="com.modular.work.InviteRegisterMainActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.InviteRegisterMainActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.InviteRegisterListActivity" />
         <activity android:name=".activity.RegisterDetailActivity" />
@@ -511,31 +511,31 @@
         <activity
             android:name=".activity.ScheduleActivity"
             android:label="@string/my_scheduler">
-            <intent-filter>
-                <action android:name="com.modular.work.ScheduleActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.ScheduleActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <!-- 时间助手 -->
         <activity
             android:name=".activity.TimeHelperActivity"
             android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="com.modular.work.TimeHelperActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.TimeHelperActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.TimeHelperSettingActivity" />
         <activity
             android:name=".crm3_0.activity.CustomerVisitActivity"
             android:label="@string/crm_customer_visit">
-            <intent-filter>
-                <action android:name="com.modular.work.crm3_0.activity.CustomerVisitActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.crm3_0.activity.CustomerVisitActivity" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".crm3_0.activity.CustomerListActivity" />
         <activity android:name=".crm3_0.activity.CustomerContactDetailActivity" />
@@ -543,10 +543,10 @@
         <activity
             android:name=".crm3_0.activity.CustomerManageActivity"
             android:label="客户管理">
-            <intent-filter>
-                <action android:name="com.modular.work.crm3_0.activity.CustomerManageActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.crm3_0.activity.CustomerManageActivity" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".crm3_0.activity.CustomerBillInputActivity"
@@ -561,11 +561,11 @@
             android:launchMode="singleTask"
             android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustPan|stateHidden">
-            <intent-filter>
-                <action android:name="com.modular.work.ContactsListActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.ContactsListActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".crm3_0.activity.ContactsAddActivity" />
         <activity android:name=".crm3_0.activity.ContactsDetialActivity" />
@@ -573,11 +573,11 @@
 
         <!-- 商机管理 -->
         <activity android:name=".activity.businessManage.businessManageHome.BusinessManageHomeActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.BusinessManageHomeActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.BusinessManageHomeActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".activity.businessManage.BusinessRecordListActivity" />
         <activity android:name=".activity.businessManage.BusinessOvertimeListActivity" />
@@ -586,11 +586,11 @@
         <activity android:name=".activity.businessManage.businessStage.BusinessStageActivity" />
 
         <activity android:name=".crm3_0.activity.BillSearchActivity">
-            <intent-filter>
-                <action android:name="com.modular.work.crm3_0.activity.BillSearchActivity" />
+<!--            <intent-filter>-->
+<!--                <action android:name="com.modular.work.crm3_0.activity.BillSearchActivity" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity android:name=".crm3_0.activity.CustomerVisitDetailsActivity" />
         <activity android:name=".crm3_0.activity.CustomerCareListActivity" />

devicemanager/build.gradle

@@ -11,6 +11,9 @@ android {
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "x86", "mips", "x86_64", "mips64"
+        }
     }
 
     buildTypes {

devicemanager/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.yingtang.devicemanager">
 
     <uses-sdk
@@ -106,10 +107,12 @@
         android:name="com.core.app.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/app_model_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        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" />
         <activity
             android:name=".SplashActivity">
@@ -119,6 +122,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <service android:name="com.core.service.InitializeService" />
     </application>
 
 </manifest>

devicemanager/src/main/java/com/yingtang/devicemanager/SplashActivity.java

@@ -1,14 +1,75 @@
 package com.yingtang.devicemanager;
 
+import android.Manifest;
+import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.TextView;
 
+import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
+import com.uas.appworks.CRM.erp.activity.DeviceManageActivity;
 
-public class SplashActivity extends AppCompatActivity {
+
+public class SplashActivity extends BaseActivity implements View.OnClickListener {
+
+    TextView tv_go;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash);
+        tv_go=findViewById(R.id.tv_go);
+        tv_go.setOnClickListener(this);
+        setDefaultUrl();
+        initPermission();
+    }
+
+    private void setDefaultUrl() {
+        CommonUtil.setSharedPreferences(ct, "erp_login", true);
+        CommonUtil.setSharedPreferences(ct, "erp_baseurl", "http://cmityj.gicp.net:8099/ERP/");
+        CommonUtil.setSharedPreferences(ct, "sessionId", "BC028BE4AE77CB7D6E5ED13D3CFF746E");
+        CommonUtil.setSharedPreferences(ct, "erp_username", "YJ268");
+        CommonUtil.setSharedPreferences(ct, "erp_master", "HC_TEST");
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.tv_go:
+                startActivity(new Intent(SplashActivity.this, DeviceManageActivity.class));
+                break;
+        }
+
+    }
+
+
+
+    private void initPermission() {
+        initPermission(1);
+    }
+
+    private void initPermission(int item) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                initPermission(item + 1);
+            }
+        };
+        String permission = null;
+        switch (item) {
+            case 0:
+                permission = android.Manifest.permission.ACCESS_FINE_LOCATION;
+                break;
+            case 1:
+                permission = android.Manifest.permission.RECORD_AUDIO;
+                break;
+            case 2:
+                permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
+                break;
+        }
+        if (item <= 2) {
+            requestPermission(permission, runnable, runnable);
+        }
     }
 }

devicemanager/src/main/res/layout/activity_splash.xml

@@ -4,12 +4,12 @@
     android:background="@color/white"
     android:orientation="vertical">
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="Hello World"
-        android:gravity="center|center_vertical"
+        android:id="@+id/tv_go"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Go DeviceManager"
+        android:layout_gravity="center"
+        android:layout_marginTop="200dp"
         />
 
-
-
 </LinearLayout>

devicemanager/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">DeviceManager</string>
+    <string name="app_model_name">DeviceManager</string>
 </resources>

devicemanager/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>
+

devicemanager/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <external-files-path name="extfiles" path="autoupdatecache/" />
+    <external-cache-path name="extcachs" path="autoupdatecache/" />
+    <cache-path name="intcachs" path="autoupdatecache/" />
+    <external-path
+        name="external_files"
+        path="." />
+</paths>
+