Browse Source

修改日程相关内容

Bitliker 7 years ago
parent
commit
d409fa15aa

+ 1 - 3
WeiChat/src/main/AndroidManifest.xml

@@ -1068,8 +1068,6 @@
 
         <service android:name="com.core.service.InitializeService" />
 
-
-
         <!-- android:authorities="包名.fileprovider"将“包名”替换为实际包名 -->
         <provider
             android:authorities="com.xzjmyk.pm.activity.fileprovider"
@@ -1078,7 +1076,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/bdp_update_filepaths"/>
+                android:resource="@xml/provider_paths"/>
         </provider>
     </application>
 

+ 11 - 0
WeiChat/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>
+

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Nov 16 09:44:12 CST 2018
+#Tue Nov 20 10:12:04 CST 2018
 debugName=935
-versionName=648
+versionName=649
 debugCode=935
-versionCode=203
+versionCode=204

+ 10 - 7
app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -186,11 +186,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 
         rl_app_update.setOnClickListener(this);
         close_push_rl.setOnClickListener(this);
-        if (BaseConfig.isDebug()||"U0736".equals(CommonUtil.getEmcode())){
+        if (BaseConfig.isDebug() || "U0736".equals(CommonUtil.getEmcode())) {
             close_push_rl.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View view) {
-                    startActivity(new Intent(ct,SelectIpActivity.class));
+                    startActivity(new Intent(ct, SelectIpActivity.class));
                     return false;
                 }
             });
@@ -426,7 +426,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             startActivity(intent);
         } else if (v.getId() == R.id.about_us_rl) {
             startActivity(new Intent(mContext, AboutActivity.class));
-          // startActivity(new Intent("com.modular.work.ContactsListActivity"));
+            // startActivity(new Intent("com.modular.work.ContactsListActivity"));
         } else if (v.getId() == R.id.share_rl) {
             share();
         } else if (v.getId() == R.id.rl_app_update) {
@@ -494,11 +494,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             intent = new Intent(mContext, FlightsActivity.class);
             startActivityForResult(intent, 0x12);
             closePopupWindow();
-        }else if (v.getId()==R.id.face_setting_tv){
+        } else if (v.getId() == R.id.face_setting_tv) {
             intent = new Intent(mContext, FaceManageActivity.class);
             startActivityForResult(intent, 0x13);
             closePopupWindow();
-        }else if (v.getId() == R.id.office_addr_setting_tv) {
+        } else if (v.getId() == R.id.office_addr_setting_tv) {
             startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
             closePopupWindow();
         } else if (v.getId() == R.id.my_rule_setting_tv) {
@@ -756,8 +756,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 
         @Override
         public void onDownloadComplete(String apkPath) {
-            NotifyUtil.cancelAll();
-            BDAutoUpdateSDK.cpUpdateInstall(MyApplication.getInstance(), apkPath);
+            try {
+                NotifyUtil.cancelAll();
+                BDAutoUpdateSDK.cpUpdateInstall(MyApplication.getInstance(), apkPath);
+            } catch (Exception e) {
+            }
         }
 
         @Override

+ 1 - 0
app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -1156,6 +1156,7 @@ public class MessagePresenter implements OnHttpResultListener {
         public void sign(boolean signOk, String message) {
             if (signOk) {
                 VoiceUtils.signVoice(R.raw.voice_sign);
+
             }
             iMessageView.updateSign(message);
         }

+ 9 - 1
app_third/libbdupdatesdk/src/main/AndroidManifest.xml

@@ -36,7 +36,15 @@
         <!-- ↑↑↑ 百度移动统计SDK ↑↑↑ -->
         <!-- android:theme="@style/bdp_update_dialog_style_fullscreen" -->
 
-   
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
     </application>
 
 

+ 10 - 0
app_third/libbdupdatesdk/src/main/res/xml/provider_paths.xml

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