删除多余的文件

陈硕
1 parent c77a0d75
Showing 55 changed files with 23 additions and 583 deletions
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/user/activity/LoginActivity.java
app/src/main/java/com/cnlive/gundam/user/fragment/LoginFragment.java
app/src/main/java/com/cnlive/gundam/user/model/ActiveInfo.java
app/src/main/java/com/cnlive/gundam/user/model/ChannelInfoModel.java
app/src/main/java/com/cnlive/gundam/user/model/PersonalDate.java
app/src/main/res/layout/fragment_login.xml
app/src/main/res/layout/user_fragment.xml
user/src/main/res/drawable-hdpi/ic_header.png
user/src/main/res/drawable-hdpi/user_micro_blog.png
user/src/main/res/drawable-hdpi/user_micro_blog_click.png
user/src/main/res/drawable-hdpi/user_qq.png
user/src/main/res/drawable-hdpi/user_qq_click.png
user/src/main/res/drawable-hdpi/user_wechat.png
user/src/main/res/drawable-hdpi/user_wechat_click.png
user/src/main/res/drawable-xhdpi/ic_web_forward.png
user/src/main/res/drawable-xhdpi/ic_web_forward_pressed.png
user/src/main/res/drawable-xhdpi/list_item_image_load_fail.png
user/src/main/res/drawable-xxhdpi/about_us.9.png
user/src/main/res/drawable-xxhdpi/about_us_icon.png
@@ -74,8 +74,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onResume() {
         super.onResume();
-        notifyUI();
-
+        if (UserService.getInstance(getActivity()).getActiveAccountInfo().getUid() != 0) notifyUI();
     }
  
     private void notifyUI() {
@@ -34,9 +34,7 @@ public class LoginActivity extends AppCompatActivity {
         // TODO Auto-generated method stub
         if(ev.getAction()== MotionEvent.ACTION_DOWN){
  
-            // 获得当前得到焦点的View，一般情况下就是EditText（特殊情况就是轨迹求或者实体案件会移动焦点）
             View v=getCurrentFocus();
-
             if(DevilUtil.isShouldHideInput(v,ev)){
                 InputMethodManager im=(InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
                 DevilUtil.hideSoftInput(v.getWindowToken(),im);
@@ -34,7 +34,6 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
     public static DataEntity data;
  
     private Account account;//密码登录的account
-    private Account account1;//第三方登录的account
  
     //跳转页面的对话框
     private ProgressDialog dialog;
@@ -157,7 +156,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
                     data = userData.getData();
  
                     UserService userService = UserService.getInstance(getActivity());
-                    userService.setUserInfo(account, data);
+                    userService.setUserInfo(account,data);
                     //userService.isAutoLogin();
                     userService.autoLogin(binding.edtLoginNumber.toString(), binding.edtInputPassward.getText().toString(), data);
  
-package com.cnlive.gundam.user.model;
-
-
-import java.io.Serializable;
-
-/**
- * Created by Lynn on 5/25/2017.
- */
-
-public class ActiveInfo implements Serializable {
-    private int totalCount;
-    private int nextCursor;
-    private int preCursor;
-    private String activityId;
-    private String activityName;
-    private int activityStatus;
-    private int isHorizontalScreen;
-    private String channelId;
-    private String createTime;
-    private String startTime;
-    private String endTime;
-    private String coverImgUrl;
-    private String activityCategory;
-    private Object extensions;
-    private String rates;
-
-    public ActiveInfo() {
-    }
-
-    public ActiveInfo(int totalCount, int nextCursor, int preCursor, String activityId, String activityName, int activityStatus, int isHorizontalScreen, String channelId, String createTime, String startTime, String endTime, String coverImgUrl, String activityCategory, Object extensions, String rates) {
-        this.totalCount = totalCount;
-        this.nextCursor = nextCursor;
-        this.preCursor = preCursor;
-        this.activityId = activityId;
-        this.activityName = activityName;
-        this.activityStatus = activityStatus;
-        this.isHorizontalScreen = isHorizontalScreen;
-        this.channelId = channelId;
-        this.createTime = createTime;
-        this.startTime = startTime;
-        this.endTime = endTime;
-        this.coverImgUrl = coverImgUrl;
-        this.activityCategory = activityCategory;
-        this.extensions = extensions;
-        this.rates = rates;
-    }
-
-    public int getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public int getNextCursor() {
-        return nextCursor;
-    }
-
-    public void setNextCursor(int nextCursor) {
-        this.nextCursor = nextCursor;
-    }
-
-    public int getPreCursor() {
-        return preCursor;
-    }
-
-    public void setPreCursor(int preCursor) {
-        this.preCursor = preCursor;
-    }
-
-    public String getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(String activityId) {
-        this.activityId = activityId;
-    }
-
-    public String getActivityName() {
-        return activityName;
-    }
-
-    public void setActivityName(String activityName) {
-        this.activityName = activityName;
-    }
-
-    public int getActivityStatus() {
-        return activityStatus;
-    }
-
-    public void setActivityStatus(int activityStatus) {
-        this.activityStatus = activityStatus;
-    }
-
-    public int getIsHorizontalScreen() {
-        return isHorizontalScreen;
-    }
-
-    public void setIsHorizontalScreen(int isHorizontalScreen) {
-        this.isHorizontalScreen = isHorizontalScreen;
-    }
-
-    public String getChannelId() {
-        return channelId;
-    }
-
-    public void setChannelId(String channelId) {
-        this.channelId = channelId;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getCoverImgUrl() {
-        return coverImgUrl;
-    }
-
-    public void setCoverImgUrl(String coverImgUrl) {
-        this.coverImgUrl = coverImgUrl;
-    }
-
-    public String getActivityCategory() {
-        return activityCategory;
-    }
-
-    public void setActivityCategory(String activityCategory) {
-        this.activityCategory = activityCategory;
-    }
-
-    public Object getExtensions() {
-        return extensions;
-    }
-
-    public void setExtensions(Object extensions) {
-        this.extensions = extensions;
-    }
-
-    public String getRates() {
-        return rates;
-    }
-
-    public void setRates(String rates) {
-        this.rates = rates;
-    }
-
-    @Override
-    public String toString() {
-        return "ActiveInfo{" +
-                "totalCount=" + totalCount +
-                ", nextCursor=" + nextCursor +
-                ", preCursor=" + preCursor +
-                ", activityId='" + activityId + '\'' +
-                ", activityName='" + activityName + '\'' +
-                ", activityStatus=" + activityStatus +
-                ", isHorizontalScreen=" + isHorizontalScreen +
-                ", channelId='" + channelId + '\'' +
-                ", createTime='" + createTime + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", endTime='" + endTime + '\'' +
-                ", coverImgUrl='" + coverImgUrl + '\'' +
-                ", activityCategory='" + activityCategory + '\'' +
-                ", extensions='" + extensions + '\'' +
-                ", rates='" + rates + '\'' +
-                '}';
-    }
-}
-package com.cnlive.gundam.user.model;
-
-
-import com.cnlive.gundam.user.model.base.ErrorMessage;
-
-import java.io.Serializable;
-
-/**
- * Created by Lynn on 5/26/2017.
- */
-
-public class ChannelInfoModel extends ErrorMessage {
-    private ChannelInfo data;
-
-    public ChannelInfoModel() {
-    }
-
-    public ChannelInfoModel(ChannelInfo data) {
-        this.data = data;
-    }
-
-    public ChannelInfo getData() {
-        return data;
-    }
-
-    public void setData(ChannelInfo data) {
-        this.data = data;
-    }
-
-    public class ChannelInfo implements Serializable {
-        private String coverImgUrl;
-        private String channelId;
-        private String channelName;
-        private int status;
-
-        public ChannelInfo() {
-        }
-
-        public ChannelInfo(String coverImgUrl, String channelId, String channelName, int status) {
-            this.coverImgUrl = coverImgUrl;
-            this.channelId = channelId;
-            this.channelName = channelName;
-            this.status = status;
-        }
-
-        public String getCoverImgUrl() {
-            return coverImgUrl;
-        }
-
-        public void setCoverImgUrl(String coverImgUrl) {
-            this.coverImgUrl = coverImgUrl;
-        }
-
-        public String getChannelId() {
-            return channelId;
-        }
-
-        public void setChannelId(String channelId) {
-            this.channelId = channelId;
-        }
-
-        public String getChannelName() {
-            return channelName;
-        }
-
-        public void setChannelName(String channelName) {
-            this.channelName = channelName;
-        }
-
-        public int getStatus() {
-            return status;
-        }
-
-        public void setStatus(int status) {
-            this.status = status;
-        }
-
-        @Override
-        public String toString() {
-            return "ChannelInfo{" +
-                    "coverImgUrl='" + coverImgUrl + '\'' +
-                    ", channelId='" + channelId + '\'' +
-                    ", channelName='" + channelName + '\'' +
-                    ", status=" + status +
-                    '}';
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "ChannelInfoModel{" +
-                "data=" + data +
-                '}';
-    }
-}
-package com.cnlive.gundam.user.model;
-
-/**
- * @author 陈硕
- * @time 2017/6/28  13:55
- * @desc ${TODD}
- */
-public class PersonalDate {
-    public String getItemName() {
-        return itemName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-
-    private  String  itemName;
-
-    public String getItemMessage() {
-        return itemMessage;
-    }
-
-    public void setItemMessage(String itemMessage) {
-        this.itemMessage = itemMessage;
-    }
-
-    private  String  itemMessage;
-
-
-
-    public PersonalDate(String itemName, String itemMessage) {
-        this.itemName = itemName;
-        this.itemMessage = itemMessage;
-    }
-
-
-
-
-
-
-}
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     >
-    <ScrollView
-        android:id="@+id/detail_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
  
         <RelativeLayout
             android:layout_width="match_parent"
@@ -27,6 +23,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_30px"
                     android:background="@android:color/white"
                     android:orientation="vertical">
  
@@ -90,7 +87,7 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
+                    android:layout_marginTop="40dp"
                     android:orientation="horizontal"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp">
@@ -121,111 +118,21 @@
                         android:textSize="15sp" />
                 </RelativeLayout>
  
-                <Button
-                    android:id="@+id/btn_login"
-                    style="@style/LoginButtonStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="59dp"
-                    android:background="@drawable/user_btn_login"
-                    android:gravity="center"
-                    android:onClick="onClick"
-                    android:text="@string/user_login" />
-
-
-                <TextView
-                    android:id="@+id/login_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="100dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/user_login_third_part_login"
-                    android:textColor="@color/text_hint_color"
-                    android:textSize="15sp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="37dp"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/rbtn_login_wechat"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/share_btn_weixin"
-                            android:onClick="onClick"
-                            android:layout_marginBottom="4dp"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/third_login_weixin"
-                            android:textColor="@color/text_hint_color"
-                            android:textSize="12sp" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/rbtn_login_qq"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/share_btn_tencent"
-                            android:onClick="onClick"
-                            android:layout_marginBottom="4dp"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/third_login_qq"
-                            android:textColor="@color/text_hint_color"
-                            android:textSize="12sp" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/rbtn_login_micro_blog"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/share_btn_sina"
-                            android:onClick="onClick"
-                            android:layout_marginBottom="4dp"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/third_login_sina"
-                            android:textColor="@color/text_hint_color"
-                            android:textSize="12sp" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
  
             </LinearLayout>
  
+            <Button
+                android:id="@+id/btn_login"
+                style="@style/LoginButtonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="200dp"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/user_btn_login"
+                android:gravity="center"
+                android:onClick="onClick"
+                android:text="@string/user_login" />
+
             <ImageView
                 android:id="@+id/back_selector"
                 android:layout_width="30dp"
@@ -249,6 +156,6 @@
  
         </RelativeLayout>
  
-    </ScrollView>
+
  
 </layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
  
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:cn="http://schemas.android.com/apk/res-auto"
     >
  
     <LinearLayout
+
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -44,6 +46,7 @@
                     android:layout_height="55dip"
                     android:layout_centerVertical="true"
                     android:src="@drawable/cnlive_user_header"
+                    cn:border_color="@android:color/transparent"
                     android:layout_marginLeft="11dp"
                     android:layout_marginRight="16dp" />
  
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background">
-        <shape>
-            <corners android:radius="5dip" />
-            <gradient
-                android:startColor="#D5D5D5"
-                android:centerColor="#D5D5D5"
-                android:endColor="#D5D5D5" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <corners android:radius="5dip" />
-                <gradient
-                    android:startColor="@color/ff4e51"
-                    android:centerColor="@color/ff4e51"
-                    android:endColor="@color/ff4e51" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_share_tengxun_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_share_tengxun_nor" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_share_sina_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_share_sina_nor" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/share_btn_qq_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/share_btn_qq_nor" android:state_pressed="false" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_share_weixin_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_share_weixin_nor" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_selected="true" android:drawable="@drawable/user_btn_logout_sel" />
-    <item android:state_pressed="true" android:drawable="@drawable/user_btn_logout_sel" />
-    <item android:state_focused="true" android:drawable="@drawable/user_btn_logout_sel" />
-    <item android:state_checked="false" android:drawable="@drawable/user_btn_logout_nor" />
-
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
-    android:useLevel="false">
-    <solid android:color="#6e6e6e" />
-
-    <size
-        android:height="40dp" />
-
-    <corners
-        android:bottomLeftRadius="20dp"
-        android:bottomRightRadius="20dp"
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp" /> <!-- 设置四个角的半径 -->
-
-</shape>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_micro_blog" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_micro_blog" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_micro_blog" android:state_focused="true" />
-    <item android:drawable="@drawable/user_micro_blog_click" />
-
-</selector>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_qq" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_qq" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_qq" android:state_focused="true" />
-    <item android:drawable="@drawable/user_qq_click" />
-
-</selector>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_wechat" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_wechat" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_wechat" android:state_focused="true" />
-    <item android:drawable="@drawable/user_wechat_click" />
-
-</selector>
 \ No newline at end of file
@@ -18,8 +18,5 @@
     //注册页面
     <color name="text_white_color">#FFFFFF</color>
  
-    //关于我们页面
-    <color name="star_name_color">#323333</color>
-    <color name="about_us_btn_text_color">#177bdf</color>
-    <color name="about_us_company_name_color">#969797</color>
+
 </resources>
@@ -21,10 +21,7 @@
     <dimen name="personal_text_size_14">14sp</dimen>
     <dimen name="personal_text_size_18">18sp</dimen>
  
-    //关于我们
-    <dimen name="about_us_text_size">17sp</dimen>
-    <dimen name="about_us_btn_size">13sp</dimen>
-    <dimen name="about_us_company_name_size">12sp</dimen>
+
  
     //反馈意见
     <dimen name="text_size_15">15sp</dimen>
@@ -20,9 +20,7 @@
     <string name="string_fast_access">短信验证登录</string>
     <string name="user_login">登录</string>
     <string name="user_login_third_part_login">第三方账号登录</string>
-    <string name="third_login_sina">微博</string>
-    <string name="third_login_qq">QQ</string>
-    <string name="third_login_weixin">微信</string>
+
  
     //注册页面
     <string name="register_mobile_hint">请输入您的手机号</string>
@@ -38,34 +36,11 @@
     <string name="find_password_hint">请确认密码：6&#8211;20位字母或数字</string>
     <string name="save_btn">保存</string>
  
-    //昵称修改页面
-    <string name="user_input_nickname">请输入昵称</string>
  
-    //手机号修改页面
-    <string name="register_mobile">手机号：</string>
-    <string name="user_personal_telephone_hint">手机号码</string>
-    <string name="register_mobile_keycode">验证码：</string>
-    <string name="hint_6_numbers_code">6位数字验证码</string>
  
-    //邮箱修改页面
-    <string name="email_notify">修改后，您输入的邮箱将会收到确认邮件，请按邮件中的说明去完成验证，谢谢！</string>
  
-    //关于我们页面
-    <string name="about_us_visit">访问视讯中国官网</string>
-    <string name="about_us_call_phone">拨打客服电话</string>
-    <string name="about_us_disclaimer">免责声明</string>
-    <string name="about_us_company_name">北京中投视讯文化传媒股份有限公司</string>
  
-    //分享
-    <string name="toast_msg_share_success">分享成功！</string>
-    <string name="toast_msg_share_fail">分享失败，请再试一次</string>
-    <string name="toast_msg_share_cancel">取消分享</string>
-    <string name="share_program_download_targetUrl"> http://www.cnlive.com/web/guide.jsp</string>
  
-    //AccountManager用户管理
-    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
-    <string name="ACCOUNT_LABEL">@string/app_name</string>
  
-    <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
  
 </resources>
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen></PreferenceScreen>
-<?xml version="1.0" encoding="utf-8"?>
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/ACCOUNT_TYPE"
-    android:icon="@mipmap/ic_launcher"
-    android:smallIcon="@mipmap/ic_launcher"
-    android:label="@string/ACCOUNT_LABEL"
-    android:accountPreferences="@xml/account_preferences" />
 \ No newline at end of file