RaoMeng 9 rokov pred
rodič
commit
0e08ba302f

+ 1 - 1
WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 3 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SubscribeDetailActivity.java

@@ -29,7 +29,6 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
@@ -130,10 +129,10 @@ public class SubscribeDetailActivity extends BaseActivity {
                         SHARE_MEDIA.WEIXIN_CIRCLE,
                         SHARE_MEDIA.WEIXIN_FAVORITE,
                         SHARE_MEDIA.MORE)
-                        .withTitle("UU互联")
-                        .withText("UU互联 Android客户端" + DeviceInfoUtil.getVersionName(mContext))
+                        .withTitle("UU互联订阅号")
+                        .withText(mSubName)
                         .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
-                        .withTargetUrl("http://www.usoftchina.com/usoft/uas_client.html")
+                        .withTargetUrl(subscribeUrl)
                         .setCallback(CommonUtil.umShareListener)
                         .open();
                 break;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java

@@ -569,7 +569,7 @@ public class DBManager {
     }
 
     /**************************************************************************
-     ************** 已订阅表AllSubs操作  ***************************************
+     ************** 已订阅表MySubs操作  ***************************************
      *************************************************************************/
     public void saveToMySubs(PersonalSubscriptionBean personalSubscriptionBean) {
         String saveSql = "replace into MySubs(subs_id,subs_title,subs_kind,subs_type,subs_applied,subs_master,subs_username) values (?,?,?,?,?,?,?)";

+ 11 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java

@@ -11,6 +11,7 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -27,7 +28,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.SharedUtil;
-import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 
@@ -114,7 +114,6 @@ public class SubscriptionAllFragment extends BaseFragment{
         mPullToRefreshListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                ToastUtil.showToast(getActivity(), "暂不可点击!");
                 mClickedPos = position;
                 Intent intent = new Intent();
                 intent.setClass(getActivity(), SubscribeDetailActivity.class);
@@ -142,9 +141,9 @@ public class SubscriptionAllFragment extends BaseFragment{
                         if (mSubscriptionNumbers.size() == 0) {
                             mAllSubscriptonKindMessages.remove(rbPos);
                             keyStrings.remove(rbPos);
-                            initKeyStrings();
                             if (keyStrings.size() == 0) {
                                 mSubsTypeAdapter.notifyDataSetChanged();
+                                initKeyStrings();
                                 mTypeListView.setVisibility(View.GONE);
                                 mEmptyLayout.showEmpty();
                                 mSubscriptionNumbers.clear();
@@ -153,6 +152,7 @@ public class SubscriptionAllFragment extends BaseFragment{
                                 rbPos = 0;
                                 mTypeListView.setVisibility(View.VISIBLE);
                                 mSubsTypeAdapter.notifyDataSetChanged();
+                                initKeyStrings();
                                 mSubscriptionNumbers.clear();
                                 mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                                 mAllSubscriptionAdapter.notifyDataSetChanged();
@@ -206,9 +206,9 @@ public class SubscriptionAllFragment extends BaseFragment{
                         mDbManager.deleteListFromAllSubs(mAllSubscriptonKindMessages.get(position).getSubscriptionNumbers());
                         mAllSubscriptonKindMessages.remove(position);
                         keyStrings.remove(position);
-                        initKeyStrings();
                         if (keyStrings.size() == 0) {
                             mSubsTypeAdapter.notifyDataSetChanged();
+                            initKeyStrings();
                             mTypeListView.setVisibility(View.GONE);
                             mEmptyLayout.showEmpty();
                             mSubscriptionNumbers.clear();
@@ -217,6 +217,7 @@ public class SubscriptionAllFragment extends BaseFragment{
                             rbPos = 0;
                             mTypeListView.setVisibility(View.VISIBLE);
                             mSubsTypeAdapter.notifyDataSetChanged();
+                            initKeyStrings();
 
                             mSubscriptionNumbers.clear();
                             mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
@@ -290,12 +291,12 @@ public class SubscriptionAllFragment extends BaseFragment{
                     = mDbManager.queryFromAllSubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
             if (dbSubscriptionNumbers == null || dbSubscriptionNumbers.size() == 0) {
                 sendAllSubscriptionRequest();
-//                Toast.makeText(getActivity(), "网络加载", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getActivity(), "网络加载", Toast.LENGTH_SHORT).show();
             } else {
-//                Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
-                initKeyStrings();
+                Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
                 if (keyStrings.size() == 0) {
                     mSubsTypeAdapter.notifyDataSetChanged();
+                    initKeyStrings();
                     mTypeListView.setVisibility(View.GONE);
                     mEmptyLayout.showEmpty();
                     mSubscriptionNumbers.clear();
@@ -303,6 +304,7 @@ public class SubscriptionAllFragment extends BaseFragment{
                 } else {
                     mTypeListView.setVisibility(View.VISIBLE);
                     mSubsTypeAdapter.notifyDataSetChanged();
+                    initKeyStrings();
                     for (int i = 0; i < keyStrings.size(); i++) {
                         AllSubscriptonKindMessage tempSubscriptonKindMessage = new AllSubscriptonKindMessage();
                         List<SubscriptionNumber> tempSubscriptionNumbers = new ArrayList<>();
@@ -409,15 +411,16 @@ public class SubscriptionAllFragment extends BaseFragment{
                     } catch (JSONException e) {
                         e.printStackTrace();
                     }
-                    initKeyStrings();
                     if (keyStrings.size() == 0) {
                         mTypeListView.setVisibility(View.GONE);
+                        initKeyStrings();
 
                         mSubscriptionNumbers.clear();
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     } else {
                         mTypeListView.setVisibility(View.VISIBLE);
                         mSubsTypeAdapter.notifyDataSetChanged();
+                        initKeyStrings();
                         mSubscriptionNumbers.clear();
                         mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                         Log.d("allsubscription:", mSubscriptionNumbers.toString());